Merge "Update override-defaults to support ceph_iscsi"
This commit is contained in:
commit
57b5ab1520
|
@ -9,6 +9,12 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
|
||||||
ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
|
ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
|
||||||
|
|
||||||
if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
|
if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
|
||||||
|
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_DRIVER=${CINDER_DRIVER:-ceph}
|
||||||
CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
|
CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue