openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "[ceph-osd] Move back to old naming convention for VGs"

Browse Source
This commit is contained in:
Zuul 2020-08-13 21:05:50 +00:00 committed by Gerrit Code Review
commit 486ad9a25f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl
View File

@ -44,9 +44,9 @@ function prep_device {
local device_type=$3 local device_type=$3
local device_string VG DEVICE_OSD_ID logical_devices logical_volume local device_string VG DEVICE_OSD_ID logical_devices logical_volume
device_string=$(echo "${BLOCK_DEVICE#/}" | tr '/' '-') device_string=$(echo "${BLOCK_DEVICE#/}" | tr '/' '-')
VG=$(vgs --noheadings -o vg_name -S "vg_name=ceph-vg-${device_string}" | tr -d '[:space:]') VG=$(vgs --noheadings -o vg_name -S "vg_name=ceph-db-wal-${device_string}" | tr -d '[:space:]')
if [[ $VG ]]; then if [[ $VG ]]; then
DEVICE_OSD_ID=$(get_osd_id_from_volume "/dev/ceph-vg-${device_string}/ceph-${device_type}-${osd_dev_string}") DEVICE_OSD_ID=$(get_osd_id_from_volume "/dev/ceph-db-wal-${device_string}/ceph-${device_type}-${osd_dev_string}")
CEPH_LVM_PREPARE=1 CEPH_LVM_PREPARE=1
if [ -n "${OSD_ID}" ]; then if [ -n "${OSD_ID}" ]; then
if [ "${DEVICE_OSD_ID}" == "${OSD_ID}" ]; then if [ "${DEVICE_OSD_ID}" == "${OSD_ID}" ]; then
@ -62,7 +62,7 @@ function prep_device {
disk_zap "${OSD_DEVICE}" disk_zap "${OSD_DEVICE}"
CEPH_LVM_PREPARE=1 CEPH_LVM_PREPARE=1
fi fi
VG=ceph-vg-${device_string} VG=ceph-db-wal-${device_string}
locked vgcreate "$VG" "${BLOCK_DEVICE}" locked vgcreate "$VG" "${BLOCK_DEVICE}"
fi fi
logical_volume=$(lvs --noheadings -o lv_name -S "lv_name=ceph-${device_type}-${osd_dev_string}" | tr -d '[:space:]') logical_volume=$(lvs --noheadings -o lv_name -S "lv_name=ceph-${device_type}-${osd_dev_string}" | tr -d '[:space:]')