openstack
/
devstack
Code Issues Proposed changes

Merge "Support Glance CORS options in devstack configuration"

This commit is contained in:
Jenkins 2016-06-15 23:57:35 +00:00 committed by Gerrit Code Review
parent 2fe6369e32 a44dd9a741
commit db340e54b0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/glance
View File

@ -150,6 +150,13 @@ function configure_glance {
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.
if is_service_enabled s-proxy; then
iniset $GLANCE_API_CONF glance_store default_store swift