From ba8635a247e659be22ea8ebe416513028ca8a96d Mon Sep 17 00:00:00 2001 From: Mat Lowery Date: Tue, 22 Apr 2014 10:41:30 -0500 Subject: [PATCH] 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 --- lib/trove | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/trove b/lib/trove index 86314700bf..82c8c96400 100644 --- a/lib/trove +++ b/lib/trove @@ -149,10 +149,6 @@ function configure_trove { iniset $TROVE_CONF_DIR/trove.conf DEFAULT rabbit_password $RABBIT_PASSWORD iniset $TROVE_CONF_DIR/trove.conf DEFAULT sql_connection `database_connection_url trove` - iniset $TROVE_CONF_DIR/trove.conf DEFAULT add_addresses True - iniset $TROVE_CONF_DIR/trove.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 - iniset $TROVE_CONF_DIR/trove.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 - iniset $TROVE_CONF_DIR/trove.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ iniset $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample DEFAULT rabbit_password $RABBIT_PASSWORD sed -i "s/localhost/$TROVE_HOST_GATEWAY/g" $TROVE_LOCAL_CONF_DIR/trove-guestagent.conf.sample @@ -170,9 +166,6 @@ function configure_trove { iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_user radmin iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_tenant_name trove iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS - iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT nova_compute_url $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2 - iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT cinder_url $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1 - iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT swift_url http://$SERVICE_HOST:8080/v1/AUTH_ iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT setup_trove_logging $TROVE_CONF_DIR/trove-taskmanager.conf fi