commit fddff69efddc1de594402a1c728b4ee40171d2b5
author Jenkins <jenkins@review.openstack.org> Wed Nov 30 22:57:42 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 30 22:57:42 2016 +0000
tree 785e22d254672f86f90929cbec1271ac112cae23
parent df515675256fa93d7500667548ac59c403320d3b
parent aa47a0a8be9a9aced97d6a083d955949635fa3b3

Merge "ceph: set rbd_secret_uuid in cinder.conf, not rbd_uuid"

lib/cinder_backends/ceph

diff --git a/lib/cinder_backends/ceph b/lib/cinder_backends/ceph
index ba86ccf..00a0bb3 100644
--- a/lib/cinder_backends/ceph
+++ b/lib/cinder_backends/ceph
@@ -48,7 +48,7 @@
     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"
+    iniset $CINDER_CONF $be_name rbd_secret_uuid "$CINDER_CEPH_UUID"
     iniset $CINDER_CONF $be_name rbd_flatten_volume_from_snapshot False
     iniset $CINDER_CONF $be_name rbd_max_clone_depth 5
     iniset $CINDER_CONF DEFAULT glance_api_version 2