From 1df4fb9d64d8a23be4a2c01502e45c97b6235d32 Mon Sep 17 00:00:00 2001 From: Marc Gariepy Date: Thu, 25 Jan 2018 11:14:50 -0500 Subject: [PATCH] Fix upgrade order, align docs with script When upgrading to Ocata, the check for galera changes in haproxy so we need to deploy galera first then deploy haproxy second. Fix the order in the run-upgrade.sh script. Change-Id: I64ff9d5cfb5a6aec4fb793aaff11b4bb82e1aadb --- doc/source/upgrade-guide/manual-upgrade.rst | 38 ++++++++++----------- scripts/run-upgrade.sh | 4 +-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/source/upgrade-guide/manual-upgrade.rst b/doc/source/upgrade-guide/manual-upgrade.rst index ce4356371d..c62dc5d568 100644 --- a/doc/source/upgrade-guide/manual-upgrade.rst +++ b/doc/source/upgrade-guide/manual-upgrade.rst @@ -140,6 +140,25 @@ This command is a subset of the host setup playbook, limited to the updated but a restart for any changes to take effect is deferred to another playbook (see the next section). +Update repository servers +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Update the configuration of the repository servers and build new packages +required by the |current_release_formal_name| release. + +.. code-block:: console + + # openstack-ansible repo-install.yml + +Upgrade the MariaDB version +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upgrade MariaDB to the most recent 10.x minor release across the cluster. + +.. code-block:: console + + # openstack-ansible galera-install.yml -e 'galera_upgrade=true' + Perform a controlled rolling restart of the Galera containers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -162,25 +181,6 @@ Install and update any new or changed HAProxy service configurations. # openstack-ansible haproxy-install.yml -Update repository servers -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Update the configuration of the repository servers and build new packages -required by the |current_release_formal_name| release. - -.. code-block:: console - - # openstack-ansible repo-install.yml - -Upgrade the MariaDB version -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upgrade MariaDB to the most recent 10.x minor release across the cluster. - -.. code-block:: console - - # openstack-ansible galera-install.yml -e 'galera_upgrade=true' - Upgrade the infrastructure ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 9952ebeace..05eb330ced 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -173,13 +173,13 @@ function main { RUN_TASKS+=("setup-hosts.yml --limit '!galera_all'") # add new container config to galera containers but don't restart RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit galera_all") - RUN_TASKS+=("haproxy-install.yml") - # rebuild the repo servers + # rebuild the repo servers RUN_TASKS+=("repo-install.yml") # explicitly perform mariadb upgrade RUN_TASKS+=("galera-install.yml -e 'galera_upgrade=true'") # explicitly perform controlled galera cluster restart RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/galera-cluster-rolling-restart.yml") + RUN_TASKS+=("haproxy-install.yml") # individually run each of the remaining plays from setup-infrastructure RUN_TASKS+=("unbound-install.yml") RUN_TASKS+=("memcached-install.yml")