Merge "[ceph-osd] Remove default OSD configuration"

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.12
+version: 0.1.13
 home: https://github.com/ceph/ceph
 ...

ceph-osd/values.yaml

@@ -237,21 +237,15 @@ conf:
     # when specifing whole disk (/dev/sdf) for journals, ceph-osd chart will create
     # needed partitions for each OSDs.
     osd:
-      - data:
-          type: directory
-          location: /var/lib/openstack-helm/ceph/osd/osd-one
-        journal:
-          type: directory
-          location: /var/lib/openstack-helm/ceph/osd/journal-one
-
+    # Below is the current configuration default, which is Bluestore with co-located metadata
     # - data:
     #     type: bluestore
-      #     location: /dev/sdb
+    #     location: /dev/sdb   # Use a valid device here
+
     # Separate block devices may be used for block.db and/or block.wal
-      # Without these values they will be co-located on the data volume
     # Specify the location and size in Gb. It is recommended that the
-      # block_db size isn’t smaller than 4% of block. For example, if the
-      # block size is 1TB, then block_db shouldn’t be less than 40GB.
+    # block_db size isn't smaller than 4% of block. For example, if the
+    # block size is 1TB, then block_db shouldn't be less than 40GB.
     # A size suffix of K for kilobytes, M for megabytes, G for gigabytes,
     # T for terabytes, P for petabytes or E for exabytes is optional.
     # Default unit is megabytes.
@@ -262,6 +256,7 @@ conf:
     #     location: /dev/sdc
     #     size: "2GB"
 
+    # Block-based Filestore OSDs with separate journal block devices
     # - data:
     #     type: block-logical
     #     location: /dev/sdd
@@ -275,6 +270,7 @@ conf:
     #     type: block-logical
     #     location: /dev/sdf2
 
+    # Block-based Filestore OSDs with directory-based journals
     # - data:
     #     type: block-logical
     #     location: /dev/sdg
@@ -282,6 +278,14 @@ conf:
     #     type: directory
     #     location: /var/lib/openstack-helm/ceph/osd/journal-sdg
 
+    # Directory-based Filestore OSD
+    # - data:
+    #     type: directory
+    #     location: /var/lib/openstack-helm/ceph/osd/osd-one
+    #   journal:
+    #     type: directory
+    #     location: /var/lib/openstack-helm/ceph/osd/journal-one
+
 # NOTE(portdirect): for heterogeneous clusters the overrides section can be used to define
 # OSD pods that will be deployed upon specifc nodes.
 # overrides: