From 5a642450d6ac94ff1ea2bea3e7ce3887ca79dcc4 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 19 Jul 2021 07:01:29 -0700 Subject: [PATCH] Provide override for glance image size limit The glance image size limitation was added and unfortuantely does prevent larger images from being uploaded to glance. In the case of all baremetal testing, this value is realistically smaller than stock "cloud" images which support booting to baremetal with often requisite firmware blobs, which forces some images over 1GB in size. Adds GLANCE_LIMIT_IMAGE_SIZE_TOTAL which allows users who need larger images to be able to override the default while still enabling limits enforcement in their deployment. The default value is 1000. Change-Id: Id425aa546f1a5973bae8be9c017782d18f0b4a47 --- lib/glance | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/glance b/lib/glance index fd2e0afcc1..b132f37834 100644 --- a/lib/glance +++ b/lib/glance @@ -108,6 +108,10 @@ GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$GLANCE_SERVICE_HOST:$GLANCE_SERVICE_PORT} GLANCE_SERVICE_PROTOCOL=${GLANCE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} GLANCE_UWSGI=$GLANCE_BIN_DIR/glance-wsgi-api GLANCE_UWSGI_CONF=$GLANCE_CONF_DIR/glance-uwsgi.ini + +# Glance default limit for Devstack +GLANCE_LIMIT_IMAGE_SIZE_TOTAL=${GLANCE_LIMIT_IMAGE_SIZE_TOTAL:-1000} + # If wsgi mode is uwsgi run glance under uwsgi, else default to eventlet # TODO(mtreinish): Remove the eventlet path here and in all the similar # conditionals below after the Pike release @@ -273,11 +277,11 @@ function configure_glance_quotas { bash -c "unset OS_USERNAME OS_TENANT_NAME OS_PROJECT_NAME; openstack --os-cloud devstack-system-admin registered limit create \ - --service glance --default-limit 1000 --region $REGION_NAME \ - image_size_total; \ + --service glance --default-limit $GLANCE_LIMIT_IMAGE_SIZE_TOTAL \ + --region $REGION_NAME image_size_total; \ openstack --os-cloud devstack-system-admin registered limit create \ - --service glance --default-limit 1000 --region $REGION_NAME \ - image_stage_total; \ + --service glance --default-limit $GLANCE_LIMIT_IMAGE_SIZE_TOTAL \ + --region $REGION_NAME image_stage_total; \ openstack --os-cloud devstack-system-admin registered limit create \ --service glance --default-limit 100 --region $REGION_NAME \ image_count_total; \