Skip to content

Commit 4a2ba52

Browse files
authored
Merge pull request #1193 from moreati/issue1083-become
ansible_mitogen: Templated become flag
2 parents 8e64459 + dd41ddf commit 4a2ba52

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

docs/changelog.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ In progress (unreleased)
2323

2424
* :gh:issue:`1083` :mod:`ansible_mitogen`: Templated become method
2525
(e.g. ``ansible_become_method``).
26+
* :gh:issue:`1083` :mod:`ansible_mitogen`: Templated become flag
27+
(e.g. ``ansible_become_method``, ``become`` keyword).
2628

2729

2830
v0.3.17 (2024-11-07)

tests/ansible/hosts/default.hosts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ansible_host=localhost
3030
ansible_user="{{ lookup('pipe', 'whoami') }}"
3131

3232
[tt_become_by_inv]
33+
tt-become ansible_become="{{ 'true' | trim }}" ansible_become_user=root
3334
tt-become-exe ansible_become=true ansible_become_exe="{{ 'sudo' | trim }}" ansible_become_user=root
3435
tt-become-flags ansible_become=true ansible_become_flags="{{ '--set-home --stdin --non-interactive' | trim }}" ansible_become_user=root
3536
tt-become-method ansible_become=true ansible_become_method="{{ 'sudo' | trim }}" ansible_become_user=root

tests/ansible/integration/become/templated_by_inv.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- name: Templated become in inventory
1313
vars:
1414
expected_become_users:
15+
tt-become: root
1516
tt-become-exe: root
1617
tt-become-flags: root
1718
tt-become-method: root

tests/ansible/integration/become/templated_by_play_keywords.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- name: integration/become/templated_by_play_keywords.yml
22
hosts: tt_become_bare
33
gather_facts: false
4-
become: true
4+
become: "{{ 'true' | trim }}"
55
become_exe: "{{ 'sudo' | trim }}"
66
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
77
become_method: "{{ 'sudo' | trim }}"
@@ -22,7 +22,7 @@
2222
- name: integration/become/templated_by_play_keywords.yml
2323
hosts: tt_become_bare
2424
gather_facts: false
25-
become: true
25+
become: "{{ 'true' | trim }}"
2626
become_exe: "{{ 'sudo' | trim }}"
2727
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
2828
become_method: "{{ 'sudo' | trim }}"

tests/ansible/integration/become/templated_by_task_keywords.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
gather_facts: false
44
# FIXME Resetting the connection shouldn't require credentials
55
# https://github.com/mitogen-hq/mitogen/issues/1132
6-
become: true
6+
become: "{{ 'true' | trim }}"
77
become_exe: "{{ 'sudo' | trim }}"
88
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
99
become_method: "{{ 'sudo' | trim }}"
@@ -17,7 +17,7 @@
1717
gather_facts: false
1818
tasks:
1919
- name: Templated become by task keywords, with delegate_to
20-
become: true
20+
become: "{{ 'true' | trim }}"
2121
become_exe: "{{ 'sudo' | trim }}"
2222
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
2323
become_method: "{{ 'sudo' | trim }}"
@@ -38,7 +38,7 @@
3838
gather_facts: false
3939
# FIXME Resetting the connection shouldn't require credentials
4040
# https://github.com/mitogen-hq/mitogen/issues/1132
41-
become: true
41+
become: "{{ 'true' | trim }}"
4242
become_exe: "{{ 'sudo' | trim }}"
4343
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
4444
become_method: "{{ 'sudo' | trim }}"
@@ -60,7 +60,7 @@
6060
setup:
6161

6262
- name: Templated become by task keywords, with delegate_to
63-
become: true
63+
become: "{{ 'true' | trim }}"
6464
become_exe: "{{ 'sudo' | trim }}"
6565
become_flags: "{{ '--set-home --stdin --non-interactive' | trim }}"
6666
become_method: "{{ 'sudo' | trim }}"

tests/ansible/templates/test-targets.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ ansible_python_interpreter={{ tt.python_path }}
5757
ansible_user=mitogen__has_sudo_nopw
5858

5959
[tt_become_by_inv]
60+
tt-become ansible_become="{{ '{{' }} 'true' | trim {{ '}}' }}" ansible_become_user=root
6061
tt-become-exe ansible_become=true ansible_become_exe="{{ '{{' }} 'sudo' | trim {{ '}}' }}" ansible_become_user=root
6162
tt-become-flags ansible_become=true ansible_become_flags="{{ '{{' }} '--set-home --stdin --non-interactive' | trim {{ '}}' }}" ansible_become_user=root
6263
tt-become-method ansible_become=true ansible_become_method="{{ '{{' }} 'sudo' | trim {{ '}}' }}" ansible_become_user=root

0 commit comments

Comments
 (0)