From 2bcf3818bbabfa15212b7fc97bd8f84b5f38e2c0 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Mon, 23 May 2016 14:15:02 +0100 Subject: [PATCH] DevStack: Support setting default quotas As tempest is creating and deleting zones, it does not wait for all zones to be deleted before moving onto the next test. This can lead to having a large number of pending delete zones which consume all/most of the default quotas, and tests begin failing. By setting the default quotas higher in DevStack, we allow the tests to proceed. Change-Id: I3652bb06724fb8b89bb341c9d9f61b1dde056119 --- devstack/plugin.sh | 7 +++++++ devstack/settings | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 471ec9a5b..1aee38e22 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -57,6 +57,13 @@ function configure_designate { iniset $DESIGNATE_CONF DEFAULT root-helper sudo designate-rootwrap $DESIGNATE_ROOTWRAP_CONF iniset $DESIGNATE_CONF storage:sqlalchemy connection `database_connection_url designate` + # Quota Configuration + iniset $DESIGNATE_CONF DEFAULT quota_zones $DESIGNATE_QUOTA_ZONES + iniset $DESIGNATE_CONF DEFAULT quota_zone_recordsets $DESIGNATE_QUOTA_ZONE_RECORDSETS + iniset $DESIGNATE_CONF DEFAULT quota_zone_records $DESIGNATE_QUOTA_ZONE_RECORDS + iniset $DESIGNATE_CONF DEFAULT quota_recordset_records $DESIGNATE_QUOTA_RECORDSET_RECORDS + iniset $DESIGNATE_CONF DEFAULT quota_api_export_size $DESIGNATE_QUOTA_API_EXPORT_SIZE + # Coordination Configuration if [[ -n "$DESIGNATE_COORDINATION_URL" ]]; then iniset $DESIGNATE_CONF coordination backend_url $DESIGNATE_COORDINATION_URL diff --git a/devstack/settings b/devstack/settings index 8e88e51bd..a839d1616 100644 --- a/devstack/settings +++ b/devstack/settings @@ -9,6 +9,13 @@ DESIGNATE_PERIODIC_RECOVERY_INTERVAL=${DESIGNATE_PERIODIC_RECOVERY_INTERVAL:-120 DESIGNATE_PERIODIC_SYNC_INTERVAL=${DESIGNATE_PERIODIC_SYNC_INTERVAL:-1800} DESIGNATE_COORDINATION_URL=${DESIGNATE_COORDINATION_URL:-} +# Quota Options +DESIGNATE_QUOTA_ZONES=${DESIGNATE_QUOTA_ZONES:-100} +DESIGNATE_QUOTA_ZONE_RECORDSETS=${DESIGNATE_QUOTA_ZONE_RECORDSETS:-500} +DESIGNATE_QUOTA_ZONE_RECORDS=${DESIGNATE_QUOTA_ZONE_RECORDS:-500} +DESIGNATE_QUOTA_RECORDSET_RECORDS=${DESIGNATE_QUOTA_RECORDSET_RECORDS:-20} +DESIGNATE_QUOTA_API_EXPORT_SIZE=${DESIGNATE_QUOTA_API_EXPORT_SIZE:-1000} + # Default APIs and Extensions DESIGNATE_ENABLE_API_V1=${DESIGNATE_ENABLE_API_V1:-"True"} DESIGNATE_ENABLE_API_V2=${DESIGNATE_ENABLE_API_V2:-"True"}