Browse code
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
Sushil Kumar authored on 2014/12/14 01:32:11Showing 1 changed files
| ... | ... |
@@ -146,7 +146,7 @@ function configure_trove {
|
| 146 | 146 |
if is_service_enabled tr-tmgr; then |
| 147 | 147 |
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION |
| 148 | 148 |
|
| 149 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 149 |
+ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 150 | 150 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
| 151 | 151 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT sql_connection `database_connection_url trove` |
| 152 | 152 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT taskmanager_manager trove.taskmanager.manager.Manager |
| ... | ... |
@@ -159,7 +159,7 @@ function configure_trove {
|
| 159 | 159 |
|
| 160 | 160 |
# (Re)create trove conductor conf file if needed |
| 161 | 161 |
if is_service_enabled tr-cond; then |
| 162 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 162 |
+ iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 163 | 163 |
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
| 164 | 164 |
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT sql_connection `database_connection_url trove` |
| 165 | 165 |
iniset $TROVE_CONF_DIR/trove-conductor.conf DEFAULT nova_proxy_admin_user radmin |
| ... | ... |
@@ -171,7 +171,7 @@ function configure_trove {
|
| 171 | 171 |
fi |
| 172 | 172 |
|
| 173 | 173 |
# Set up Guest Agent conf |
| 174 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 174 |
+ iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 175 | 175 |
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_host $TROVE_HOST_GATEWAY |
| 176 | 176 |
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
| 177 | 177 |
iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_user radmin |