Browse code
Add guestagent to defined Trove conf variables
When the Trove configuration files were defined in variables, the
guestagent wasn't included. In order for profiling to continue on the
guestagent, its configuration file must be defined as well.
(See https://bugs.launchpad.net/devstack/+bug/1421403)
TROVE_GUESTAGENT_CONF is now defined.
Change-Id: Ie7cb531e2a1eca74100e2466a430e85eaf936263
Closes-Bug: #1427506
Peter Stachowski authored on 2015/03/03 13:32:04Showing 1 changed files
| ... | ... |
@@ -37,6 +37,7 @@ TROVE_CONF_DIR=/etc/trove |
| 37 | 37 |
TROVE_CONF=$TROVE_CONF_DIR/trove.conf |
| 38 | 38 |
TROVE_TASKMANAGER_CONF=$TROVE_CONF_DIR/trove-taskmanager.conf |
| 39 | 39 |
TROVE_CONDUCTOR_CONF=$TROVE_CONF_DIR/trove-conductor.conf |
| 40 |
+TROVE_GUESTAGENT_CONF=$TROVE_CONF_DIR/trove-guestagent.conf |
|
| 40 | 41 |
TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini |
| 41 | 42 |
|
| 42 | 43 |
TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove |
| ... | ... |
@@ -171,18 +172,18 @@ function configure_trove {
|
| 171 | 171 |
fi |
| 172 | 172 |
|
| 173 | 173 |
# Set up Guest Agent conf |
| 174 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_userid $RABBIT_USERID |
|
| 175 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_host $TROVE_HOST_GATEWAY |
|
| 176 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
|
| 177 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_user radmin |
|
| 178 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_tenant_name trove |
|
| 179 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS |
|
| 180 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT |
|
| 181 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT control_exchange trove |
|
| 182 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT ignore_users os_admin |
|
| 183 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT log_dir /var/log/trove/ |
|
| 184 |
- iniset $TROVE_CONF_DIR/trove-guestagent.conf DEFAULT log_file trove-guestagent.log |
|
| 185 |
- setup_trove_logging $TROVE_CONF_DIR/trove-guestagent.conf |
|
| 174 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_userid $RABBIT_USERID |
|
| 175 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_host $TROVE_HOST_GATEWAY |
|
| 176 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_password $RABBIT_PASSWORD |
|
| 177 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_user radmin |
|
| 178 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_tenant_name trove |
|
| 179 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS |
|
| 180 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT |
|
| 181 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT control_exchange trove |
|
| 182 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT ignore_users os_admin |
|
| 183 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT log_dir /var/log/trove/ |
|
| 184 |
+ iniset $TROVE_GUESTAGENT_CONF DEFAULT log_file trove-guestagent.log |
|
| 185 |
+ setup_trove_logging $TROVE_GUESTAGENT_CONF |
|
| 186 | 186 |
} |
| 187 | 187 |
|
| 188 | 188 |
# install_troveclient() - Collect source and prepare |