Browse code

Merge "Fix nova and glance discovery URLs when tls-proxy is enabled."

Jenkins authored on 2015/06/10 07:26:21
Showing 2 changed files
... ...
@@ -154,6 +154,7 @@ function configure_glance {
154 154
 
155 155
     if is_service_enabled tls-proxy; then
156 156
         iniset $GLANCE_API_CONF DEFAULT bind_port $GLANCE_SERVICE_PORT_INT
157
+        iniset $GLANCE_API_CONF DEFAULT public_endpoint $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT
157 158
         iniset $GLANCE_REGISTRY_CONF DEFAULT bind_port $GLANCE_REGISTRY_PORT_INT
158 159
     fi
159 160
 
... ...
@@ -489,6 +489,7 @@ function create_nova_conf {
489 489
         if is_service_enabled tls-proxy; then
490 490
             # Set the service port for a proxy to take the original
491 491
             iniset $NOVA_CONF DEFAULT osapi_compute_listen_port "$NOVA_SERVICE_PORT_INT"
492
+            iniset $NOVA_CONF DEFAULT osapi_compute_link_prefix $NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT
492 493
         fi
493 494
 
494 495
         configure_auth_token_middleware $NOVA_CONF nova $NOVA_AUTH_CACHE_DIR