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

fixed environment inheritance

Browse source
This commit is contained in:
Brian Coca 2015-08-25 10:15:32 -04:00
parent 8aa732e0a4
commit ae91cdfc98
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/playbook/block.py
View file

@ -310,11 +310,9 @@ class Block(Base, Become, Conditional, Taggable):
''' '''
Override for the 'tags' getattr fetcher, used from Base. Override for the 'tags' getattr fetcher, used from Base.
''' '''
environment = self._attributes['tags'] environment = self._attributes['environment']
if environment is None: if environment is None:
environment = dict() environment = self._get_parent_attribute('environment', extend=True)
environment = self._get_parent_attribute('environment', extend=True)
return environment return environment

9
lib/ansible/playbook/task.py
View file

@ -218,6 +218,9 @@ class Task(Base, Conditional, Taggable, Become):
Override post validation of vars on the play, as we don't want to Override post validation of vars on the play, as we don't want to
template these too early. template these too early.
''' '''
if value is None:
return dict()
for env_item in value: for env_item in value:
if isinstance(env_item, (string_types, AnsibleUnicode)) and env_item in templar._available_variables.keys(): if isinstance(env_item, (string_types, AnsibleUnicode)) and env_item in templar._available_variables.keys():
self._display.deprecated("Using bare variables for environment is deprecated. Update your playbooks so that the environment value uses the full variable syntax ('{{foo}}')") self._display.deprecated("Using bare variables for environment is deprecated. Update your playbooks so that the environment value uses the full variable syntax ('{{foo}}')")
@ -347,11 +350,9 @@ class Task(Base, Conditional, Taggable, Become):
''' '''
Override for the 'tags' getattr fetcher, used from Base. Override for the 'tags' getattr fetcher, used from Base.
''' '''
environment = self._attributes['tags'] environment = self._attributes['environment']
if environment is None: if environment is None:
environment = dict() environment = self._get_parent_attribute('environment')
environment = self._get_parent_attribute('environment', extend=True)
return environment return environment

2
lib/ansible/plugins/action/__init__.py
View file

@ -116,6 +116,8 @@ class ActionBase:
environments = [ environments ] environments = [ environments ]
for environment in environments: for environment in environments:
if environment is None:
continue
if not isinstance(environment, dict): if not isinstance(environment, dict):
raise AnsibleError("environment must be a dictionary, received %s (%s)" % (environment, type(environment))) raise AnsibleError("environment must be a dictionary, received %s (%s)" % (environment, type(environment)))
# very deliberatly using update here instead of combine_vars, as # very deliberatly using update here instead of combine_vars, as