diff options
| author | Matt Crees <mattc@stackhpc.com> | 2023-11-28 10:07:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-11-28 10:07:12 +0000 |
| commit | cdda49ecb916e7301dc656c73b2c81358aac6518 (patch) | |
| tree | cb24fc638b92041123e57fc80b03a35c70aaff55 /tests | |
| parent | b86c304a2987d0e60570bcd43cbb08da9b64c241 (diff) | |
| download | kolla-ansible-cdda49ecb916e7301dc656c73b2c81358aac6518.tar.gz kolla-ansible-cdda49ecb916e7301dc656c73b2c81358aac6518.zip | |
Revert "Enable RabbitMQ HA queues by default"
This reverts commit b86c304a2987d0e60570bcd43cbb08da9b64c241.
Reason for revert: We want to enable Quorum Queues by default in Caracal, without requiring two queue migrations between releases. See etherpad for details: https://etherpad.opendev.org/p/kolla-ansible-rmq-quorum-queues-proposal
Change-Id: Ia19ab97f538125475297976347c5da332a7fdda7
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/upgrade.sh | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/tests/upgrade.sh b/tests/upgrade.sh index fc0de8044..23a77c9a9 100755 --- a/tests/upgrade.sh +++ b/tests/upgrade.sh @@ -12,36 +12,8 @@ function upgrade { source $KOLLA_ANSIBLE_VENV_PATH/bin/activate - kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks --skip-tags rabbitmq-ha-precheck &> /tmp/logs/ansible/upgrade-prechecks + kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/upgrade-prechecks kolla-ansible -i ${RAW_INVENTORY} -vvv pull &> /tmp/logs/ansible/pull-upgrade - - # NOTE(mattcrees): As om_enable_rabbitmq_high_availability now defaults to - # true in Bobcat, we need to perform a migration to durable queues. - # TODO(mattcrees): Remove these steps in Caracal (and the precheck flag above). - SERVICE_TAGS="heat,keystone,neutron,nova" - if [[ $SCENARIO == "zun" ]] || [[ $SCENARIO == "cephadm" ]]; then - SERVICE_TAGS+=",cinder" - fi - if [[ $SCENARIO == "scenario_nfv" ]]; then - SERVICE_TAGS+=",barbican" - fi - if [[ $SCENARIO == "ironic" ]]; then - SERVICE_TAGS+=",ironic" - fi - if [[ $SCENARIO == "masakari" ]]; then - SERVICE_TAGS+=",masakari" - fi - if [[ $SCENARIO == "ovn" ]] || [[ $SCENARIO == "octavia" ]]; then - SERVICE_TAGS+=",octavia" - fi - if [[ $SCENARIO == "magnum" ]]; then - SERVICE_TAGS+=",magnum,designate" - fi - kolla-ansible -i ${RAW_INVENTORY} -vvv stop --tags $SERVICE_TAGS --yes-i-really-really-mean-it &> /tmp/logs/ansible/stop - kolla-ansible -i ${RAW_INVENTORY} -vvv genconfig &> /tmp/logs/ansible/genconfig - kolla-ansible -i ${RAW_INVENTORY} -vvv reconfigure --tags rabbitmq &> /tmp/logs/ansible/reconfigure-rabbitmq - kolla-ansible -i ${RAW_INVENTORY} -vvv rabbitmq-reset-state &> /tmp/logs/ansible/rabbitmq-reset-state - kolla-ansible -i ${RAW_INVENTORY} -vvv upgrade &> /tmp/logs/ansible/upgrade # NOTE(yoctozepto): These actions remove the leftovers of the admin port. |