openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Only attempt to start previous MariaDB if the image is available"

This commit is contained in:
Zuul 2019-03-21 15:24:05 +00:00 committed by Gerrit Code Review
parent b152659d8d 39930ed2fd
commit a710e51c68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/database/mysql-container-puppet.yaml
View File

@ -305,7 +305,7 @@ outputs:
shell: |
{{ mysql_json.cli }} update --restart=unless-stopped mysql
{{ mysql_json.cli }} stop mysql
when: mysql_json.image != post_upgrade_mysql_image
when: mysql_json.image is defined and mysql_json.image != post_upgrade_mysql_image
- name: Clean up redo log by running a transient mysql server
shell:
str_replace:
@ -316,7 +316,7 @@ outputs:
IMAGE: "{{ mysql_json.image }}"
VOLUMES: "-v {{ mysql_clean_up_volumes | join(' -v ') }}"
SCRIPT: "{{ mysql_clean_up_script }}"
when: mysql_json.image != post_upgrade_mysql_image
when: mysql_json.image is defined and mysql_json.image != post_upgrade_mysql_image
post_upgrade_tasks:
- when: step|int == 1
import_role: