Browse code

Merge "Add RBD as a known store"

Jenkins authored on 2014/09/18 14:49:54
Showing 1 changed files
... ...
@@ -198,10 +198,11 @@ function configure_ceph_glance {
198 198
     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
199 199
     sudo chown ${STACK_USER}:$(id -g -n $whoami) ${CEPH_CONF_DIR}/ceph.client.${GLANCE_CEPH_USER}.keyring
200 200
     iniset $GLANCE_API_CONF DEFAULT default_store rbd
201
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_ceph_conf $CEPH_CONF_FILE
202
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_user $GLANCE_CEPH_USER
203
-    iniset $GLANCE_API_CONF DEFAULT rbd_store_pool $GLANCE_CEPH_POOL
204 201
     iniset $GLANCE_API_CONF DEFAULT show_image_direct_url True
202
+    iniset $GLANCE_API_CONF glance_store stores "file, http, rbd"
203
+    iniset $GLANCE_API_CONF glance_store rbd_store_ceph_conf $CEPH_CONF_FILE
204
+    iniset $GLANCE_API_CONF glance_store rbd_store_user $GLANCE_CEPH_USER
205
+    iniset $GLANCE_API_CONF glance_store rbd_store_pool $GLANCE_CEPH_POOL
205 206
 }
206 207
 
207 208
 # configure_ceph_nova() - Nova config needs to come after Nova is set up