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

Fix constants to use environment variables in preference to config files

Browse source
This commit is contained in:
Toshio Kuratomi 2017-01-05 17:11:08 -08:00
parent f7d000fe74
commit 0ee9972903
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/constants.py
View file

@ -124,10 +124,6 @@ def get_config(p, section, key, env_var, default, value_type=None, expand_relati
def _get_config(p, section, key, env_var, default):
''' helper function for get_config '''
value = default
if env_var is not None:
env_value = os.environ.get(env_var, None)
if env_value is not None:
value = env_value
if p is not None:
try:
@ -135,6 +131,11 @@ def _get_config(p, section, key, env_var, default):
except:
pass
if env_var is not None:
env_value = os.environ.get(env_var, None)
if env_value is not None:
value = env_value
return to_text(value, errors='surrogate_or_strict', nonstring='passthru')