diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f9fa8013..0e0b29b9 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -131,6 +131,9 @@ function configure_karbor { iniset $KARBOR_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $KARBOR_CONF DEFAULT use_syslog $SYSLOG + iniset $KARBOR_CONF DEFAULT min_interval $KARBOR_SCHEDULED_MIN_INTERVAL + iniset $KARBOR_CONF DEFAULT min_window_time $KARBOR_SCHEDULED_MIN_WINDOW_TIME + iniset $KARBOR_CONF DEFAULT max_window_time $KARBOR_SCHEDULED_MAX_WINDOW_TIME echo "Configuring Karbor API Database" iniset $KARBOR_CONF database connection `database_connection_url karbor` iniset_rpc_backend karbor $KARBOR_CONF diff --git a/devstack/settings b/devstack/settings index cb88db76..0c0ed82f 100644 --- a/devstack/settings +++ b/devstack/settings @@ -13,6 +13,9 @@ KARBOR_CONF_DIR=${KARBOR_CONF_DIR:-/etc/karbor} KARBOR_BIN_DIR=$(get_python_exec_prefix) KARBOR_CONF=$KARBOR_CONF_DIR/karbor.conf KARBOR_TRUSTEE_USER=karbor +KARBOR_SCHEDULED_MIN_INTERVAL=60 +KARBOR_SCHEDULED_MIN_WINDOW_TIME=20 +KARBOR_SCHEDULED_MAX_WINDOW_TIME=30 KARBOR_API_UWSGI_CONF=$KARBOR_CONF_DIR/karbor-uwsgi.ini KARBOR_API_UWSGI=$KARBOR_BIN_DIR/karbor-wsgi diff --git a/karbor/tests/fullstack/test_scheduled_operations.py b/karbor/tests/fullstack/test_scheduled_operations.py index df71b8f2..72a8e286 100644 --- a/karbor/tests/fullstack/test_scheduled_operations.py +++ b/karbor/tests/fullstack/test_scheduled_operations.py @@ -113,7 +113,7 @@ class ScheduledOperationsTest(karbor_base.KarborBaseTest): def test_scheduled_operations_create_and_scheduled(self): freq = 2 eventlet_grace = 20 - pattern = "BEGIN:VEVENT\nRRULE:FREQ=MINUTELY;INTERVAL=5;\nEND:VEVENT" + pattern = "BEGIN:VEVENT\nRRULE:FREQ=MINUTELY;INTERVAL=2;\nEND:VEVENT" cur_property = {'pattern': pattern, 'format': 'calendar'} operation = self.store(self._create_for_volume(cur_property))