From 4bc95447b6cc912dfc4887d67796d5f0e2980ece Mon Sep 17 00:00:00 2001 From: "Kabanov, Dmitrii" Date: Thu, 13 Aug 2020 11:14:12 -0700 Subject: [PATCH] [ceph-osd] Move back to old naming convention for VGs 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 --- .../bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl index ad1b087b9..675521300 100644 --- a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl +++ b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl @@ -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:]')