Skip to content

Commit 4cd6277

Browse files
committed
Add conditional choice of kolla/globals.yml path
1 parent 67f0a69 commit 4cd6277

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

tools/upgrade-prerequisites.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,19 @@ function rabbit_upgrade() {
3131
function rabbit_migration() {
3232
if ! kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl list_queues type | grep quorum"; then
3333
# Set quorum flag, execute RabbitMQ queue migration script, unset quorum flag (to avoid git conflicts)
34+
KOLLA_GLOBALS_PATH=$KAYOBE_CONFIG_PATH/kolla/globals.yml
35+
if [[ $KAYOBE_ENVIRONMENT ]]; then
36+
KOLLA_GLOBALS_PATH=$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
37+
fi
3438
sed -i -e 's/om_enable_rabbitmq_high_availability: true/om_enable_rabbitmq_high_availability: false/' \
3539
-e 's/om_enable_rabbitmq_quorum_queues: false/om_enable_rabbitmq_quorum_queues: true/' \
36-
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
40+
$KOLLA_GLOBALS_PATH
3741

3842
$KAYOBE_CONFIG_PATH/../../tools/rabbitmq-quorum-migration.sh
3943

4044
sed -i -e 's/om_enable_rabbitmq_high_availability: false/om_enable_rabbitmq_high_availability: true/' \
4145
-e 's/om_enable_rabbitmq_quorum_queues: true/om_enable_rabbitmq_quorum_queues: false/' \
42-
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
46+
$KOLLA_GLOBALS_PATH
4347
fi
4448
}
4549

0 commit comments

Comments
 (0)