Merge "Remove existing MariaDB HTTPS repos during upgrade"

doc/source/upgrade-guide/manual-upgrade.rst

@@ -118,6 +118,16 @@ See :ref:`user-secrets-playbook` for more details.
 
     # openstack-ansible "${UPGRADE_PLAYBOOKS}/user-secrets-adjustment.yml"
 
+Cleanup old MariaDB apt repositories
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default MariaDB apt repositories have been changed to use HTTP instead of
+HTTPS. This playbook removes existing repositories of the previous default.
+
+.. code-block:: console
+
+    # openstack-ansible "${UPGRADE_PLAYBOOKS}/mariadb-apt-cleanup.yml
+
 Update database collations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

scripts/run-upgrade.sh

@@ -151,6 +151,7 @@ function main {
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ansible_fact_cleanup.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/deploy-config-changes.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/user-secrets-adjustment.yml")
+        RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/mariadb-apt-cleanup.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/db-collation-alter.yml")
         RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/pip-conf-removal.yml")
         # we don't want to trigger galera container restarts yet

scripts/upgrade-utilities/playbooks/mariadb-apt-cleanup.yml

@@ -0,0 +1,24 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: MariaDB apt sources cleanup
+  hosts: "hosts:all_containers"
+  gather_facts: false
+  user: root
+  tasks:
+    - name: Remove MariaDB repositories left over from Mitaka
+      apt_repository:
+        repo: "deb https://mirror.rackspace.com/mariadb/repo/10.0/ubuntu trusty main"
+        state: "absent"