openstack/trove
Code Issues Proposed changes

Make parameter consistent in devstack plugin

Browse Source 
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
This commit is contained in:
Doug Shelley 2016-09-23 21:42:54 +00:00
parent 7c405f3d39
commit ee4edd42a2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -126,6 +126,7 @@ function configure_trove {
iniset_conditional $TROVE_CONF DEFAULT max_volumes_per_tenant $TROVE_MAX_VOLUMES_PER_TENANT 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 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_hosts $RABBIT_HOST
iniset $TROVE_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $TROVE_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID 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_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 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_hosts $RABBIT_HOST
iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID