diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-12 23:49:57 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-12 23:49:57 +0000 |
commit | 3777f11003788ec7b443004a8626ceb5ec812e4f (patch) | |
tree | 6f4f54d817b31c643c3e9b60fcf896c89292b563 /os_client_config/config.py | |
parent | 21771ddfef66f5c3f6dd548101ba5b60b843db6e (diff) | |
parent | c6d2aeada4d9074f185f9748a81f7c651614e347 (diff) | |
download | os-client-config-3777f11003788ec7b443004a8626ceb5ec812e4f.tar.gz |
Merge "Don't create envvars cloud if cloud or region are set"
Diffstat (limited to 'os_client_config/config.py')
-rw-r--r-- | os_client_config/config.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 5ab0d90..6ff2359 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -105,12 +105,11 @@ def _get_os_environ(envvar_prefix=None): for k in environkeys: newkey = k.split('_', 1)[-1].lower() ret[newkey] = os.environ[k] - # If the only environ key is region name, don't make a cloud, because - # it's being used as a cloud selector - if not environkeys or ( - len(environkeys) == 1 and 'region_name' in ret): - return None - return ret + # If the only environ keys are cloud and region_name, don't return anything + # because they are cloud selectors + if set(environkeys) - set(['OS_CLOUD', 'OS_REGION_NAME']): + return ret + return None def _merge_clouds(old_dict, new_dict): |