openstack
/
karbor
Code Issues Proposed changes

Modify the time interval configurations in devstack 

Story: 2006848
Task: 37436

Change-Id: I9ae08550f74347fc8f8436eca3cf4320ec97dd1f
This commit is contained in:
jiaopengju 2019-11-14 10:48:36 +08:00
parent 28fabef6ec
commit 6093b5b11e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -131,6 +131,9 @@ function configure_karbor {
iniset $KARBOR_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $KARBOR_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
iniset $KARBOR_CONF DEFAULT use_syslog $SYSLOG 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" echo "Configuring Karbor API Database"
iniset $KARBOR_CONF database connection `database_connection_url karbor` iniset $KARBOR_CONF database connection `database_connection_url karbor`
iniset_rpc_backend karbor $KARBOR_CONF iniset_rpc_backend karbor $KARBOR_CONF

3
devstack/settings
View File

@ -13,6 +13,9 @@ KARBOR_CONF_DIR=${KARBOR_CONF_DIR:-/etc/karbor}
KARBOR_BIN_DIR=$(get_python_exec_prefix) KARBOR_BIN_DIR=$(get_python_exec_prefix)
KARBOR_CONF=$KARBOR_CONF_DIR/karbor.conf KARBOR_CONF=$KARBOR_CONF_DIR/karbor.conf
KARBOR_TRUSTEE_USER=karbor 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_CONF=$KARBOR_CONF_DIR/karbor-uwsgi.ini
KARBOR_API_UWSGI=$KARBOR_BIN_DIR/karbor-wsgi KARBOR_API_UWSGI=$KARBOR_BIN_DIR/karbor-wsgi

2
karbor/tests/fullstack/test_scheduled_operations.py
View File

@ -113,7 +113,7 @@ class ScheduledOperationsTest(karbor_base.KarborBaseTest):
def test_scheduled_operations_create_and_scheduled(self): def test_scheduled_operations_create_and_scheduled(self):
freq = 2 freq = 2
eventlet_grace = 20 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'} cur_property = {'pattern': pattern, 'format': 'calendar'}
operation = self.store(self._create_for_volume(cur_property)) operation = self.store(self._create_for_volume(cur_property))