ansible: use template-expanded delegate_to hostname in one more location.

ansible_mitogen/connection.py

@@ -602,7 +602,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
             transport=self._play_context.connection,
             inventory_name=self.delegate_to_hostname,
             connection=self,
-            hostvars=self.host_vars[self._play_context.delegate_to],
+            hostvars=self.host_vars[self.delegate_to_hostname],
             become_user=(self._play_context.become_user
                          if self._play_context.become
                          else None),

tests/ansible/common-hosts

@@ -35,17 +35,3 @@ cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-norma
 
 # doas:newuser via host.
 cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user
-
-
-# Connection Delegation issue #340 reproduction.
-# Path to jails is SSH to H -> mitogen_sudo to root -> jail to J
-
-[issue340]
-# 'target' plays the role of the normal host machine H.
-# 'mitogen__sudo1' plays the role of root@H via mitogen_sudo.
-# 'mitogen__user1' plays the role of root@J via mitogen__user1.
-# 'mitogen__user2' plays the role of E, the delgate_to target for certs.
-
-i340-root ansible_user=mitogen__sudo1 ansible_connection=mitogen_sudo mitogen_via=target
-i340-jail ansible_user=mitogen__user1 ansible_connection=mitogen_sudo mitogen_via=i340-root
-i340-certs ansible_user=mitogen__user2 ansible_connection=mitogen_sudo mitogen_via=target

tests/ansible/hosts/group_vars/osa-all-containers.yml

@@ -0,0 +1,4 @@
+---
+
+ansible_connection: setns
+mitogen_kind: lxc

tests/ansible/hosts/issue340

@@ -0,0 +1,12 @@
+# Connection Delegation issue #340 reproduction.
+# Path to jails is SSH to H -> mitogen_sudo to root -> jail to J
+
+[issue340]
+# 'target' plays the role of the normal host machine H.
+# 'mitogen__sudo1' plays the role of root@H via mitogen_sudo.
+# 'mitogen__user1' plays the role of root@J via mitogen__user1.
+# 'mitogen__user2' plays the role of E, the delgate_to target for certs.
+
+i340-root ansible_user=mitogen__sudo1 ansible_connection=mitogen_sudo mitogen_via=target
+i340-jail ansible_user=mitogen__user1 ansible_connection=mitogen_sudo mitogen_via=i340-root
+i340-certs ansible_user=mitogen__user2 ansible_connection=mitogen_sudo mitogen_via=target

tests/ansible/hosts/osa-containers

@@ -0,0 +1,9 @@
+# integration/delegation/delegate_to_container.yml
+
+# Patterned after openstack-ansible/all_containers.yml
+osa-host-machine ansible_host=172.29.236.100
+
+[osa-all-containers]
+osa-container-1 container_tech=lxc
+osa-container-2 container_tech=lxc
+osa-container-3 container_tech=lxc

tests/ansible/integration/delegation/all.yml

@@ -1,2 +1,4 @@
 - import_playbook: delegate_to_template.yml
+- import_playbook: osa_container_standalone.yml
+- import_playbook: osa_delegate_to_self.yml
 - import_playbook: stack_construction.yml

tests/ansible/integration/delegation/delegate_to_template.yml

@@ -18,6 +18,30 @@
     - assert:
         that: |
           out.result == [
+            {
+                'kwargs': {
+                    'check_host_keys': 'ignore',
+                    'connect_timeout': 10,
+                    'hostname': 'alias-host',
+                    'identities_only': False,
+                    'identity_file': None,
+                    'password': None,
+                    'port': None,
+                    'python_path': None,
+                    'ssh_args': [
+                        '-o',
+                        'ForwardAgent=yes',
+                        '-o',
+                        'ControlMaster=auto',
+                        '-o',
+                        'ControlPersist=60s',
+                    ],
+                    'ssh_debug_level': None,
+                    'ssh_path': 'ssh',
+                    'username': 'alias-user',
+                },
+                'method': 'ssh',
+            },
             {
                 'kwargs': {
                     'check_host_keys': 'ignore',
@@ -41,5 +65,5 @@
                     'username': None,
                 },
                 'method': 'ssh',
-            },
+            }
           ]

tests/ansible/integration/delegation/osa_container_standalone.yml

@@ -0,0 +1,29 @@
+# Verify one OSA-style container has the correct config.
+
+- name: integration/delegation/container_standalone.yml
+  hosts: dtc-container-1
+  gather_facts: false
+  tasks:
+  - meta: end_play
+    when: not is_mitogen
+
+  - mitogen_get_stack:
+    register: out
+
+  - debug: msg={{out}}
+  - assert:
+      that: |
+        out.result == [
+            {
+                'kwargs': {
+                    'container': 'dtc-container-1',
+                    'docker_path': None,
+                    'kind': 'lxc',
+                    'lxc_info_path': None,
+                    'machinectl_path': None,
+                    'python_path': ['/usr/bin/python'],
+                    'username': None,
+                },
+                'method': 'setns',
+            },
+        ]

tests/ansible/integration/delegation/osa_delegate_to_self.yml

@@ -0,0 +1,31 @@
+# OSA: Verify delegating the connection back to the container succeeds.
+
+- name: integration/delegation/osa_delegate_to_self.yml
+  hosts: osa-container-1
+  vars:
+    target: osa-container-1
+  gather_facts: false
+  tasks:
+  - meta: end_play
+    when: not is_mitogen
+
+  - mitogen_get_stack:
+    delegate_to: "{{target}}"
+    register: out
+
+  - assert:
+      that: |
+        out.result == [
+            {
+                'kwargs': {
+                    'container': 'osa-container-1',
+                    'docker_path': None,
+                    'kind': 'lxc',
+                    'lxc_info_path': None,
+                    'machinectl_path': None,
+                    'python_path': None,
+                    'username': None,
+                },
+                'method': 'setns',
+            },
+        ]