openstack/devstack
Code Issues Proposed changes

Merge "Disable all import methods if glance is not standalone"

Browse Source
This commit is contained in:
Zuul 2020-07-20 21:12:46 +00:00 committed by Gerrit Code Review
commit 56a38c47e2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/glance
View File

@ -193,6 +193,11 @@ function configure_glance {
iniset $GLANCE_API_CONF cors allowed_origin "http://$SERVICE_HOST" iniset $GLANCE_API_CONF cors allowed_origin "http://$SERVICE_HOST"
fi fi
if [[ "$GLANCE_STANDALONE" == "False" ]]; then
# NOTE(danms): Do not advertise import methods if we are running in WSGI mode
iniset $GLANCE_API_CONF enabled_import_methods []
fi
# No multiple stores for swift yet # No multiple stores for swift yet
# 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