Merge "Fix errors in tls-proxy startup for cinder"
This commit is contained in:
commit
f60babc563
@ -505,9 +505,9 @@ function start_cinder {
|
|||||||
if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then
|
if [ "$CINDER_USE_MOD_WSGI" == "False" ]; then
|
||||||
run_process c-api "$CINDER_BIN_DIR/cinder-api --config-file $CINDER_CONF"
|
run_process c-api "$CINDER_BIN_DIR/cinder-api --config-file $CINDER_CONF"
|
||||||
cinder_url=$service_protocol://$SERVICE_HOST:$service_port
|
cinder_url=$service_protocol://$SERVICE_HOST:$service_port
|
||||||
# Start proxy if tsl enabled
|
# Start proxy if tls enabled
|
||||||
if is_service_enabled tls_proxy; then
|
if is_service_enabled tls-proxy; then
|
||||||
start_tls_proxy cinder '*' $CINDER_SERVICE_PORT $CINDER_SERVICE_HOST $CINDER_SERVICE_POR_INT
|
start_tls_proxy cinder '*' $CINDER_SERVICE_PORT $CINDER_SERVICE_HOST $CINDER_SERVICE_PORT_INT
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
run_process "c-api" "$CINDER_BIN_DIR/uwsgi --procname-prefix cinder-api --ini $CINDER_UWSGI_CONF"
|
run_process "c-api" "$CINDER_BIN_DIR/uwsgi --procname-prefix cinder-api --ini $CINDER_UWSGI_CONF"
|
||||||
|
Loading…
Reference in New Issue
Block a user