Browse code

ceph: set rbd_secret_uuid in cinder.conf, not rbd_uuid

The ceph cinder backend script was setting the wrong
config option in cinder.conf for the secret uuid. This
was being masked by a bug in nova which is failing on
this bug when trying to fix the nova bug...right. It
makes sense.

See:

http://docs.ceph.com/docs/master/rbd/rbd-openstack/#configuring-cinder

Change-Id: I4655cae3212d589177d2570403b563a83aad529a
Closes-Bug: #1635488

Matt Riedemann authored on 2016/10/21 11:27:25
Showing 1 changed files
... ...
@@ -48,7 +48,7 @@ function configure_cinder_backend_ceph {
48 48
     iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF"
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
-    iniset $CINDER_CONF $be_name rbd_uuid "$CINDER_CEPH_UUID"
51
+    iniset $CINDER_CONF $be_name rbd_secret_uuid "$CINDER_CEPH_UUID"
52 52
     iniset $CINDER_CONF $be_name rbd_flatten_volume_from_snapshot False
53 53
     iniset $CINDER_CONF $be_name rbd_max_clone_depth 5
54 54
     iniset $CINDER_CONF DEFAULT glance_api_version 2