...
|
...
|
@@ -88,14 +88,6 @@ CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-lvm:lvmdriver-1}
|
88
|
88
|
CINDER_VOLUME_CLEAR=${CINDER_VOLUME_CLEAR:-${CINDER_VOLUME_CLEAR_DEFAULT:-zero}}
|
89
|
89
|
CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]')
|
90
|
90
|
|
91
|
|
-# Cinder reports allocations back to the scheduler on periodic intervals
|
92
|
|
-# it turns out we can get an "out of space" issue when we run tests too
|
93
|
|
-# quickly just because cinder didn't realize we'd freed up resources.
|
94
|
|
-# Make this configurable so that devstack-gate/tempest can set it to
|
95
|
|
-# less than the 60 second default
|
96
|
|
-# https://bugs.launchpad.net/cinder/+bug/1180976
|
97
|
|
-CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60}
|
98
|
|
-
|
99
|
91
|
# Centos7 and OpenSUSE switched to using LIO and that's all that's supported,
|
100
|
92
|
# although the tgt bits are in EPEL and OpenSUSE we don't want that for CI
|
101
|
93
|
if is_fedora || is_suse; then
|
...
|
...
|
@@ -237,7 +229,6 @@ function configure_cinder {
|
237
|
237
|
iniset $CINDER_CONF DEFAULT osapi_volume_listen $CINDER_SERVICE_LISTEN_ADDRESS
|
238
|
238
|
iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
|
239
|
239
|
iniset $CINDER_CONF oslo_concurrency lock_path $CINDER_STATE_PATH
|
240
|
|
- iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL
|
241
|
240
|
iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
|
242
|
241
|
|
243
|
242
|
iniset $CINDER_CONF key_manager backend cinder.keymgr.conf_key_mgr.ConfKeyManager
|