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

Merge pull request #9968 from bcoca/v2_play_env

Browse source 
V2: added environment to play
This commit is contained in:
Brian Coca 2015-01-19 15:17:15 -05:00
commit 976f51e5f5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,10 @@ class ConnectionInformation:
self.sudo_user = play.sudo_user self.sudo_user = play.sudo_user
self.sudo_pass = play.sudo_pass self.sudo_pass = play.sudo_pass
# non connection related
self.no_log = play.no_log
self.environment = play.environment
def set_options(self, options): def set_options(self, options):
''' '''
Configures this connection information instance with data from Configures this connection information instance with data from
@ -127,6 +131,12 @@ class ConnectionInformation:
self.sudo_user = ci.sudo_user self.sudo_user = ci.sudo_user
self.sudo_pass = ci.sudo_pass self.sudo_pass = ci.sudo_pass
self.verbosity = ci.verbosity self.verbosity = ci.verbosity
# other
self.no_log = ci.no_log
self.environment = ci.environment
# requested tags
self.only_tags = ci.only_tags.copy() self.only_tags = ci.only_tags.copy()
self.skip_tags = ci.skip_tags.copy() self.skip_tags = ci.skip_tags.copy()
@ -139,7 +149,7 @@ class ConnectionInformation:
new_info = ConnectionInformation() new_info = ConnectionInformation()
new_info.copy(self) new_info.copy(self)
for attr in ('connection', 'remote_user', 'su', 'su_user', 'su_pass', 'sudo', 'sudo_user', 'sudo_pass'): for attr in ('connection', 'remote_user', 'su', 'su_user', 'su_pass', 'sudo', 'sudo_user', 'sudo_pass', 'environment', 'no_log'):
if hasattr(task, attr): if hasattr(task, attr):
attr_val = getattr(task, attr) attr_val = getattr(task, attr)
if attr_val: if attr_val:

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

@ -80,6 +80,7 @@ class Play(Base, Taggable):
# Flag/Setting Attributes # Flag/Setting Attributes
_any_errors_fatal = FieldAttribute(isa='bool', default=False) _any_errors_fatal = FieldAttribute(isa='bool', default=False)
_environment = FieldAttribute(isa='dict', default=dict())
_max_fail_percentage = FieldAttribute(isa='string', default='0') _max_fail_percentage = FieldAttribute(isa='string', default='0')
_no_log = FieldAttribute(isa='bool', default=False) _no_log = FieldAttribute(isa='bool', default=False)
_serial = FieldAttribute(isa='int', default=0) _serial = FieldAttribute(isa='int', default=0)