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

Correct logic around determining environment variable existence

Browse source 
Fixes #13105
This commit is contained in:
James Cammarata 2015-11-09 21:04:24 -05:00
parent c753ae6e22
commit 09994c18f3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/vars/__init__.py
View file

@ -329,10 +329,11 @@ class VariableManager:
# special case for the 'environment' magic variable, as someone # special case for the 'environment' magic variable, as someone
# may have set it as a variable and we don't want to stomp on it # may have set it as a variable and we don't want to stomp on it
if task and 'environment' not in all_vars: if task:
all_vars['environment'] = task.environment if 'environment' not in all_vars:
else: all_vars['environment'] = task.environment
display.warning("The variable 'environment' appears to be used already, which is also used internally for environment variables set on the task/block/play. You should use a different variable name to avoid conflicts with this internal variable") else:
display.warning("The variable 'environment' appears to be used already, which is also used internally for environment variables set on the task/block/play. You should use a different variable name to avoid conflicts with this internal variable")
# if we have a task and we're delegating to another host, figure out the # if we have a task and we're delegating to another host, figure out the
# variables for that host now so we don't have to rely on hostvars later # variables for that host now so we don't have to rely on hostvars later