diff options
author | Dean Troyer <dtroyer@gmail.com> | 2014-09-21 22:16:02 -0500 |
---|---|---|
committer | Dean Troyer <dtroyer@gmail.com> | 2014-09-21 22:16:24 -0500 |
commit | 7bd5ff625f9c845e1199878caf15ed128a31bb52 (patch) | |
tree | 2ea32304176cc9163b40db5fef896927c1e13d56 /os_client_config | |
parent | 1277d4cfc58a0c4e7338e29ada0df9631d62da21 (diff) | |
download | os-client-config-7bd5ff625f9c845e1199878caf15ed128a31bb52.tar.gz |
Handle missing vendor key
Continue on if the configured vendor config is not present
Diffstat (limited to 'os_client_config')
-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 5cc8edd..5b8c53a 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -92,7 +92,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(self.defaults) cloud.update(our_cloud) |