openstack
/
openstack-ansible
Code Issues Proposed changes

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
This commit is contained in:
Marc Gariepy 2018-01-25 11:14:50 -05:00
parent ce8fceed1b
commit 1df4fb9d64
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doc/source/upgrade-guide/manual-upgrade.rst
View File

@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~

4
scripts/run-upgrade.sh
View File

@ -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")