openstack/openstack-helm
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2017-12-29 20:31:08 +00:00 committed by Gerrit Code Review
commit b1cd00929c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance/templates/bin/_storage-init.sh.tpl
View File

@ -33,8 +33,9 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
ceph -s ceph -s
function ensure_pool () { function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2 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 if USERINFO=$(ceph auth get client.${RBD_POOL_USER}); then
KEYSTR=$(echo $USERINFO | sed 's/.*\( key = .*\) caps mon.*/\1/') 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} \ ceph auth get-or-create client.${RBD_POOL_USER} \
mon "allow *" \ mon "allow *" \
osd "allow *" \ osd "allow *" \
mgr "allow *" \
-o ${KEYRING} -o ${KEYRING}
fi fi

4
glance/values.yaml
View File

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