From 99f6402563455897e815018193ee3fd4c1214502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Fri, 13 Mar 2020 14:11:42 +0100
Subject: [PATCH] ceph: allow setting pool size 1 on octopus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Left from https://github.com/rook/rook/pull/4895
Also more cleanup on the ceph.conf since we config is in the mon store.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 pkg/daemon/ceph/config/config.go     | 32 ++++++++++++----------------
 pkg/operator/ceph/config/defaults.go |  7 ++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkg/daemon/ceph/config/config.go b/pkg/daemon/ceph/config/config.go
index 649e74f2b..9b58f80c0 100644
--- a/pkg/daemon/ceph/config/config.go
+++ b/pkg/daemon/ceph/config/config.go
@@ -57,15 +57,13 @@ var (
 
 // GlobalConfig represents the [global] sections of Ceph's config file.
 type GlobalConfig struct {
-	FSID                string `ini:"fsid,omitempty"`
-	MonMembers          string `ini:"mon initial members,omitempty"`
-	MonHost             string `ini:"mon host"`
-	PublicAddr          string `ini:"public addr,omitempty"`
-	PublicNetwork       string `ini:"public network,omitempty"`
-	ClusterAddr         string `ini:"cluster addr,omitempty"`
-	ClusterNetwork      string `ini:"cluster network,omitempty"`
-	MonAllowPoolDelete  bool   `ini:"mon_allow_pool_delete"`
-	MonAllowPoolSizeOne bool   `ini:"mon_allow_pool_size_one"`
+	FSID           string `ini:"fsid,omitempty"`
+	MonMembers     string `ini:"mon initial members,omitempty"`
+	MonHost        string `ini:"mon host"`
+	PublicAddr     string `ini:"public addr,omitempty"`
+	PublicNetwork  string `ini:"public network,omitempty"`
+	ClusterAddr    string `ini:"cluster addr,omitempty"`
+	ClusterNetwork string `ini:"cluster network,omitempty"`
 }
 
 // CephConfig represents an entire Ceph config including all sections.
@@ -163,15 +161,13 @@ func CreateDefaultCephConfig(context *clusterd.Context, cluster *ClusterInfo) (*
 
 	conf := &CephConfig{
 		GlobalConfig: &GlobalConfig{
-			FSID:                cluster.FSID,
-			MonMembers:          strings.Join(monMembers, " "),
-			MonHost:             strings.Join(monHosts, ","),
-			PublicAddr:          context.NetworkInfo.PublicAddr,
-			PublicNetwork:       context.NetworkInfo.PublicNetwork,
-			ClusterAddr:         context.NetworkInfo.ClusterAddr,
-			ClusterNetwork:      context.NetworkInfo.ClusterNetwork,
-			MonAllowPoolDelete:  true,
-			MonAllowPoolSizeOne: true,
+			FSID:           cluster.FSID,
+			MonMembers:     strings.Join(monMembers, " "),
+			MonHost:        strings.Join(monHosts, ","),
+			PublicAddr:     context.NetworkInfo.PublicAddr,
+			PublicNetwork:  context.NetworkInfo.PublicNetwork,
+			ClusterAddr:    context.NetworkInfo.ClusterAddr,
+			ClusterNetwork: context.NetworkInfo.ClusterNetwork,
 		},
 	}
 
diff --git a/pkg/operator/ceph/config/defaults.go b/pkg/operator/ceph/config/defaults.go
index de427c469..d5d43f82c 100644
--- a/pkg/operator/ceph/config/defaults.go
+++ b/pkg/operator/ceph/config/defaults.go
@@ -67,6 +67,13 @@ func DefaultCentralizedConfigs(cephVersion version.CephVersion) []Option {
 		}...)
 	}
 
+	// For Octopus
+	if cephVersion.IsAtLeastOctopus() {
+		overrides = append(overrides, []Option{
+			configOverride("global", "mon allow pool size one", "true"),
+		}...)
+	}
+
 	return overrides
 }