From 38b61e1027b3440f408c36f24fdcbe0037283c4d Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 13 Dec 2018 12:01:07 +0000 Subject: [PATCH] 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 --- .../upgrades/major-upgrades-manual-upgrade.rst | 15 +++++++-------- scripts/run-upgrade.sh | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/source/admin/upgrades/major-upgrades-manual-upgrade.rst b/doc/source/admin/upgrades/major-upgrades-manual-upgrade.rst index 152fab5e2c..e5a2f9a73a 100644 --- a/doc/source/admin/upgrades/major-upgrades-manual-upgrade.rst +++ b/doc/source/admin/upgrades/major-upgrades-manual-upgrade.rst @@ -148,11 +148,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -162,13 +162,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index ee5b6ff9c0..53b79bfa0e 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -173,9 +173,9 @@ function main { RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/pip-conf-removal.yml") RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ceph-galaxy-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")