diff options
author | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:19:44 -0700 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2014-09-21 20:19:44 -0700 |
commit | c462710f8d1d9ea404fd70e7c72be492a38e5616 (patch) | |
tree | 54f507c5926c2f27dee9757ec170c015430122cd | |
parent | 1277d4cfc58a0c4e7338e29ada0df9631d62da21 (diff) | |
parent | 1113d0523d1f35af11ac17112a6ac7cd2a1a085a (diff) | |
download | os-client-config-c462710f8d1d9ea404fd70e7c72be492a38e5616.tar.gz |
Merge pull request #2 from dtroyer/null-region
Handle null region
-rw-r--r-- | os_client_config/config.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 5cc8edd..208b18a 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -56,6 +56,7 @@ class OpenStackConfig(object): defaults.add('insecure') defaults.add('endpoint_type') defaults.add('cacert') + defaults.add('auth_type') self.defaults = defaults @@ -75,7 +76,11 @@ class OpenStackConfig(object): return yaml.load(open(path, 'r')) def _get_regions(self, cloud): - return self.cloud_config['clouds'][cloud]['region_name'] + try: + return self.cloud_config['clouds'][cloud]['region_name'] + except KeyError: + # No region configured + return '' def _get_region(self, cloud): return self._get_regions(cloud).split(',')[0] |