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

fix all cases of none remote/become users (#59397)

Browse source 
some cases failed, when defaults were None on the plugins
This commit is contained in:
Brian Coca 2019-07-22 13:24:31 -04:00 committed by Matt Martz
parent 52ad0f3217
commit 74ac229fa8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/fix_all_none_users.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ensure all cases of a None remote/become user are covered.

2
lib/ansible/plugins/action/__init__.py
View file

@ -1043,7 +1043,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
buser = self.get_become_option('become_user') buser = self.get_become_option('become_user')
if (sudoable and self._connection.become and # if sudoable and have become if (sudoable and self._connection.become and # if sudoable and have become
self._connection.transport != 'network_cli' and # if not using network_cli self._connection.transport != 'network_cli' and # if not using network_cli
(C.BECOME_ALLOW_SAME_USER or (buser != ruser and (ruser or buser)))): # if we allow same user PE or users are different and either is set (C.BECOME_ALLOW_SAME_USER or (buser != ruser or not any((ruser, buser))))): # if we allow same user PE or users are different and either is set
display.debug("_low_level_execute_command(): using become for this command") display.debug("_low_level_execute_command(): using become for this command")
cmd = self._connection.become.build_become_command(cmd, self._connection._shell) cmd = self._connection.become.build_become_command(cmd, self._connection._shell)