openstack/devstack
Code Issues Proposed changes

Merge "Remove standalone requirement for glance import"

Browse Source
This commit is contained in:
Zuul 2020-07-28 14:25:47 +00:00 committed by Gerrit Code Review
commit 9208a371f3
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions
View File

@ -114,11 +114,7 @@ function _upload_image {
properties=$(_image_properties_to_arg $*) properties=$(_image_properties_to_arg $*)
if [[ "$GLANCE_USE_IMPORT_WORKFLOW" == "True" ]]; then if [[ "$GLANCE_USE_IMPORT_WORKFLOW" == "True" ]]; then
if [[ "$GLANCE_STANDALONE" == "True" ]]; then useimport="--import"
useimport="--import"
else
echo "*** Unable to use glance import workflow because glance is not standalone! ***"
fi
fi fi
openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" --public --container-format "$container" --disk-format "$disk" $useimport $properties < "${image}" openstack --os-cloud=devstack-admin --os-region-name="$REGION_NAME" image create "$image_name" --public --container-format "$container" --disk-format "$disk" $useimport $properties < "${image}"

5
lib/glance
View File

@ -193,11 +193,6 @@ 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 DEFAULT 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