From 7bb9a73b8cbb62b31cbf8faa0f19d9c609b359fd Mon Sep 17 00:00:00 2001 From: Sushil Kumar Date: Sat, 13 Dec 2014 16:32:11 +0000 Subject: [PATCH] Adds missing rabbit_userid to trove configs - rabbit_userid was only updated in trove.conf leaving other trove configuration files not having this value. - Trove service setup was broken because of this. - Added rabbit_userid to trove-taskmanager.conf, trove-conductor.conf and trove-guest.conf. Change-Id: I60bd160600ec4a02c94ee5e33e4bc91c9f2aa2ed Closes-Bug: #1402227 --- lib/trove | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/trove b/lib/trove index 4149b0d592..8b7b0ef640 100644 --- a/lib/trove +++ b/lib/trove @@ -146,7 +146,7 @@ function configure_trove { if is_service_enabled tr-tmgr; then TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION - iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID + iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_userid $RABBIT_USERID iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT sql_connection `database_connection_url trove` iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT taskmanager_manager trove.taskmanager.manager.Manager @@ -159,7 +159,7 @@ function configure_trove { # (Re)create trove conductor conf file if needed if is_service_enabled tr-cond; then - iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID + iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_userid $RABBIT_USERID iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT sql_connection `database_connection_url trove` iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT nova_proxy_admin_user radmin @@ -171,7 +171,7 @@ function configure_trove { fi # Set up Guest Agent conf - iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID + iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_userid $RABBIT_USERID iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_host $TROVE_HOST_GATEWAY iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_user radmin