openstack/openstack-helm-infra
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2020-10-06 18:17:51 +00:00 committed by Gerrit Code Review
commit d75d0d8f00
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-osd/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph OSD description: OpenStack-Helm Ceph OSD
name: ceph-osd name: ceph-osd
version: 0.1.3 version: 0.1.4
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

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

@ -272,6 +272,7 @@ function osd_disk_prepare {
if [[ ! -z "${OSD_ID}" ]]; then if [[ ! -z "${OSD_ID}" ]]; then
if ceph --name client.bootstrap-osd --keyring $OSD_BOOTSTRAP_KEYRING osd ls |grep -w ${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" echo "Running bluestore mode and ${OSD_DEVICE} already bootstrapped"
CEPH_LVM_PREPARE=0
elif [[ $OSD_FORCE_REPAIR -eq 1 ]]; then elif [[ $OSD_FORCE_REPAIR -eq 1 ]]; then
echo "OSD initialized for this cluster, but OSD ID not found in the cluster, reinitializing" echo "OSD initialized for this cluster, but OSD ID not found in the cluster, reinitializing"
else else