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

Backport machinectl become plugin fixes (#58734) (#58774)

Browse source 
* Correct machinectl become plugin function arguments (#58734)

* Correct get_option function name and change flags to become_flags

* Remove the '--' from the returned command

* add changelog fragment

* change changelog fragment description

* move the -q argument to machinectl before the shell argument to resolve issues with machinectl v230 (see #56571)

(cherry picked from commit 4f642daae5)

* Update PR number in changelog fragment

* Revert "Update PR number in changelog fragment"

This reverts commit 38e6b4785a.
This commit is contained in:
Joseph 2019-07-16 22:40:37 +01:00 committed by Toshio Kuratomi
parent 3516406d59
commit 6d467a8bd9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/58734-correct-machinectl-become-plugin.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- machinectl become plugin - correct bugs which induced errors on plugin usage

6
lib/ansible/plugins/become/machinectl.py
View file

@ -81,7 +81,7 @@ class BecomeModule(BecomeBase):
if not cmd:
return cmd
become = self._get_option('become_exe') or self.name
flags = self.get_option('flags') or ''
become = self.get_option('become_exe') or self.name
flags = self.get_option('become_flags') or ''
user = self.get_option('become_user') or ''
return '%s shell -q %s %s@ %s' % (become, flags, user, cmd)
return '%s -q shell %s %s@ %s' % (become, flags, user, cmd)