Merge "Glance: Update RBD pool management to better support luminious"

glance/templates/bin/_storage-init.sh.tpl

@@ -33,8 +33,9 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
   ceph -s
   function ensure_pool () {
     ceph osd pool stats $1 || ceph osd pool create $1 $2
+    ceph osd pool application enable $1 $3
   }
-  ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE}
+  ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE} "glance-image"
 
   if USERINFO=$(ceph auth get client.${RBD_POOL_USER}); then
     KEYSTR=$(echo $USERINFO | sed 's/.*\( key = .*\) caps mon.*/\1/')
@@ -44,6 +45,7 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
     ceph auth get-or-create client.${RBD_POOL_USER} \
       mon "allow *" \
       osd "allow *" \
+      mgr "allow *" \
       -o ${KEYRING}
   fi
 

glance/values.yaml

@@ -216,8 +216,8 @@ conf:
       memcache_security_strategy: ENCRYPT
     glance_store:
       rbd_store_chunk_size: 8
-      rbd_store_pool: images
-      rbd_store_user: images
+      rbd_store_pool: glance.images
+      rbd_store_user: glance
       rbd_store_ceph_conf: /etc/ceph/ceph.conf
       filesystem_store_datadir: /var/lib/glance/images
       default_swift_reference: ref1