Skip to content

Commit 37fb911

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Make Glance image count quotas configurable"
2 parents 5099676 + a81f647 commit 37fb911

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

lib/glance

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ GLANCE_SERVICE_PROTOCOL=${GLANCE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
129129
GLANCE_UWSGI=glance.wsgi.api:application
130130
GLANCE_UWSGI_CONF=$GLANCE_CONF_DIR/glance-uwsgi.ini
131131

132-
# Glance default limit for Devstack
132+
# Glance default limits for Devstack (Keystone registered limits)
133133
GLANCE_LIMIT_IMAGE_SIZE_TOTAL=${GLANCE_LIMIT_IMAGE_SIZE_TOTAL:-2000}
134+
GLANCE_LIMIT_IMAGE_COUNT_TOTAL=${GLANCE_LIMIT_IMAGE_COUNT_TOTAL:-100}
135+
GLANCE_LIMIT_IMAGE_COUNT_UPLOADING=${GLANCE_LIMIT_IMAGE_COUNT_UPLOADING:-100}
134136

135137
GLANCE_URL="$GLANCE_SERVICE_PROTOCOL://$GLANCE_SERVICE_HOST/image"
136138

@@ -319,9 +321,9 @@ function configure_glance_quotas {
319321
openstack --os-cloud devstack-system-admin registered limit create --service glance \
320322
--default-limit $GLANCE_LIMIT_IMAGE_SIZE_TOTAL --region $REGION_NAME image_stage_total
321323
openstack --os-cloud devstack-system-admin registered limit create --service glance \
322-
--default-limit 100 --region $REGION_NAME image_count_total
324+
--default-limit $GLANCE_LIMIT_IMAGE_COUNT_TOTAL --region $REGION_NAME image_count_total
323325
openstack --os-cloud devstack-system-admin registered limit create --service glance \
324-
--default-limit 100 --region $REGION_NAME image_count_uploading
326+
--default-limit $GLANCE_LIMIT_IMAGE_COUNT_UPLOADING --region $REGION_NAME image_count_uploading
325327

326328
# Tell glance to use these limits
327329
iniset $GLANCE_API_CONF DEFAULT use_keystone_limits True

0 commit comments

Comments
 (0)