Merge "Support Glance CORS options in devstack configuration"
This commit is contained in:
commit
db340e54b0
@ -150,6 +150,13 @@ function configure_glance {
|
|||||||
|
|
||||||
iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS"
|
iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS"
|
||||||
|
|
||||||
|
# CORS feature support - to allow calls from Horizon by default
|
||||||
|
if [ -n "$GLANCE_CORS_ALLOWED_ORIGIN" ]; then
|
||||||
|
iniset $GLANCE_API_CONF cors allowed_origin "$GLANCE_CORS_ALLOWED_ORIGIN"
|
||||||
|
else
|
||||||
|
iniset $GLANCE_API_CONF cors allowed_origin "http://$SERVICE_HOST"
|
||||||
|
fi
|
||||||
|
|
||||||
# Store the images in swift if enabled.
|
# Store the images in swift if enabled.
|
||||||
if is_service_enabled s-proxy; then
|
if is_service_enabled s-proxy; then
|
||||||
iniset $GLANCE_API_CONF glance_store default_store swift
|
iniset $GLANCE_API_CONF glance_store default_store swift
|
||||||
|
Loading…
Reference in New Issue
Block a user