openstack
/
devstack-plugin-ceph
Code Issues Proposed changes

Update override-defaults to support ceph_iscsi 

This patch updates the override-defaults to support
setting the CINDER_DRIVER, CINDER_ENABLED_BACKENDS
and CINDER_ISCSI_HELPER env vars for devstack to
ceph_iscsi if and only if ENABLE_CEPH_ISCSI is True.
This is needed by devstack lib/cinder to automatically
configure and enable ceph_iscsi as a backend.

Depends-On: https://review.opendev.org/#/c/662829/
Change-Id: I3447554343edfb5ec84ea65a521168e6d2831dfa
This commit is contained in:
Walter A. Boring IV 2019-07-01 16:13:03 -07:00 committed by Walter A. Boring IV (hemna)
parent 49bae2c4d5
commit 10104ab995
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/override-defaults
View File

@ -9,6 +9,12 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
CINDER_DRIVER=${CINDER_DRIVER:-ceph}
CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
if [[ $ENABLE_CEPH_ISCSI == "True" ]]; then
CINDER_DRIVER=${CINDER_DRIVER:-ceph_iscsi}
CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph_iscsi}
CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
else
CINDER_DRIVER=${CINDER_DRIVER:-ceph}
CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
fi
fi