habsi/ansible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore connection options from cli

Browse Source 
fixes #30720

(cherry picked from commit bed7cd8b11)
This commit is contained in:
Brian Coca
2017-10-04 15:09:26 -04:00
committed by Toshio Kuratomi
parent 6dab8b7bfa
commit 8ccb719dfc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/playbook/play_context.py
View File

@ -175,6 +175,9 @@ RESET_VARS = (
'ansible_ssh_executable',
)
OPTION_FLAGS = ('connection', 'remote_user', 'private_key_file', 'verbosity', 'force_handlers', 'step', 'start_at_task', 'diff',
'ssh_common_args', 'docker_extra_args', 'sftp_extra_args', 'scp_extra_args', 'ssh_extra_args')
class PlayContext(Base):
@ -338,9 +341,8 @@ class PlayContext(Base):
self.diff = boolean(options.diff, strict=False)
# general flags (should we move out?)
# for flag in ('connection', 'remote_user', 'private_key_file', 'verbosity', 'force_handlers', 'step', 'start_at_task', 'diff'):
# should only be 'non plugin' flags
for flag in ('connection', 'remote_user', 'private_key_file', 'verbosity', 'force_handlers', 'step', 'start_at_task', 'diff'):
for flag in OPTION_FLAGS:
attribute = getattr(options, flag, False)
if attribute:
setattr(self, flag, attribute)