mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Transform config values to text immediately when they enter ansible
Convert configuration values from ENV VARS, config files, and defaults in constants.py.
This commit is contained in:
parent
9b7c9931db
commit
4d355f8bf2
1 changed files with 9 additions and 8 deletions
|
@ -123,18 +123,19 @@ 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:
|
||||
value = os.environ.get(env_var, None)
|
||||
if value is not None:
|
||||
return value
|
||||
env_value = os.environ.get(env_var, None)
|
||||
if env_value is not None:
|
||||
value = env_value
|
||||
|
||||
if p is not None:
|
||||
try:
|
||||
# TODO: Once we branch Ansible-2.2, change to the following in devel
|
||||
#return to_text(p.get(section, key, raw=True), errors='surrogate_or_strict')
|
||||
return p.get(section, key, raw=True)
|
||||
value = p.get(section, key, raw=True)
|
||||
except:
|
||||
return default
|
||||
return default
|
||||
pass
|
||||
|
||||
return to_text(value, errors='surrogate_or_strict')
|
||||
|
||||
|
||||
def load_config_file():
|
||||
|
|
Loading…
Reference in a new issue