summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-20 14:56:13 +0000
committerGerrit Code Review <review@openstack.org>2015-07-20 14:56:13 +0000
commit2757709f8b84beb550b59bac48f4540a2b06b4ff (patch)
treea2ca2eb058f746b18a44d29c8acd04ea96515ae5
parent2647d5302c11f59d43b4869983e73cc066807281 (diff)
parent3891816acb6dd287f89498dd0fcb714b722f9252 (diff)
downloados-client-config-2757709f8b84beb550b59bac48f4540a2b06b4ff.tar.gz
Merge "Remove region list from single cloud"
-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 25fbf64..015a783 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -440,6 +440,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: