From aa47a0a8be9a9aced97d6a083d955949635fa3b3 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 20 Oct 2016 22:27:25 -0400 Subject: [PATCH] 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 --- lib/cinder_backends/ceph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cinder_backends/ceph b/lib/cinder_backends/ceph index 9bff5bef4f..a213d5e005 100644 --- a/lib/cinder_backends/ceph +++ b/lib/cinder_backends/ceph @@ -48,7 +48,7 @@ function configure_cinder_backend_ceph { iniset $CINDER_CONF $be_name rbd_ceph_conf "$CEPH_CONF" 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