From 6053e1b5cf9e954eff04f26ba8290e677bf38535 Mon Sep 17 00:00:00 2001 From: "Joshua M. Keyes" Date: Mon, 7 Oct 2024 14:48:58 -0700 Subject: [PATCH 1/3] ansible_mitogen: Handle templated ansible_ssh_user. --- ansible_mitogen/transport_config.py | 2 +- docs/changelog.rst | 2 ++ docs/contributors.rst | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible_mitogen/transport_config.py b/ansible_mitogen/transport_config.py index ae8a02585..bff27d162 100644 --- a/ansible_mitogen/transport_config.py +++ b/ansible_mitogen/transport_config.py @@ -434,7 +434,7 @@ def remote_addr(self): return self._play_context.remote_addr def remote_user(self): - return self._play_context.remote_user + return self._connection_option('remote_user') def become(self): return self._play_context.become diff --git a/docs/changelog.rst b/docs/changelog.rst index 7a25f7559..8349e87d3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,6 +23,8 @@ In Progress (unreleased) * :gh:issue:`1138` CI: Complete migration from Azure DevOps Pipelines to GitHub Actions +* :gh:issue:`1116` :mod: `ansible_mitogen`: Support for templated variable + `ansible_ssh_user`. v0.3.11 (2024-10-07) diff --git a/docs/contributors.rst b/docs/contributors.rst index 4e9e58bde..69dc1e76e 100644 --- a/docs/contributors.rst +++ b/docs/contributors.rst @@ -127,6 +127,7 @@ sponsorship and outstanding future-thinking of its early adopters.
  • jgadling
  • John F Wall — Making Ansible Great with Massive Parallelism
  • Jonathan Rosser
    • +
  • Joshua M. Keyes
  • KennethC
  • Luca Berruti
  • Lewis Bellwood — Happy to be apart of a great project.
    • From 2c4316fa16c9c74a91a4ba8236bd0d7993cba944 Mon Sep 17 00:00:00 2001 From: Joshua K Date: Tue, 8 Oct 2024 01:17:22 -0700 Subject: [PATCH 2/3] Fix rST whitespace error in changelog entry. Co-authored-by: Alex Willmer --- docs/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8349e87d3..dc42eaf71 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,7 +23,7 @@ In Progress (unreleased) * :gh:issue:`1138` CI: Complete migration from Azure DevOps Pipelines to GitHub Actions -* :gh:issue:`1116` :mod: `ansible_mitogen`: Support for templated variable +* :gh:issue:`1116` :mod:`ansible_mitogen`: Support for templated variable `ansible_ssh_user`. From 14cb8be7e5204c5beeaeddbf3ed80b2727f3c535 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Tue, 8 Oct 2024 10:36:42 +0100 Subject: [PATCH 3/3] ansible_mitogen: Test templated connection user (e.g. ansible_user) --- tests/ansible/hosts/default.hosts | 5 ++--- tests/ansible/integration/ssh/templated_by_play_taskvar.yml | 1 + tests/ansible/templates/test-targets.j2 | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/ansible/hosts/default.hosts b/tests/ansible/hosts/default.hosts index 8ed807879..e2a13b477 100644 --- a/tests/ansible/hosts/default.hosts +++ b/tests/ansible/hosts/default.hosts @@ -25,11 +25,10 @@ tt-bare [tt_targets_bare:vars] ansible_host=localhost -ansible_user=mitogen__has_sudo_nopw [tt_targets_inventory] -tt-password ansible_password="{{ 'has_sudo_nopw_password' | trim }}" +tt-password ansible_password="{{ 'has_sudo_nopw_password' | trim }}" ansible_user=mitogen__has_sudo_nopw +tt-remote-user ansible_password=has_sudo_nopw_password ansible_user="{{ 'mitogen__has_sudo_nopw' | trim }}" [tt_targets_inventory:vars] ansible_host=localhost -ansible_user=mitogen__has_sudo_nopw diff --git a/tests/ansible/integration/ssh/templated_by_play_taskvar.yml b/tests/ansible/integration/ssh/templated_by_play_taskvar.yml index bc4ef1d83..5a937fb94 100644 --- a/tests/ansible/integration/ssh/templated_by_play_taskvar.yml +++ b/tests/ansible/integration/ssh/templated_by_play_taskvar.yml @@ -3,6 +3,7 @@ gather_facts: false vars: ansible_password: "{{ 'has_sudo_nopw_password' | trim }}" + ansible_user: "{{ 'mitogen__has_sudo_nopw' | trim }}" tasks: - meta: reset_connection diff --git a/tests/ansible/templates/test-targets.j2 b/tests/ansible/templates/test-targets.j2 index 37a0725a2..1166cc428 100644 --- a/tests/ansible/templates/test-targets.j2 +++ b/tests/ansible/templates/test-targets.j2 @@ -47,12 +47,11 @@ tt-bare ansible_host={{ tt.hostname }} ansible_port={{ tt.port }} ansible_python_interpreter={{ tt.python_path }} -ansible_user=mitogen__has_sudo_nopw [tt_targets_inventory] -tt-password ansible_password="{{ '{{' }} 'has_sudo_nopw_password' | trim {{ '}}' }}" ansible_port={{ tt.port }} +tt-password ansible_password="{{ '{{' }} 'has_sudo_nopw_password' | trim {{ '}}' }}" ansible_port={{ tt.port }} ansible_user=mitogen__has_sudo_nopw +tt-remote-user ansible_password=has_sudo_nopw_password ansible_port={{ tt.port }} ansible_user="{{ '{{' }} 'mitogen__has_sudo_nopw' | trim {{ '}}' }}" [tt_targets_inventory:vars] ansible_host={{ tt.hostname }} ansible_python_interpreter={{ tt.python_path }} -ansible_user=mitogen__has_sudo_nopw