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

Revert "Rather than moving connection option setting, fix defaults"

Browse source 
This reverts commit 0345b675f8.
This commit is contained in:
root 2015-04-14 12:07:30 -07:00 committed by Toshio Kuratomi
parent 53177a9bd9
commit 996bd05823
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
v2/ansible/executor/connection_info.py
View file

@ -64,14 +64,14 @@ class ConnectionInformation:
self.no_log = False
self.check_mode = False
if play:
self.set_play(play)
#TODO: just pull options setup to above?
# set options before play to allow play to override them
if options:
self.set_options(options)
if play:
self.set_play(play)
def __repr__(self):
value = "CONNECTION INFO:\n"

4
v2/ansible/playbook/play.py
View file

@ -56,11 +56,11 @@ class Play(Base, Taggable, Become):
_accelerate_port = FieldAttribute(isa='int', default=5099) # should be alias of port
# Connection
_connection = FieldAttribute(isa='string')
_connection = FieldAttribute(isa='string', default='smart')
_gather_facts = FieldAttribute(isa='string', default='smart')
_hosts = FieldAttribute(isa='list', default=[], required=True)
_name = FieldAttribute(isa='string', default='<no name specified>')
_port = FieldAttribute(isa='int')
_port = FieldAttribute(isa='int', default=22)
_remote_user = FieldAttribute(isa='string')
# Variable Attributes