Merge "Revert "Skip haproxy with setup-infrastructure for upgrades""

This commit is contained in:
Zuul 2023-04-23 16:51:45 +00:00 committed by Gerrit Code Review
commit cc5b0c3eff
2 changed files with 2 additions and 16 deletions

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

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]}"