fixed environment inheritance

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

View file

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