diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 19:11:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 19:11:31 +0000 |
| commit | 83f6d28fdbc4ddb1bd21a7f4ac2d75fe6e1505dd (patch) | |
| tree | e28fb65ff4c5c15f2c49bc864679b789966dee55 | |
| parent | fafc52be14e46d972a210dd0a4d0fe1c200265e3 (diff) | |
| parent | 43e65f9efb49cc4ec3841b3a5dc134ebd9480d5b (diff) | |
| download | designate-83f6d28fdbc4ddb1bd21a7f4ac2d75fe6e1505dd.tar.gz | |
Merge "DevStack: Reduce periodic intervals in the gate"
| -rwxr-xr-x | contrib/devstack/gate_hook.sh | 2 | ||||
| -rw-r--r-- | contrib/devstack/lib/designate | 4 | ||||
| -rw-r--r-- | etc/designate/designate.conf.sample | 2 | ||||
| -rw-r--r-- | functionaltests/common/base.py | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/contrib/devstack/gate_hook.sh b/contrib/devstack/gate_hook.sh index af3d50e1..8c6305c0 100755 --- a/contrib/devstack/gate_hook.sh +++ b/contrib/devstack/gate_hook.sh @@ -11,6 +11,8 @@ export ENABLED_SERVICES=designate,designate-api,designate-central,designate-sink echo "DESIGNATE_SERVICE_PORT_DNS=5322" >> $BASE/new/devstack/localrc echo "DESIGNATE_BACKEND_DRIVER=$DEVSTACK_GATE_DESIGNATE_DRIVER" >> $BASE/new/devstack/localrc +echo "DESIGNATE_PERIODIC_RECOVERY_INTERVAL=20" >> $BASE/new/devstack/localrc +echo "DESIGNATE_PERIODIC_SYNC_INTERVAL=20" >> $BASE/new/devstack/localrc # Pass through any DESIGNATE_ env vars to the localrc file env | grep -E "^DESIGNATE_" >> $BASE/new/devstack/localrc || : diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate index 5d40b8fb..adc285ed 100644 --- a/contrib/devstack/lib/designate +++ b/contrib/devstack/lib/designate @@ -48,6 +48,8 @@ DESIGNATE_TARGET_ID=${DESIGNATE_TARGET_ID:-f26e0b32-736f-4f0a-831b-039a415c481e} DESIGNATE_DEFAULT_NS_RECORD=${DESIGNATE_DEFAULT_NS_RECORD:-ns1.devstack.org.} DESIGNATE_NOTIFICATION_DRIVER=${DESIGNATE_NOTIFICATION_DRIVER:-} DESIGNATE_NOTIFICATION_TOPICS=${DESIGNATE_NOTIFICATION_TOPICS:-notifications} +DESIGNATE_PERIODIC_RECOVERY_INTERVAL=${DESIGNATE_PERIODIC_RECOVERY_INTERVAL:-120} +DESIGNATE_PERIODIC_SYNC_INTERVAL=${DESIGNATE_PERIODIC_SYNC_INTERVAL:-1800} # Public IP/Port Settings DESIGNATE_SERVICE_PROTOCOL=${DESIGNATE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} @@ -123,6 +125,8 @@ function configure_designate { # Pool Manager Configuration iniset $DESIGNATE_CONF service:pool_manager pool_id $DESIGNATE_POOL_ID iniset $DESIGNATE_CONF service:pool_manager cache_driver $DESIGNATE_POOL_MANAGER_CACHE_DRIVER + iniset $DESIGNATE_CONF service:pool_manager periodic_recovery_interval $DESIGNATE_PERIODIC_RECOVERY_INTERVAL + iniset $DESIGNATE_CONF service:pool_manager periodic_sync_interval $DESIGNATE_PERIODIC_SYNC_INTERVAL # Pool Manager Cache if [ "$DESIGNATE_POOL_MANAGER_CACHE_DRIVER" == "sqlalchemy" ]; then diff --git a/etc/designate/designate.conf.sample b/etc/designate/designate.conf.sample index 4c8eb13e..c12be2d2 100644 --- a/etc/designate/designate.conf.sample +++ b/etc/designate/designate.conf.sample @@ -165,7 +165,7 @@ debug = False #poll_max_retries = 3 #poll_delay = 1 #periodic_recovery_interval = 120 -#periodic_sync_interval = 300 +#periodic_sync_interval = 1800 #periodic_sync_seconds = None #cache_driver = sqlalchemy diff --git a/functionaltests/common/base.py b/functionaltests/common/base.py index 6083d9d5..d8ffa1a2 100644 --- a/functionaltests/common/base.py +++ b/functionaltests/common/base.py @@ -27,7 +27,7 @@ class BaseDesignateTest(tempest_lib.base.BaseTestCase): super(BaseDesignateTest, self).__init__(*args, **kwargs) self.base_client = DesignateClient() - def wait_for_condition(self, condition, interval=1, timeout=20): + def wait_for_condition(self, condition, interval=1, timeout=40): end_time = time.time() + timeout while time.time() < end_time: if condition(): |