Merge "Add support for listing a cloud as shut down"

This commit is contained in:
Jenkins 2016-08-03 14:43:35 +00:00 committed by Gerrit Code Review
commit ae864d49be
2 changed files with 6 additions and 1 deletions

View File

@ -474,6 +474,11 @@ class OpenStackConfig(object):
warnings.warn( warnings.warn(
"{profile_name} is deprecated: {message}".format( "{profile_name} is deprecated: {message}".format(
profile_name=profile_name, message=message)) 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) _auth_update(cloud, profile_data)
else: else:
# Can't find the requested vendor config, go about business # Can't find the requested vendor config, go about business

View File

@ -69,7 +69,7 @@
"status": { "status": {
"name": "Vendor status", "name": "Vendor status",
"description": "Status of the vendor's cloud", "description": "Status of the vendor's cloud",
"enum": [ "active", "deprecated"], "enum": [ "active", "deprecated", "shutdown"],
"default": "active" "default": "active"
}, },
"compute_service_name": { "compute_service_name": {