summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-07-16 09:09:35 -0400
committerMonty Taylor <mordred@inaugust.com>2015-07-16 09:09:35 -0400
commit3891816acb6dd287f89498dd0fcb714b722f9252 (patch)
tree78f38245193b9ced197e4f6648f50777227079b1
parent1065ea4dbf91a1416e267223d0db96719490653b (diff)
downloados-client-config-3891816acb6dd287f89498dd0fcb714b722f9252.tar.gz
Remove region list from single cloud
regions is a list of regions that can be used to create more than one CloudConfig object for each cloud/region combo. The regions field itself makes no sense to set on each of those CloudConfigs, so do not pass it through. Change-Id: I76b3bb3bc4778223d72f86d01d02ce150651b3b9
-rw-r--r--os_client_config/config.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index 93d7aa0..6c3abff 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -423,6 +423,10 @@ class OpenStackConfig(object):
config = self._get_base_cloud_config(cloud)
+ # Regions is a list that we can use to create a list of cloud/region
+ # objects. It does not belong in the single-cloud dict
+ config.pop('regions', None)
+
# Can't just do update, because None values take over
for (key, val) in iter(args.items()):
if val is not None: