Merge "Remove mariadb-server packages from the host" into stable/train

deployment/database/mysql-pacemaker-puppet.yaml

@@ -359,6 +359,11 @@ outputs:
                 container_image_latest: "{{galera_image_latest}}"
               when:
                 - 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:
         - name: Mysql bundle post update
@@ -555,12 +560,6 @@ outputs:
          # So do not exercise the upgrade if mysql is already running.
           when: step|int == 3
           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
               set_fact:
                 mysql_upgrade_script:

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -235,6 +235,7 @@ outputs:
                 httpd
                 kernel-devel
                 mysql*
+                mariadb-server*
                 pacemaker*
                 python-jsonpointer
                 qemu-kvm-common-rhev