Merge "Remove mariadb-server packages from the host" into stable/train
This commit is contained in:
commit
7992e9f3d0
|
@ -359,6 +359,11 @@ outputs:
|
||||||
container_image_latest: "{{galera_image_latest}}"
|
container_image_latest: "{{galera_image_latest}}"
|
||||||
when:
|
when:
|
||||||
- old_galera_image_id.stdout != new_galera_image_id.stdout
|
- old_galera_image_id.stdout != new_galera_image_id.stdout
|
||||||
|
- name: Ensure mariadb-server is not installed on the host
|
||||||
|
when: step|int == 2
|
||||||
|
yum:
|
||||||
|
name: 'mariadb-server*'
|
||||||
|
state: absent
|
||||||
|
|
||||||
post_update_tasks:
|
post_update_tasks:
|
||||||
- name: Mysql bundle post update
|
- name: Mysql bundle post update
|
||||||
|
@ -555,12 +560,6 @@ outputs:
|
||||||
# So do not exercise the upgrade if mysql is already running.
|
# So do not exercise the upgrade if mysql is already running.
|
||||||
when: step|int == 3
|
when: step|int == 3
|
||||||
block:
|
block:
|
||||||
# mariadb package changes ownership of /var/lib/mysql on package
|
|
||||||
# update, so update here rather than in tripleo-package, to
|
|
||||||
# guarantee that ownership is fixed at the end of step 3
|
|
||||||
- name: Update host mariadb packages
|
|
||||||
when: step|int == 3
|
|
||||||
package: name=mariadb-server-galera state=latest
|
|
||||||
- name: Mysql upgrade script
|
- name: Mysql upgrade script
|
||||||
set_fact:
|
set_fact:
|
||||||
mysql_upgrade_script:
|
mysql_upgrade_script:
|
||||||
|
|
|
@ -235,6 +235,7 @@ outputs:
|
||||||
httpd
|
httpd
|
||||||
kernel-devel
|
kernel-devel
|
||||||
mysql*
|
mysql*
|
||||||
|
mariadb-server*
|
||||||
pacemaker*
|
pacemaker*
|
||||||
python-jsonpointer
|
python-jsonpointer
|
||||||
qemu-kvm-common-rhev
|
qemu-kvm-common-rhev
|
||||||
|
|
Loading…
Reference in New Issue