diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 2a5ff9e58..cf25b6cc8 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -312,7 +312,7 @@ function start_designate { # Start proxies if enabled if is_service_enabled designate-api && is_service_enabled tls-proxy; then - start_tls_proxy '*' $DESIGNATE_SERVICE_PORT $DESIGNATE_SERVICE_HOST $DESIGNATE_SERVICE_PORT_INT & + start_tls_proxy designate-api '*' $DESIGNATE_SERVICE_PORT $DESIGNATE_SERVICE_HOST $DESIGNATE_SERVICE_PORT_INT & fi if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q -O- $DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT; do sleep 1; done"; then diff --git a/devstack/settings b/devstack/settings index 6c3295f99..58a0fa482 100644 --- a/devstack/settings +++ b/devstack/settings @@ -27,6 +27,11 @@ DESIGNATE_ENABLED_EXTENSIONS_V1=${DESIGNATE_ENABLED_EXTENSIONS_V1:-"quotas"} DESIGNATE_ENABLED_EXTENSIONS_V2=${DESIGNATE_ENABLED_EXTENSIONS_V2:-""} DESIGNATE_ENABLED_EXTENSIONS_ADMIN=${DESIGNATE_ENABLED_EXTENSIONS_ADMIN:-"quotas"} +# Public facing bits +if is_service_enabled tls-proxy; then + DESIGNATE_SERVICE_PROTOCOL="https" +fi + # Default IP/port settings DESIGNATE_SERVICE_PROTOCOL=${DESIGNATE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} DESIGNATE_SERVICE_HOST=${DESIGNATE_SERVICE_HOST:-$SERVICE_HOST}