Merge remote-tracking branch 'upstream/master' into docs-master

ansible_mitogen/transport_config.py

@@ -478,7 +478,7 @@ class PlayContextSpec(Spec):
         return self._become_option('become_flags')
 
     def become_method(self):
-        return self._play_context.become_method
+        return self._connection.become.name
 
     def become_user(self):
         return self._become_option('become_user')

docs/changelog.rst

@@ -23,6 +23,15 @@ In progress (unreleased)
 
 
 
+v0.3.18 (2024-11-07)
+--------------------
+
+* :gh:issue:`1083` :mod:`ansible_mitogen`: Templated become method
+  (e.g. ``ansible_become_method``).
+* :gh:issue:`1083` :mod:`ansible_mitogen`: Templated become flag
+  (e.g. ``ansible_become_method``, ``become`` keyword).
+
+
 v0.3.17 (2024-11-07)
 --------------------
 

mitogen/__init__.py

@@ -35,7 +35,7 @@ be expected. On the slave, it is built dynamically during startup.
 
 
 #: Library version as a tuple.
-__version__ = (0, 3, 18, 'dev')
+__version__ = (0, 3, 19, 'dev')
 
 
 #: This is :data:`False` in slave contexts. Previously it was used to prevent

tests/ansible/hosts/default.hosts

@@ -30,8 +30,10 @@ ansible_host=localhost
 ansible_user="{{ lookup('pipe', 'whoami') }}"
 
 [tt_become_by_inv]
+tt-become                   ansible_become="{{ 'true' | trim }}" ansible_become_user=root
 tt-become-exe               ansible_become=true ansible_become_exe="{{ 'sudo' | trim }}" ansible_become_user=root
 tt-become-flags             ansible_become=true ansible_become_flags="{{ '--set-home --stdin --non-interactive' | trim }}" ansible_become_user=root
+tt-become-method            ansible_become=true ansible_become_method="{{ 'sudo' | trim }}" ansible_become_user=root
 tt-become-pass              ansible_become=true ansible_become_pass="{{ 'pw_required_password' | trim }}" ansible_become_user=mitogen__pw_required
 tt-become-user              ansible_become=true ansible_become_user="{{ 'root' | trim }}"
 

tests/ansible/integration/become/templated_by_inv.yml

@@ -12,8 +12,10 @@
     - name: Templated become in inventory
       vars:
         expected_become_users:
+          tt-become: root
           tt-become-exe: root
           tt-become-flags: root
+          tt-become-method: root
           tt-become-pass: mitogen__pw_required
           tt-become-user: root
       command:

tests/ansible/integration/become/templated_by_play_keywords.yml

@@ -1,9 +1,10 @@
 - name: integration/become/templated_by_play_keywords.yml
   hosts: tt_become_bare
   gather_facts: false
-  become: true
+  become: "{{ 'true' | trim }}"
   become_exe: "{{ 'sudo' | trim }}"
   become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+  become_method: "{{ 'sudo' | trim }}"
   become_user: "{{ 'root' | trim }}"
   tasks:
     - meta: reset_connection
@@ -21,9 +22,10 @@
 - name: integration/become/templated_by_play_keywords.yml
   hosts: tt_become_bare
   gather_facts: false
-  become: true
+  become: "{{ 'true' | trim }}"
   become_exe: "{{ 'sudo' | trim }}"
   become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+  become_method: "{{ 'sudo' | trim }}"
   become_user: "{{ 'mitogen__pw_required' | trim }}"
   vars:
     ansible_become_pass: "{{ 'pw_required_password' | trim }}"

tests/ansible/integration/become/templated_by_play_vars.yml

@@ -5,6 +5,7 @@
     ansible_become: true
     ansible_become_exe: "{{ 'sudo' | trim }}"
     ansible_become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+    ansible_become_method: "{{ 'sudo' | trim }}"
     ansible_become_user: "{{ 'root' | trim }}"
   tasks:
     - name: Templated become by play vars, no password
@@ -24,6 +25,7 @@
     ansible_become: true
     ansible_become_exe: "{{ 'sudo' | trim }}"
     ansible_become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+    ansible_become_method: "{{ 'sudo' | trim }}"
     ansible_become_pass: "{{ 'pw_required_password' | trim }}"
     ansible_become_user: "{{ 'mitogen__pw_required' | trim }}"
   tasks:

tests/ansible/integration/become/templated_by_task_keywords.yml

@@ -3,9 +3,10 @@
   gather_facts: false
   # FIXME Resetting the connection shouldn't require credentials
   #       https://github.com/mitogen-hq/mitogen/issues/1132
-  become: true
+  become: "{{ 'true' | trim }}"
   become_exe: "{{ 'sudo' | trim }}"
   become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+  become_method: "{{ 'sudo' | trim }}"
   become_user: "{{ 'root' | trim }}"
   tasks:
     - name: Reset connection to target that will be delegate_to
@@ -16,9 +17,10 @@
   gather_facts: false
   tasks:
     - name: Templated become by task keywords, with delegate_to
-      become: true
+      become: "{{ 'true' | trim }}"
       become_exe: "{{ 'sudo' | trim }}"
       become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+      become_method: "{{ 'sudo' | trim }}"
       become_user: "{{ 'root' | trim }}"
       delegate_to: "{{ groups.tt_become_bare[0] }}"
       command:
@@ -36,9 +38,10 @@
   gather_facts: false
   # FIXME Resetting the connection shouldn't require credentials
   #       https://github.com/mitogen-hq/mitogen/issues/1132
-  become: true
+  become: "{{ 'true' | trim }}"
   become_exe: "{{ 'sudo' | trim }}"
   become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+  become_method: "{{ 'sudo' | trim }}"
   become_user: "{{ 'mitogen__pw_required' | trim }}"
   vars:
     ansible_become_pass: "{{ 'pw_required_password' | trim }}"
@@ -57,9 +60,10 @@
       setup:
 
     - name: Templated become by task keywords, with delegate_to
-      become: true
+      become: "{{ 'true' | trim }}"
       become_exe: "{{ 'sudo' | trim }}"
       become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
+      become_method: "{{ 'sudo' | trim }}"
       become_user: "{{ 'mitogen__pw_required' | trim }}"
       delegate_to: "{{ groups.tt_become_bare[0] }}"
       vars:

tests/ansible/templates/test-targets.j2

@@ -57,8 +57,10 @@ ansible_python_interpreter={{ tt.python_path }}
 ansible_user=mitogen__has_sudo_nopw
 
 [tt_become_by_inv]
+tt-become                   ansible_become="{{ '{{' }} 'true' | trim {{ '}}' }}" ansible_become_user=root
 tt-become-exe               ansible_become=true ansible_become_exe="{{ '{{' }} 'sudo' | trim {{ '}}' }}" ansible_become_user=root
 tt-become-flags             ansible_become=true ansible_become_flags="{{ '{{' }} '--set-home --stdin --non-interactive' | trim {{ '}}' }}" ansible_become_user=root
+tt-become-method            ansible_become=true ansible_become_method="{{ '{{' }} 'sudo' | trim {{ '}}' }}" ansible_become_user=root
 tt-become-pass              ansible_become=true ansible_become_pass="{{ '{{' }} 'pw_required_password' | trim {{ '}}' }}" ansible_become_user=mitogen__pw_required
 tt-become-user              ansible_become=true ansible_become_user="{{ '{{' }} 'root' | trim {{ '}}' }}"