commit 7c9abcad0dfeb0a2d8537e897ca26c0396633709
author Sébastien Han <sebastien.han@enovance.com> Mon Sep 15 16:17:42 2014 +0200
committer Sébastien Han <sebastien.han@enovance.com> Mon Sep 15 23:42:42 2014 +0200
tree 40c0751963e204de7701aa2950282b1b8f360425
parent 887fb54013feff6e063001fb4d879666b38fdbbd

Add RBD as a known store

Adding RBD as a known store in the glance-api.conf file allows us to use
Ceph as a backend for Glance.

Closes-Bug: 1369578

Change-Id: I02cbafa68ca3293cedc9fef7535e79930cc4ee5c
Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

lib/ceph

diff --git a/lib/ceph b/lib/ceph
index 8464042..30ca903 100644
--- a/lib/ceph
+++ b/lib/ceph
@@ -198,10 +198,11 @@
     sudo ceph -c ${CEPH_CONF_FILE} auth get-or-create client.${GLANCE_CEPH_USER} mon "allow r" osd "allow class-read object_prefix rbd_children, allow rwx pool=${GLANCE_CEPH_POOL}" | sudo tee ${CEPH_CONF_DIR}/ceph.client.${GLANCE_CEPH_USER}.keyring
     sudo chown ${STACK_USER}:$(id -g -n $whoami) ${CEPH_CONF_DIR}/ceph.client.${GLANCE_CEPH_USER}.keyring
     iniset $GLANCE_API_CONF DEFAULT default_store rbd
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_ceph_conf $CEPH_CONF_FILE
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_user $GLANCE_CEPH_USER
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_pool $GLANCE_CEPH_POOL
     iniset $GLANCE_API_CONF DEFAULT show_image_direct_url True
+    iniset $GLANCE_API_CONF glance_store stores "file, http, rbd"
+    iniset $GLANCE_API_CONF glance_store rbd_store_ceph_conf $CEPH_CONF_FILE
+    iniset $GLANCE_API_CONF glance_store rbd_store_user $GLANCE_CEPH_USER
+    iniset $GLANCE_API_CONF glance_store rbd_store_pool $GLANCE_CEPH_POOL
 }
 
 # configure_ceph_nova() - Nova config needs to come after Nova is set up