Merge "[ceph-osd] Don't try to prepare OSD disks that are already dep…

…loyed"
hossein-alit · Oct 6, 2020 · d75d0d8 · d75d0d8
2 parents c658ac3 + 38d9f35
commit d75d0d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.3
+version: 0.1.4
 home: https://github.com/ceph/ceph
 ...
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
@@ -272,6 +272,7 @@ function osd_disk_prepare {
  if [[ ! -z "${OSD_ID}" ]]; then
  if ceph --name client.bootstrap-osd --keyring $OSD_BOOTSTRAP_KEYRING osd ls |grep -w ${OSD_ID}; then
  echo "Running bluestore mode and ${OSD_DEVICE} already bootstrapped"
+ CEPH_LVM_PREPARE=0
  elif [[ $OSD_FORCE_REPAIR -eq 1 ]]; then
  echo "OSD initialized for this cluster, but OSD ID not found in the cluster, reinitializing"
  else