1. devstack
  2. Commit e0fdcd5ff2c238a4e47c409e19922350fa27dc33
Browse code

Merge "fix ceph config file path variable"

Jenkins authored on 2016/10/24 10:37:18
Showing 1 changed files
lib/cinder_backends/ceph
History View file @ e0fdcd5
... ... 
@@ -45,7 +45,7 @@ function configure_cinder_backend_ceph {
45 45
46 46 
     iniset $CINDER_CONF $be_name volume_backend_name $be_name
47 47 
     iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.rbd.RBDDriver"
48 
-    iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF"
48 
+    iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF_FILE"
49 49 
     iniset $CINDER_CONF $be_name rbd_pool "$CINDER_CEPH_POOL"
50 50 
     iniset $CINDER_CONF $be_name rbd_user "$CINDER_CEPH_USER"
51 51 
     iniset $CINDER_CONF $be_name rbd_uuid "$CINDER_CEPH_UUID"
... ... 
@@ -66,7 +66,7 @@ function configure_cinder_backend_ceph {
66 66 
         sudo chown $(whoami):$(whoami) ${CEPH_CONF_DIR}/ceph.client.${CINDER_BAK_CEPH_USER}.keyring
67 67
68 68 
         iniset $CINDER_CONF DEFAULT backup_driver "cinder.backup.drivers.ceph"
69 
-        iniset $CINDER_CONF DEFAULT backup_ceph_conf "$CEPH_CONF"
69 
+        iniset $CINDER_CONF DEFAULT backup_ceph_conf "$CEPH_CONF_FILE"
70 70 
         iniset $CINDER_CONF DEFAULT backup_ceph_pool "$CINDER_BAK_CEPH_POOL"
71 71 
         iniset $CINDER_CONF DEFAULT backup_ceph_user "$CINDER_BAK_CEPH_USER"
72 72 
         iniset $CINDER_CONF DEFAULT backup_ceph_stripe_unit 0