From ee4edd42a24905d9ecc16d9e69d5d7095365bd7f Mon Sep 17 00:00:00 2001 From: Doug Shelley Date: Fri, 23 Sep 2016 21:42:54 +0000 Subject: [PATCH] Make parameter consistent in devstack plugin The control_exchange parameter was being set to "trove" in only 2 of the 4 conf files. Add the setting to the other two. Change-Id: I7706c495b95dc043dcc84b484795412cd2e3c19b Closes-bug: 1627170 --- devstack/plugin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index db1e613f59..a79a0711b3 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -126,6 +126,7 @@ function configure_trove { iniset_conditional $TROVE_CONF DEFAULT max_volumes_per_tenant $TROVE_MAX_VOLUMES_PER_TENANT iniset $TROVE_CONF DEFAULT rpc_backend "rabbit" + iniset $TROVE_CONF DEFAULT control_exchange trove iniset $TROVE_CONF oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST iniset $TROVE_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID @@ -151,6 +152,7 @@ function configure_trove { iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT state_change_wait_time $TROVE_STATE_CHANGE_WAIT_TIME iniset $TROVE_TASKMANAGER_CONF DEFAULT rpc_backend "rabbit" + iniset $TROVE_TASKMANAGER_CONF DEFAULT control_exchange trove iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID