openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Make openstack undercloud upgrade --dry-run actually dry"

This commit is contained in:
Zuul 2018-08-29 08:49:29 +00:00 committed by Gerrit Code Review
parent b9541fba13 7c3a758342
commit 9c9b313b0b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tripleoclient/v1/undercloud.py
View File

@ -199,13 +199,14 @@ class UpgradeUndercloud(InstallUndercloud):
verbose_level=self.app_args.verbose_level,
force_stack_update=parsed_args.force_stack_update)
self.log.warning("Running: %s" % ' '.join(cmd))
try:
subprocess.check_call(cmd)
self.log.warning(UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
'~/undercloud-passwords.conf',
'~/stackrc'
))
except Exception as e:
self.log.error(UNDERCLOUD_FAILURE_MESSAGE)
self.log.error(e)
raise exceptions.DeploymentError(e)
if not parsed_args.dry_run:
try:
subprocess.check_call(cmd)
self.log.warning(
UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
'~/undercloud-passwords.conf',
'~/stackrc'))
except Exception as e:
self.log.error(UNDERCLOUD_FAILURE_MESSAGE)
self.log.error(e)
raise exceptions.DeploymentError(e)