openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Upgrade playbook fixes for OS upgrade"

Browse Source
This commit is contained in:
Zuul 2019-06-20 22:52:15 +00:00 committed by Gerrit Code Review
commit b546b425f9
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -556,6 +556,7 @@ outputs:
- ' ' - ' '
- - 'kolla_set_configs;' - - 'kolla_set_configs;'
- 'chown -R mysql:mysql /var/lib/mysql;' - 'chown -R mysql:mysql /var/lib/mysql;'
- 'chown -R mysql:mysql /var/log/mariadb;'
- 'mysqld_safe --user=mysql --wsrep-provider=none --skip-networking --wsrep-on=off &' - 'mysqld_safe --user=mysql --wsrep-provider=none --skip-networking --wsrep-on=off &'
- 'timeout 60 sh -c ''while ! mysqladmin ping --silent; do sleep 1; done'';' - 'timeout 60 sh -c ''while ! mysqladmin ping --silent; do sleep 1; done'';'
- 'mysql_upgrade;' - 'mysql_upgrade;'
@ -563,6 +564,13 @@ outputs:
- name: Bind mounts for temporary container - name: Bind mounts for temporary container
set_fact: set_fact:
mysql_upgrade_db_bind_mounts: *mysql_volumes mysql_upgrade_db_bind_mounts: *mysql_volumes
- name: Make sure Mysql upgrade temporary directory exists
file:
path: /tmp/mariadb-upgrade
state: directory
owner: root
group: root
mode: 0700
- name: Upgrade Mysql database from a temporary container - name: Upgrade Mysql database from a temporary container
shell: shell:
str_replace: str_replace:

6
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -238,14 +238,20 @@ outputs:
when: pacemaker_short_node_names_upgraded | length == pacemaker_short_node_names | length when: pacemaker_short_node_names_upgraded | length == pacemaker_short_node_names | length
- name: upgrade step 2 - name: upgrade step 2
when: step|int == 2 when: step|int == 2
vars:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
block: block:
- name: Stop pacemaker cluster - name: Stop pacemaker cluster
pacemaker_cluster: state=offline pacemaker_cluster: state=offline
when: not upgrade_leapp_enabled
- name: upgrade step 4 - name: upgrade step 4
when: step|int == 4 when: step|int == 4
vars:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
block: block:
- name: Start pacemaker cluster - name: Start pacemaker cluster
pacemaker_cluster: state=online pacemaker_cluster: state=online
when: not upgrade_leapp_enabled
update_tasks: update_tasks:
- name: Check pacemaker cluster running before the minor update - name: Check pacemaker cluster running before the minor update
when: step|int == 0 # TODO(marios) disabling validations? when: step|int == 0 # TODO(marios) disabling validations?