openstack/tripleo-common
Code Issues Proposed changes

Merge "Adds output for failure cases to delete plan action"

Browse Source
This commit is contained in:
Jenkins
2016-12-21 16:37:22 +00:00
committed by Gerrit Code Review
parent e059fec8b0 745b4b88c4
commit e36ffd416d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tripleo_common/actions/plan.py
View File

@@ -239,7 +239,11 @@ class DeletePlanAction(base.TripleOAction):
swift.get_account()[1]]: swift.get_account()[1]]:
box = swift.get_container(self.container) box = swift.get_container(self.container)
# ensure container is a plan # ensure container is a plan
if box[0].get(constants.TRIPLEO_META_USAGE_KEY) == 'plan': if box[0].get(constants.TRIPLEO_META_USAGE_KEY) != 'plan':
error_text = ("The {name} container does not contain a "
"TripleO deployment plan and was not "
"deleted.".format(name=self.container))
else:
# FIXME(rbrady): remove delete_object loop when # FIXME(rbrady): remove delete_object loop when
# LP#1615830 is fixed. See LP#1615825 for more info. # LP#1615830 is fixed. See LP#1615825 for more info.
# delete files from plan # delete files from plan
@@ -253,7 +257,10 @@ class DeletePlanAction(base.TripleOAction):
mistral.environments.list()]: mistral.environments.list()]:
# deletes environment # deletes environment
mistral.environments.delete(self.container) mistral.environments.delete(self.container)
else:
# container does not exist
error_text = "The {name} container does not exist.".format(
name=self.container)
except swiftexceptions.ClientException as ce: except swiftexceptions.ClientException as ce:
LOG.exception("Swift error deleting plan.") LOG.exception("Swift error deleting plan.")
error_text = ce.msg error_text = ce.msg