core: remove obsolete journal size config value
The journal size was only applicable to the filestore OSD format which has not been supported by rook since v1.2. Remove the remaining obsolete setting from the examples and code. Signed-off-by: travisn <tnielsen@redhat.com>
This commit is contained in:
5 files changed
+9
-15
No files matched your search
@@ -349,7 +349,6 @@ cephClusterSpec:
|
||||
# crushRoot: "custom-root" # specify a non-default root label for the CRUSH map
|
||||
# metadataDevice: "md0" # specify a non-rotational storage so ceph-volume will use it as block db device of bluestore.
|
||||
# databaseSizeMB: "1024" # uncomment if the disks are smaller than 100 GB
|
||||
# journalSizeMB: "1024" # uncomment if the disks are 20 GB or smaller
|
||||
# osdsPerDevice: "1" # this value can be overridden at the node or device level
|
||||
# encryptedDevice: "true" # the default value for this option is "false"
|
||||
# # Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named
|
||||
|
||||
@@ -97,15 +97,15 @@ spec:
|
||||
# enable the Multus network provider
|
||||
#provider: multus
|
||||
#selectors:
|
||||
# The selector keys are required to be `public` and `cluster`.
|
||||
# Based on the configuration, the operator will do the following:
|
||||
# 1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface
|
||||
# 2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network'
|
||||
#
|
||||
# In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus
|
||||
#
|
||||
#public: public-conf --> NetworkAttachmentDefinition object name in Multus
|
||||
#cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus
|
||||
# The selector keys are required to be `public` and `cluster`.
|
||||
# Based on the configuration, the operator will do the following:
|
||||
# 1. if only the `public` selector key is specified both public_network and cluster_network Ceph settings will listen on that interface
|
||||
# 2. if both `public` and `cluster` selector keys are specified the first one will point to 'public_network' flag and the second one to 'cluster_network'
|
||||
#
|
||||
# In order to work, each selector value must match a NetworkAttachmentDefinition object in Multus
|
||||
#
|
||||
# public: public-conf --> NetworkAttachmentDefinition object name in Multus
|
||||
# cluster: cluster-conf --> NetworkAttachmentDefinition object name in Multus
|
||||
# Provide internet protocol version. IPv6, IPv4 or empty string are valid options. Empty string would mean IPv4
|
||||
#ipFamily: "IPv6"
|
||||
# Ceph daemons to listen on both IPv4 and Ipv6 networks
|
||||
@@ -240,7 +240,6 @@ spec:
|
||||
# crushRoot: "custom-root" # specify a non-default root label for the CRUSH map
|
||||
# metadataDevice: "md0" # specify a non-rotational storage so ceph-volume will use it as block db device of bluestore.
|
||||
# databaseSizeMB: "1024" # uncomment if the disks are smaller than 100 GB
|
||||
# journalSizeMB: "1024" # uncomment if the disks are 20 GB or smaller
|
||||
# osdsPerDevice: "1" # this value can be overridden at the node or device level
|
||||
# encryptedDevice: "true" # the default value for this option is "false"
|
||||
# Individual nodes and their config can be specified as well, but 'useAllNodes' above must be set to false. Then, only the named
|
||||
|
||||
@@ -40,7 +40,6 @@ storage:
|
||||
location: "region=us-west,datacenter=delmar"
|
||||
config:
|
||||
metadataDevice: "nvme01"
|
||||
journalSizeMB: "1024"
|
||||
databaseSizeMB: "1024"
|
||||
nodes:
|
||||
- name: "node2"
|
||||
@@ -77,7 +76,6 @@ storage:
|
||||
},
|
||||
Config: map[string]string{
|
||||
"metadataDevice": "nvme01",
|
||||
"journalSizeMB": "1024",
|
||||
"databaseSizeMB": "1024",
|
||||
},
|
||||
Nodes: []Node{
|
||||
|
||||
@@ -24,7 +24,6 @@ import (
|
||||
const (
|
||||
WalSizeMBKey = "walSizeMB"
|
||||
DatabaseSizeMBKey = "databaseSizeMB"
|
||||
JournalSizeMBKey = "journalSizeMB"
|
||||
OSDsPerDeviceKey = "osdsPerDevice"
|
||||
EncryptedDeviceKey = "encryptedDevice"
|
||||
MetadataDeviceKey = "metadataDevice"
|
||||
|
||||
@@ -228,7 +228,6 @@ spec:
|
||||
deviceFilter: ` + getDeviceFilter() + `
|
||||
config:
|
||||
databaseSizeMB: "1024"
|
||||
journalSizeMB: "1024"
|
||||
`
|
||||
}
|
||||
return clusterSpec + `
|
||||
|
||||
Reference in new issue
Block a user