openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fetch Total_OSD value from ceph-client/values.yaml"

Browse Source
This commit is contained in:
Zuul 2019-05-22 17:23:49 +00:00 committed by Gerrit Code Review
commit c01098f396
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceph-client/templates/bin/pool/_init.sh.tpl
View File

@ -115,12 +115,7 @@ function manage_pool () {
TARGET_PG_PER_OSD=$5 TARGET_PG_PER_OSD=$5
POOL_CRUSH_RULE=$6 POOL_CRUSH_RULE=$6
POOL_PROTECTION=$7 POOL_PROTECTION=$7
TOTAL_OSDS=$(ceph --cluster "${CLUSTER}" osd ls | wc -l) TOTAL_OSDS={{.Values.conf.pool.target.osd}}
if (ceph --cluster "${CLUSTER}" osd crush rule dump "${POOL_CRUSH_RULE}" | awk '/item_name/' | grep -q ssd); then
TOTAL_OSDS=$(ceph --cluster "${CLUSTER}" osd tree | grep "ssd" | wc -l)
elif (ceph --cluster "${CLUSTER}" osd crush rule dump "${POOL_CRUSH_RULE}" | awk '/item_name/' | grep -q hdd); then
TOTAL_OSDS=$(ceph --cluster "${CLUSTER}" osd tree | grep "hdd" | wc -l)
fi
POOL_PLACEMENT_GROUPS=$(/tmp/pool-calc.py ${POOL_REPLICATION} ${TOTAL_OSDS} ${TOTAL_DATA_PERCENT} ${TARGET_PG_PER_OSD}) POOL_PLACEMENT_GROUPS=$(/tmp/pool-calc.py ${POOL_REPLICATION} ${TOTAL_OSDS} ${TOTAL_DATA_PERCENT} ${TARGET_PG_PER_OSD})
create_pool "${POOL_APPLICATION}" "${POOL_NAME}" "${POOL_REPLICATION}" "${POOL_PLACEMENT_GROUPS}" "${POOL_CRUSH_RULE}" "${POOL_PROTECTION}" create_pool "${POOL_APPLICATION}" "${POOL_NAME}" "${POOL_REPLICATION}" "${POOL_PLACEMENT_GROUPS}" "${POOL_CRUSH_RULE}" "${POOL_PROTECTION}"
} }