openstack
/
openstack-helm
Code Issues Proposed changes

Merge "Allow pool size change when pools are protected"

This commit is contained in:
Zuul 2018-10-19 20:53:59 +00:00 committed by Gerrit Code Review
parent b9fab949aa 1e740816a7
commit bcd756e3c2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/templates/bin/_backup-storage-init.sh.tpl
View File

@ -38,7 +38,10 @@ elif [ "x$STORAGE_BACKEND" == "xcinder.backup.drivers.ceph" ]; then
if [[ ${test_luminous} -gt 0 ]]; then
ceph osd pool application enable $1 $3
fi
size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')
ceph osd pool set $1 nosizechange 0
ceph osd pool set $1 size ${RBD_POOL_REPLICATION}
ceph osd pool set $1 nosizechange ${size_protection}
ceph osd pool set $1 crush_rule "${RBD_POOL_CRUSH_RULE}"
}
ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE} "cinder-backup"

3
cinder/templates/bin/_storage-init.sh.tpl
View File

@ -35,7 +35,10 @@ if [ "x$STORAGE_BACKEND" == "xcinder.volume.drivers.rbd.RBDDriver" ]; then
if [[ ${test_luminous} -gt 0 ]]; then
ceph osd pool application enable $1 $3
fi
size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')
ceph osd pool set $1 nosizechange 0
ceph osd pool set $1 size ${RBD_POOL_REPLICATION}
ceph osd pool set $1 nosizechange ${size_protection}
ceph osd pool set $1 crush_rule "${RBD_POOL_CRUSH_RULE}"
}
ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE} "cinder-volume"