tests: Test templated connection port provided by Ansible keyword

Missed this in mitogen-hq#1145 Refs mitogen-hq#978
moreati · Nov 7, 2024 · 69017d8 · 69017d8
1 parent 5ae5bb9
commit 69017d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -29,6 +29,7 @@ In progress (unreleased)
   (e.g. ``ansible_host_key_checking``, ``ansible_ssh_host_key_checking``).
 * :gh:issue:`1083` :mod:`ansible_mitogen`: Templated host address
   (e.g. ``ansible_host``, ``ansible_ssh_host``)
+* :gh:issue:`978` Test templated port provided by Ansible play or task keyword
 
 
 v0.3.16 (2024-11-05)

diff --git a/tests/ansible/integration/ssh/templated_by_play_keyword.yml b/tests/ansible/integration/ssh/templated_by_play_keyword.yml
@@ -1,11 +1,11 @@
 - name: integration/ssh/templated_by_play_keyword.yml
   hosts: tt_targets_bare
   gather_facts: false
+  port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
   remote_user: "{{ 'mitogen__has_sudo_nopw' | trim }}"
   vars:
     ansible_host: "{{ hostvars[groups['test-targets'][0]].host | default('localhost') }}"
     ansible_password: has_sudo_nopw_password
-    ansible_port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
   tasks:
     - meta: reset_connection
     - name: Templated variables in play keywords

diff --git a/tests/ansible/integration/ssh/templated_by_task_keyword.yml b/tests/ansible/integration/ssh/templated_by_task_keyword.yml
@@ -3,11 +3,11 @@
   gather_facts: false
   # FIXME Resetting the connection shouldn't require credentials
   #       https://github.com/mitogen-hq/mitogen/issues/1132
+  port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
   remote_user: "{{ 'mitogen__has_sudo_nopw' | trim }}"
   vars:
     ansible_host: "{{ hostvars[groups['test-targets'][0]].host | default('localhost') }}"
     ansible_password: has_sudo_nopw_password
-    ansible_port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
   tasks:
     - name: Reset connection to target that will be delegate_to
       meta: reset_connection
@@ -18,9 +18,9 @@
   tasks:
     - name: Templated by task keywords, with delegate_to
       delegate_to: "{{ groups.tt_targets_bare[0] }}"
+      port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
       remote_user: "{{ 'mitogen__has_sudo_nopw' | trim }}"
       vars:
         ansible_host: "{{ hostvars[groups['test-targets'][0]].host | default('localhost') }}"
         ansible_password: has_sudo_nopw_password
-        ansible_port: "{{ hostvars[groups['test-targets'][0]].ansible_port | default(22) }}"
       ping: