From 556139e710392c4f2586504b17490d8b63c4b21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 18 Aug 2016 15:09:44 +0200 Subject: [PATCH] fix ceph config file path variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CEPH_CONF does not exist anymore, resulting both cinder-volume and cinder-backup being configured with an empty rbd_ceph_conf option. Using CEPH_CONF_FILE to fix this. Change-Id: I1aa590aba900a4a94698917e45a0ea5c6f497f18 Signed-off-by: Sébastien Han --- lib/cinder_backends/ceph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cinder_backends/ceph b/lib/cinder_backends/ceph index 9bff5bef4f..ba86ccf8f4 100644 --- a/lib/cinder_backends/ceph +++ b/lib/cinder_backends/ceph @@ -45,7 +45,7 @@ function configure_cinder_backend_ceph { iniset $CINDER_CONF $be_name volume_backend_name $be_name iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.rbd.RBDDriver" - iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF" + iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF_FILE" iniset $CINDER_CONF $be_name rbd_pool "$CINDER_CEPH_POOL" iniset $CINDER_CONF $be_name rbd_user "$CINDER_CEPH_USER" iniset $CINDER_CONF $be_name rbd_uuid "$CINDER_CEPH_UUID" @@ -66,7 +66,7 @@ function configure_cinder_backend_ceph { sudo chown $(whoami):$(whoami) ${CEPH_CONF_DIR}/ceph.client.${CINDER_BAK_CEPH_USER}.keyring iniset $CINDER_CONF DEFAULT backup_driver "cinder.backup.drivers.ceph" - iniset $CINDER_CONF DEFAULT backup_ceph_conf "$CEPH_CONF" + iniset $CINDER_CONF DEFAULT backup_ceph_conf "$CEPH_CONF_FILE" iniset $CINDER_CONF DEFAULT backup_ceph_pool "$CINDER_BAK_CEPH_POOL" iniset $CINDER_CONF DEFAULT backup_ceph_user "$CINDER_BAK_CEPH_USER" iniset $CINDER_CONF DEFAULT backup_ceph_stripe_unit 0