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

Merge pull request #13683 from bcoca/reset_vars

Browse source 
added newer vars to 'reset_vars'
This commit is contained in:
Brian Coca 2015-12-28 12:45:58 -05:00
commit e6ee59fafe
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,6 +125,18 @@ TASK_ATTRIBUTE_OVERRIDES = (
'remote_user', 'remote_user',
) )
RESET_VARS = (
'ansible_connection',
'ansible_ssh_host',
'ansible_ssh_pass',
'ansible_ssh_port',
'ansible_ssh_user',
'ansible_ssh_private_key_file',
'ansible_ssh_pipelining',
'ansible_user',
'ansible_host',
'ansible_port',
)
class PlayContext(Base): class PlayContext(Base):
@ -505,7 +517,8 @@ class PlayContext(Base):
# TODO: should we be setting the more generic values here rather than # TODO: should we be setting the more generic values here rather than
# the more specific _ssh_ ones? # the more specific _ssh_ ones?
for special_var in ['ansible_connection', 'ansible_ssh_host', 'ansible_ssh_pass', 'ansible_ssh_port', 'ansible_ssh_user', 'ansible_ssh_private_key_file', 'ansible_ssh_pipelining']: for special_var in RESET_VARS:
if special_var not in variables: if special_var not in variables:
for prop, varnames in MAGIC_VARIABLE_MAPPING.items(): for prop, varnames in MAGIC_VARIABLE_MAPPING.items():
if special_var in varnames: if special_var in varnames: