Browse code
Trove: Set appropriate service URLs
Without setting these, they default to localhost which
works in the the gate, but may not work in all devstack
setups.
Change-Id: I50eadbf0b4975cf04ec945bcf463c2738e6e7a3c
Bob Ball authored on 2014/04/02 06:31:00Showing 1 changed files
| ... | ... |
@@ -147,6 +147,9 @@ function configure_trove {
|
| 147 | 147 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
| 148 | 148 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT sql_connection `database_connection_url trove` |
| 149 | 149 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT add_addresses True |
| 150 |
+ iniset $TROVE_CONF_DIR/trove.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 |
|
| 151 |
+ iniset $TROVE_CONF_DIR/trove.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 |
|
| 152 |
+ iniset $TROVE_CONF_DIR/trove.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ |
|
| 150 | 153 |
|
| 151 | 154 |
iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT rabbit_password $RABBIT_PASSWORD |
| 152 | 155 |
sed -i "s/localhost/$NETWORK_GATEWAY/g" $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample |
| ... | ... |
@@ -164,6 +167,9 @@ function configure_trove {
|
| 164 | 164 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_user radmin |
| 165 | 165 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_tenant_name trove |
| 166 | 166 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS |
| 167 |
+ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 |
|
| 168 |
+ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 |
|
| 169 |
+ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ |
|
| 167 | 170 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT |
| 168 | 171 |
setup_trove_logging $TROVE_CONF_DIR/trove-taskmanager.conf |
| 169 | 172 |
fi |