diff options
| author | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:23:17 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:23:17 -0700 |
| commit | 0287e7cc4bfcafad919a7ab1decfa8e3707bda82 (patch) | |
| tree | e5519ab91e49f88c60abe56c0201ffcbb0c6f34e | |
| parent | 232f8323aab08c87314da8f3370ff3c2230d3f8f (diff) | |
| parent | 7bd5ff625f9c845e1199878caf15ed128a31bb52 (diff) | |
| download | os-client-config-0.2.0.tar.gz | |
Merge pull request #3 from dtroyer/vendor-key0.2.0
Handle missing vendor key
| -rw-r--r-- | os_client_config/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 6d96655..56992df 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -100,7 +100,11 @@ class OpenStackConfig(object): # yes, I know the next line looks silly if 'cloud' in our_cloud: - cloud.update(vendors.CLOUD_DEFAULTS[our_cloud['cloud']]) + try: + cloud.update(vendors.CLOUD_DEFAULTS[our_cloud['cloud']]) + except KeyError: + # Can't find the requested vendor config, go about business + pass cloud.update(our_cloud) if 'cloud' in cloud: |