1. devstack
  2. Commit ad13c0a8dacbf5d5d399aa2df99313bb5fb6a39b
Browse code

Keystone stop using config refs

- Rather than using config refs, deployments should be using a tool
such as chef or puppet to set the options correctly.

- Config refs have a bug where you can only reference an option in
the DEFAULT group, which limits the usefulness, and with this
feature it's impossible to move any config options out of the
DEFAULT group, luckily this has been ignored anyways since I think
everyone realizes how broken it is.

Change-Id: I74cae09f9d75177f8efea69e7ae981ed8f14039f

Brant Knudson authored on 2015/03/15 02:14:31
Showing 1 changed files
lib/keystone
History View file @ ad13c0a
... ... 
@@ -234,13 +234,8 @@ function configure_keystone {
234 234 
     fi
235 235
236 236 
     # Set the URL advertised in the ``versions`` structure returned by the '/' route
237 
-    if is_service_enabled tls-proxy; then
238 
-        iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"
239 
-        iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/"
240 
-    else
241 
-        iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(public_port)s/"
242 
-        iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(admin_port)s/"
243 
-    fi
237 
+    iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"
238 
+    iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/"
244 239 
     iniset $KEYSTONE_CONF DEFAULT admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST"
245 240
246 241 
     # Register SSL certificates if provided