Browse code

Merge "Set the correct URLs in the version return data"

Jenkins authored on 2013/07/09 11:40:08
Showing 1 changed files
... ...
@@ -120,6 +120,10 @@ function configure_keystone() {
120 120
         iniset $KEYSTONE_CONF identity driver "keystone.identity.backends.ldap.Identity"
121 121
     fi
122 122
 
123
+    # Set the URL advertised in the ``versions`` structure returned by the '/' route
124
+    iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(public_port)s/"
125
+    iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(admin_port)s/"
126
+
123 127
     if is_service_enabled tls-proxy; then
124 128
         # Set the service ports for a proxy to take the originals
125 129
         iniset $KEYSTONE_CONF DEFAULT public_port $KEYSTONE_SERVICE_PORT_INT