openstack/openstack-helm-infra
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2020-12-07 23:14:18 +00:00 committed by Gerrit Code Review
commit a26891e5be
2 changed files with 46 additions and 42 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.12 version: 0.1.13
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

26
ceph-osd/values.yaml
View File

@ -237,21 +237,15 @@ conf:
# when specifing whole disk (/dev/sdf) for journals, ceph-osd chart will create # when specifing whole disk (/dev/sdf) for journals, ceph-osd chart will create
# needed partitions for each OSDs. # needed partitions for each OSDs.
osd: osd:
- data: # Below is the current configuration default, which is Bluestore with co-located metadata
type: directory
location: /var/lib/openstack-helm/ceph/osd/osd-one
journal:
type: directory
location: /var/lib/openstack-helm/ceph/osd/journal-one
# - data: # - data:
# type: bluestore # 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 # 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 # 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_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 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, # 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. # T for terabytes, P for petabytes or E for exabytes is optional.
# Default unit is megabytes. # Default unit is megabytes.
@ -262,6 +256,7 @@ conf:
# location: /dev/sdc # location: /dev/sdc
# size: "2GB" # size: "2GB"
# Block-based Filestore OSDs with separate journal block devices
# - data: # - data:
# type: block-logical # type: block-logical
# location: /dev/sdd # location: /dev/sdd
@ -275,6 +270,7 @@ conf:
# type: block-logical # type: block-logical
# location: /dev/sdf2 # location: /dev/sdf2
# Block-based Filestore OSDs with directory-based journals
# - data: # - data:
# type: block-logical # type: block-logical
# location: /dev/sdg # location: /dev/sdg
@ -282,6 +278,14 @@ conf:
# type: directory # type: directory
# location: /var/lib/openstack-helm/ceph/osd/journal-sdg # 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 # NOTE(portdirect): for heterogeneous clusters the overrides section can be used to define
# OSD pods that will be deployed upon specifc nodes. # OSD pods that will be deployed upon specifc nodes.
# overrides: # overrides: