From 10104ab9955f7665a8a174cf4f2be8ce1927d1f9 Mon Sep 17 00:00:00 2001 From: "Walter A. Boring IV" Date: Mon, 1 Jul 2019 16:13:03 -0700 Subject: [PATCH] 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 --- devstack/override-defaults | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/devstack/override-defaults b/devstack/override-defaults index 3784fb4..880daef 100644 --- a/devstack/override-defaults +++ b/devstack/override-defaults @@ -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