cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for dzdo flags Fixes #38766

Browse source
This commit is contained in:
Mat Wilson 2018-04-16 16:25:19 -07:00 committed by Brian Coca
parent f1c16438c1
commit 8eb94ccbd5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/playbook/play_context.py
View file

@ -551,9 +551,9 @@ class PlayContext(Base):
exe = self.become_exe or 'dzdo' exe = self.become_exe or 'dzdo'
if self.become_pass: if self.become_pass:
prompt = '[dzdo via ansible, key=%s] password: ' % randbits prompt = '[dzdo via ansible, key=%s] password: ' % randbits
becomecmd = '%s -p %s -u %s %s' % (exe, shlex_quote(prompt), self.become_user, command) becomecmd = '%s %s -p %s -u %s %s' % (exe, flags, shlex_quote(prompt), self.become_user, command)
else: else:
becomecmd = '%s -u %s %s' % (exe, self.become_user, command) becomecmd = '%s %s -u %s %s' % (exe, flags, self.become_user, command)
elif self.become_method == 'pmrun': elif self.become_method == 'pmrun':

5
test/units/playbook/test_play_context.py
View file

@ -119,6 +119,7 @@ def test_play_context_make_become_cmd(parser):
ksu_exe = 'ksu' ksu_exe = 'ksu'
ksu_flags = '' ksu_flags = ''
dzdo_exe = 'dzdo' dzdo_exe = 'dzdo'
dzdo_flags = ''
cmd = play_context.make_become_cmd(cmd=default_cmd, executable=default_exe) cmd = play_context.make_become_cmd(cmd=default_cmd, executable=default_exe)
assert cmd == default_cmd assert cmd == default_cmd
@ -167,11 +168,11 @@ def test_play_context_make_become_cmd(parser):
play_context.become_method = 'dzdo' play_context.become_method = 'dzdo'
cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash") cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash")
assert cmd == """%s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, play_context.become_user, default_exe, play_context.success_key, default_cmd) assert cmd == """%s %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, play_context.become_user, default_exe, play_context.success_key, default_cmd)
play_context.become_pass = 'testpass' play_context.become_pass = 'testpass'
play_context.become_method = 'dzdo' play_context.become_method = 'dzdo'
cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash") cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash")
assert (cmd == """%s -p %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, shlex_quote(play_context.prompt), assert (cmd == """%s %s -p %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, shlex_quote(play_context.prompt),
play_context.become_user, default_exe, play_context.become_user, default_exe,
play_context.success_key, default_cmd)) play_context.success_key, default_cmd))