diff --git a/dev/functions b/dev/functions index 8138312fb08adce9c722c6d40c9dbbcaddc691e2..88630cf6f3cd18c07bac9ed7126685ac165e306f 100644 --- a/dev/functions +++ b/dev/functions @@ -515,7 +515,13 @@ function overcloud_upgrade { echo "Upgrading a kayobe development environment. This consists of a " echo "single node OpenStack control plane." - migrate_rabbitmq_queues + # NOTE(mattcrees): As om_enable_rabbitmq_quorum_queues now defaults to true + # from Bobcat, we need to perform a migration to durable queues during + # SLURP upgrades from Antelope to Caracal. + # TODO(mattcrees): Remove in Dalmatian. + if [[ $IS_SLURP == "True" ]]; then + migrate_rabbitmq_queues + fi echo "Upgrading Kayobe" upgrade_kayobe_venv diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml index 9fde323113f21f680fb62b1d0adc6a817ca1ea73..98fdc44d0b0d8da55e6bcec34c298b88378cdd93 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/run.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml @@ -112,3 +112,4 @@ environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" KAYOBE_SOURCE_PATH: "{{ kayobe_src_dir }}" + IS_SLURP: "{{ is_slurp }}"