Browse code
Remove *_url inisets since now come from catalog
Another proposed change fetches endpoints from the Keystone catalog as
long as the *_url opts are not present. This change will make Trove on
DevStack use the catalog.
Note: This must merge after https://review.openstack.org/68015.
Change-Id: I397254e72823ab7c7b28014d4fa18e2cefb79e6d
Closes-Bug: #1222891
Mat Lowery authored on 2014/04/23 00:41:30Showing 1 changed files
| ... | ... |
@@ -149,10 +149,6 @@ function configure_trove {
|
| 149 | 149 |
|
| 150 | 150 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_password $RABBIT_PASSWORD |
| 151 | 151 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT sql_connection `database_connection_url trove` |
| 152 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT add_addresses True |
|
| 153 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 |
|
| 154 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 |
|
| 155 |
- iniset $TROVE_CONF_DIR/trove.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ |
|
| 156 | 152 |
|
| 157 | 153 |
iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT rabbit_password $RABBIT_PASSWORD |
| 158 | 154 |
sed -i "s/localhost/$TROVE_HOST_GATEWAY/g" $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample |
| ... | ... |
@@ -170,9 +166,6 @@ function configure_trove {
|
| 170 | 170 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_user radmin |
| 171 | 171 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_tenant_name trove |
| 172 | 172 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS |
| 173 |
- iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 |
|
| 174 |
- iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 |
|
| 175 |
- iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ |
|
| 176 | 173 |
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT |
| 177 | 174 |
setup_trove_logging $TROVE_CONF_DIR/trove-taskmanager.conf |
| 178 | 175 |
fi |