Merge "Ceph: Journal partition automation"

ceph-osd/templates/bin/osd/_block.sh.tpl

@@ -200,7 +200,6 @@ if [ "${OSD_BLUESTORE:-0}" -ne 1 ]; then
     chown ceph. "${JOURNAL_PART}" "${DATA_PART}"
     OSD_JOURNAL="${JOURNAL_PART}"
   fi
-  CEPH_OSD_OPTIONS="${CEPH_OSD_OPTIONS} --osd-journal ${OSD_JOURNAL}"
 fi
 
 if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then

ceph-osd/templates/bin/osd/_init.sh.tpl

@@ -22,6 +22,8 @@ set -ex
 : "${OSD_JOURNAL_UUID:=$(uuidgen)}"
 : "${OSD_FORCE_ZAP:=1}"
 : "${CEPH_CONF:="/etc/ceph/${CLUSTER}.conf"}"
+# We do not want to zap journal disk. Tracking this option seperatly.
+: "${JOURNAL_FORCE_ZAP:=0}"
 
 if [[ ! -e ${CEPH_CONF}.template ]]; then
   echo "ERROR- ${CEPH_CONF}.template must exist; get it from your existing mon"
@@ -203,7 +205,7 @@ function osd_disk_prepare {
     CLI_OPTS="${CLI_OPTS} --bluestore"
   fi
 
-  if [ -b "${OSD_JOURNAL}" -a "${OSD_FORCE_ZAP:-0}" -eq 1 ]; then
+  if [ -b "${OSD_JOURNAL}" -a "${JOURNAL_FORCE_ZAP:-0}" -eq 1 ]; then
     # if we got here and zap is set, it's ok to wipe the journal.
     echo "OSD_FORCE_ZAP is set, so we will erase the journal device ${OSD_JOURNAL}"
     if [ -z "${OSD_JOURNAL_PARTITION}" ]; then

ceph-osd/values.yaml

@@ -134,6 +134,8 @@ conf:
 
     # NOTE(portdirect): for homogeneous clusters the `osd` key can be used to
     # define OSD pods that will be deployed across the cluster.
+    # when specifing whole disk (/dev/sdf) for journals, ceph-osd chart will create
+    # needed partitions for each OSDs.
     osd:
       - data:
           type: directory
@@ -153,6 +155,7 @@ conf:
       #   journal:
       #     type: directory
       #     location: /var/lib/openstack-helm/ceph/osd/journal-sdg
+
 # NOTE(portdirect): for heterogeneous clusters the overrides section can be used to define
 # OSD pods that will be deployed upon specifc nodes.
 # overrides: