openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Only delete heat data in the DB if it exists" into stable/wallaby

This commit is contained in:
Zuul 2021-09-27 18:19:10 +00:00 committed by Gerrit Code Review
parent 3584fe9b2b f58e759e18
commit 76fd9abf1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/undercloud-upgrade-ephemeral-heat.py
View File

@ -213,20 +213,20 @@ def drop_db():
subprocess.check_call([
'sudo', 'podman', 'exec', '-u', 'root',
'mysql', 'mysql', 'heat', '-e',
'drop database heat'])
'drop database if exists heat'])
LOG.info("Dropping Heat users")
subprocess.check_call([
'sudo', 'podman', 'exec', '-u', 'root',
'mysql', 'mysql', '-e',
'drop user \'heat\'@\'{}\''.format(_get_ctlplane_ip())])
'drop user if exists \'heat\'@\'{}\''.format(_get_ctlplane_ip())])
subprocess.check_call([
'sudo', 'podman', 'exec', '-u', 'root',
'mysql', 'mysql', '-e',
'drop user \'heat\'@\'{}\''.format(_get_ctlplane_vip())])
'drop user if exists \'heat\'@\'{}\''.format(_get_ctlplane_vip())])
subprocess.check_call([
'sudo', 'podman', 'exec', '-u', 'root',
'mysql', 'mysql', '-e',
'drop user \'heat\'@\'%\''])
'drop user if exists \'heat\'@\'%\''])
def export_passwords(heat, stack, stack_dir):