summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-01-20 22:04:10 -0800
committerMonty Taylor <mordred@inaugust.com>2015-01-21 12:31:02 -0800
commitbc5608837f7d144f2f480c45c9b5499fca22098e (patch)
treede23bc0844137d1586efde6d1d80e4705ef295ed
parentc75daaa1f9f0881cae63337e0d9799555f569c06 (diff)
downloados-client-config-bc5608837f7d144f2f480c45c9b5499fca22098e.tar.gz
Start keeping default versions for all services
It turns out we need to do the evil glance dance for almost everything. Change-Id: Ic0ad77ba0627bd4be88bdf0136aa04c2ba43afe6
-rw-r--r--os_client_config/config.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index 67436fa..bfc030e 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -47,13 +47,12 @@ def get_boolean(value):
return False
-def _get_os_environ():
- ret = dict(auth_plugin='password', auth=dict())
+def _get_os_environ(defaults):
for (k, v) in os.environ.items():
if k.startswith('OS_'):
newkey = k[3:].lower()
- ret[newkey] = v
- return ret
+ defaults[newkey] = v
+ return defaults
def _auth_update(old_dict, new_dict):
@@ -72,7 +71,12 @@ class OpenStackConfig(object):
self._config_files = config_files or CONFIG_FILES
self._vendor_files = vendor_files or VENDOR_FILES
- self.defaults = _get_os_environ()
+ defaults = dict(
+ auth_plugin='password',
+ auth=dict(),
+ compute_api_version='1.1',
+ )
+ self.defaults = _get_os_environ(defaults)
# use a config file if it exists where expected
self.cloud_config = self._load_config_file()