openstack
/
openstack-ansible
Code Issues Proposed changes

Ensure that control plane hosts are also updated correctly 

In queens the default for neutron_agents was set to deploy on metal.
so the exclusion of neutron_agents in the upgrade process for the
setup-hosts playbook end up excluding the whole control plane, which
is not good. One thing that happens for the Q->R upgrade is that the
apt proxy configuration is not removed, then all apt actions fail.

To ensure that we update the control plane as expected, we remove
the neutron_agents group from the exclusion.

Change-Id: Ic9453b042ac866abe55723dd16725f58e9453718
(cherry picked from commit 38b61e1027)
This commit is contained in:
Jesse Pretorius 2018-12-13 12:01:07 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 259a84f01c
commit 2278364721
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/source/admin/upgrades/major-upgrades-manual-upgrade.rst
View File

@ -161,11 +161,11 @@ Before installing the infrastructure and OpenStack, update the host machines.
.. code-block:: console
# openstack-ansible setup-hosts.yml --limit '!galera_all:!neutron_agent:!rabbitmq_all'
# openstack-ansible setup-hosts.yml --limit '!galera_all:!rabbitmq_all'
This command is the same setting up hosts on a new installation. The
``galera_all``, ``neutron_agent`` and ``rabbitmq_all`` host groups are excluded
to prevent reconfiguration and restarting of any of those containers.
``galera_all`` and ``rabbitmq_all`` host groups are excluded to prevent
reconfiguration and restarting of any of those containers.
Update the other LXC container configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -175,13 +175,12 @@ Update the other container configuration independently.
.. code-block:: console
# openstack-ansible lxc-containers-create.yml -e \
'lxc_container_allow_restarts=false' --limit 'galera_all:neutron_agent:rabbitmq_all'
'lxc_container_allow_restarts=false' --limit 'galera_all:rabbitmq_all'
This command is a subset of the host setup playbook, limited to the
``galera_all``, ``neutron_agent`` and ``rabbitmq_all`` host groups.
The configuration of those containers is updated but a restart for
any changes to take effect is deferred to another playbook or later
(see the next section).
``galera_all`` and ``rabbitmq_all`` host groups. The configuration of those
containers is updated but a restart forany changes to take effect is deferred
to another playbook or later (see the next section).
Perform a controlled rolling restart of the Galera containers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

4
scripts/run-upgrade.sh
View File

@ -174,9 +174,9 @@ function main {
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ceph-galaxy-removal.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/molteniron-role-removal.yml")
# we don't want to trigger container restarts for these groups yet
RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!neutron_agent:!rabbitmq_all'")
RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!rabbitmq_all'")
# add new container config to containers but don't restart
RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit 'galera_all:neutron_agent:rabbitmq_all'")
RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit 'galera_all:rabbitmq_all'")
# setup infra
RUN_TASKS+=("unbound-install.yml")
RUN_TASKS+=("repo-install.yml")