ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

reverts 28599

Browse source
This commit is contained in:
Peter Sprygada 2017-08-25 10:34:26 -04:00 committed by Matt Clay
parent cc3bb0a043
commit ed23424b32
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,11 +432,6 @@ class PlayContext(Base):
if exe_var in variables: if exe_var in variables:
setattr(new_info, 'executable', variables.get(exe_var)) setattr(new_info, 'executable', variables.get(exe_var))
# we store original in 'connection_user' for use of network/other modules that fallback to it as login user
# this needs to be done before the MAGIC_VARIABLE_MAPPING happens below
if new_info.connection == 'local':
new_info.connection_user = new_info.remote_user
attrs_considered = [] attrs_considered = []
for (attr, variable_names) in iteritems(MAGIC_VARIABLE_MAPPING): for (attr, variable_names) in iteritems(MAGIC_VARIABLE_MAPPING):
for variable_name in variable_names: for variable_name in variable_names:
@ -498,7 +493,10 @@ class PlayContext(Base):
# if the final connection type is local, reset the remote_user value to that of the currently logged in user # if the final connection type is local, reset the remote_user value to that of the currently logged in user
# this ensures any become settings are obeyed correctly # this ensures any become settings are obeyed correctly
# we store original in 'connection_user' for use of network/other modules that fallback to it as login user
# this needs to be done before the MAGIC_VARIABLE_MAPPING happens
if new_info.connection == 'local': if new_info.connection == 'local':
new_info.connection_user = new_info.remote_user
new_info.remote_user = pwd.getpwuid(os.getuid()).pw_name new_info.remote_user = pwd.getpwuid(os.getuid()).pw_name
# set no_log to default if it was not previouslly set # set no_log to default if it was not previouslly set