diff options
| author | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:20:32 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:20:32 -0700 |
| commit | 232f8323aab08c87314da8f3370ff3c2230d3f8f (patch) | |
| tree | b148c84a15b51ca14672a8a95de3e391843fd95c | |
| parent | c462710f8d1d9ea404fd70e7c72be492a38e5616 (diff) | |
| parent | b8382c349687b09e15f92cde9d0099fea5252657 (diff) | |
| download | os-client-config-232f8323aab08c87314da8f3370ff3c2230d3f8f.tar.gz | |
Merge pull request #1 from dtroyer/env-vars
Make env vars lowest priority
| -rw-r--r-- | os_client_config/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 208b18a..6d96655 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -95,11 +95,13 @@ class OpenStackConfig(object): else: our_cloud = dict() + # Get the defaults (including env vars) first + cloud.update(self.defaults) + # yes, I know the next line looks silly if 'cloud' in our_cloud: cloud.update(vendors.CLOUD_DEFAULTS[our_cloud['cloud']]) - cloud.update(self.defaults) cloud.update(our_cloud) if 'cloud' in cloud: del cloud['cloud'] |