ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 13:20:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed some breaks after merging ansible/devel

Browse source
This commit is contained in:
Thomas Steinbach 2016-03-24 22:09:41 +01:00
commit 870160b8ed
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,6 @@ except ImportError:
MAGIC_VARIABLE_MAPPING = dict(
connection = ('ansible_connection',),
docker_extra_args = ('ansible_docker_extra_args',),
remote_addr = ('ansible_ssh_host', 'ansible_host'),
remote_user = ('ansible_ssh_user', 'ansible_user'),
port = ('ansible_ssh_port', 'ansible_port'),
@ -66,6 +65,7 @@ MAGIC_VARIABLE_MAPPING = dict(
become_exe = ('ansible_become_exe',),
become_flags = ('ansible_become_flags',),
ssh_common_args = ('ansible_ssh_common_args',),
docker_extra_args= ('ansible_docker_extra_args',),
sftp_extra_args = ('ansible_sftp_extra_args',),
scp_extra_args = ('ansible_scp_extra_args',),
ssh_extra_args = ('ansible_ssh_extra_args',),
@ -258,9 +258,6 @@ class PlayContext(Base):
lower precedence than those set on the play or host.
'''
if options.connection:
self.connection = options.connection
# privilege escalation
self.become = options.become
self.become_method = options.become_method