openstack/openstack-ansible
Code Issues Proposed changes

Revert "Skip haproxy with setup-infrastructure for upgrades"

Browse Source 
This reverts commit befd8424e2.

Reason for revert:

This change is not needed anymore for A release, especially with
separated-haproxy-service-config feature in place.

It creates a problem now, because haproxy-install.yml is responsible for
creating "base" haproxy service which is required for horizon to work.
If horizon does not work during setup-openstack.yml, tempest tests
may fail(along with the whole upgrade job in our CI)

That's why we need to run haproxy-install.yml, traditionally during
setup-infrastructure.

Change-Id: I5531e56610a8a63f601867d236831ce7d5e4d583
Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-os_horizon/+/879517
This commit is contained in:
Damian Dąbrowski 2023-04-11 17:29:31 +00:00
parent 930236d7d2
commit 4dca2883f7
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,13 +200,10 @@ Upgrade infrastructure
We can now go ahead with the upgrade of all the infrastructure components. To
ensure that rabbitmq and mariadb are upgraded, we pass the appropriate flags.
We also skip upgrading haproxy re-configuration at this step, since some
services will become unavailable right after running haproxy role, which we
want to avoid
.. code-block:: console
# openstack-ansible setup-infrastructure.yml -e 'galera_upgrade=true' -e 'rabbitmq_upgrade=true' -e 'package_state=latest' --skip-tags haproxy-config
# openstack-ansible setup-infrastructure.yml -e 'galera_upgrade=true' -e 'rabbitmq_upgrade=true' -e package_state=latest
With this complete, we can now restart the mariadb containers one at a time,
ensuring that each is started, responding, and synchronized with the other
@ -227,16 +224,6 @@ We can now go ahead with the upgrade of all the OpenStack components.
# openstack-ansible setup-openstack.yml -e package_state=latest
Run haproxy re-configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Now, once all services are being re-configured, we can run haproxy
role to apply new configuration for the backends
.. code-block:: console
# openstack-ansible haproxy-install.yml -e package_state=latest
Upgrade Ceph
~~~~~~~~~~~~

3
scripts/run-upgrade.sh
View File

@ -184,12 +184,11 @@ function main {
openstack-ansible setup-hosts.yml -e 'lxc_container_allow_restarts=false' --limit 'galera_all:rabbitmq_all' || \
openstack-ansible setup-hosts.yml -e package_state=latest")
# upgrade infrastructure
RUN_TASKS+=("setup-infrastructure.yml -e 'galera_upgrade=true' -e 'rabbitmq_upgrade=true' -e 'package_state=latest' --skip-tags haproxy-config")
RUN_TASKS+=("setup-infrastructure.yml -e 'galera_upgrade=true' -e 'rabbitmq_upgrade=true' -e package_state=latest")
# explicitly perform controlled galera cluster restart with new lxc config
RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/galera-cluster-rolling-restart.yml")
# upgrade openstack
RUN_TASKS+=("setup-openstack.yml -e package_state=latest")
RUN_TASKS+=("haproxy-install.yml -e package_state=latest")
# Run the tasks in order
for item in ${!RUN_TASKS[@]}; do
echo "### NOW RUNNING: ${RUN_TASKS[$item]}"