Browse code

Merge "Remove keystone public/admin_endpoint options"

Jenkins authored on 2015/04/18 02:36:35
Showing 1 changed files
... ...
@@ -237,9 +237,6 @@ function configure_keystone {
237 237
 
238 238
     iniset_rpc_backend keystone $KEYSTONE_CONF
239 239
 
240
-    # Set the URL advertised in the ``versions`` structure returned by the '/' route
241
-    iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"
242
-    iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/"
243 240
     iniset $KEYSTONE_CONF eventlet_server admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST"
244 241
 
245 242
     # Register SSL certificates if provided