openstack/openstack-helm-infra
Code Issues Proposed changes

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

Browse Source 
The PS switches back to old naming convention for VGs. The old naming
convention have to be used until the changes which allow to handle
update of VG names are merged ( https://review.opendev.org/#/c/745166/ ).
Otherwise, OSDs will not come up after an upgrade.

Change-Id: I1bf9ca93149a93dfd5f79813533ace3a1fe58002
This commit is contained in:
Kabanov, Dmitrii 2020-08-13 11:14:12 -07:00 committed by Dmitrii Kabanov
parent 8631c79548
commit 4bc95447b6
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_string VG DEVICE_OSD_ID logical_devices logical_volume
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
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
if [ -n "${OSD_ID}" ]; then
if [ "${DEVICE_OSD_ID}" == "${OSD_ID}" ]; then
@ -62,7 +62,7 @@ function prep_device {
disk_zap "${OSD_DEVICE}"
CEPH_LVM_PREPARE=1
fi
VG=ceph-vg-${device_string}
VG=ceph-db-wal-${device_string}
locked vgcreate "$VG" "${BLOCK_DEVICE}"
fi
logical_volume=$(lvs --noheadings -o lv_name -S "lv_name=ceph-${device_type}-${osd_dev_string}" | tr -d '[:space:]')