summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-03 14:43:35 +0000
committerGerrit Code Review <review@openstack.org>2016-08-03 14:43:35 +0000
commitae864d49bea45a61e3ba7fafa4f509d937a3aac1 (patch)
tree9f53f3c4164248cf44b6db4b0f0b9299ba5706fb
parent9f0a7a31f4fd067c452c18f9546e69b0a8d684e4 (diff)
parentd9e9bb791ba169e828d6068534ee2f430f4668eb (diff)
downloados-client-config-ae864d49bea45a61e3ba7fafa4f509d937a3aac1.tar.gz
Merge "Add support for listing a cloud as shut down"
-rw-r--r--os_client_config/config.py5
-rw-r--r--os_client_config/vendor-schema.json2
2 files changed, 6 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index 84476b2..f9b2de5 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -474,6 +474,11 @@ class OpenStackConfig(object):
warnings.warn(
"{profile_name} is deprecated: {message}".format(
profile_name=profile_name, message=message))
+ elif status == 'shutdown':
+ raise exceptions.OpenStackConfigException(
+ "{profile_name} references a cloud that no longer"
+ " exists: {message}".format(
+ profile_name=profile_name, message=message))
_auth_update(cloud, profile_data)
else:
# Can't find the requested vendor config, go about business
diff --git a/os_client_config/vendor-schema.json b/os_client_config/vendor-schema.json
index a5bee27..6a6f456 100644
--- a/os_client_config/vendor-schema.json
+++ b/os_client_config/vendor-schema.json
@@ -69,7 +69,7 @@
"status": {
"name": "Vendor status",
"description": "Status of the vendor's cloud",
- "enum": [ "active", "deprecated"],
+ "enum": [ "active", "deprecated", "shutdown"],
"default": "active"
},
"compute_service_name": {