From f80049faa17338d658f532e4d644f7b993ba7908 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Tue, 14 Mar 2023 10:56:47 -0600
Subject: [PATCH] [ceph] Allow gate scripts to use 1x replication in Ceph

The Pacific release of Ceph disabled 1x replication by default, and
some of the gate scripts are not updated to allow this explicitly.
Some gate jobs fail in some configurations as a result, so this
change adds 'mon_allow_pool_size_one = true' to those Ceph gate
scripts that don't already have it, along with
--yes-i-really-mean-it added to commands that set pool size.

Change-Id: I5fb08d3bb714f1b67294bb01e17e8a5c1ddbb73a
---
 ceph-client/Chart.yaml                             | 2 +-
 ceph-client/templates/bin/pool/_init.sh.tpl        | 7 ++++++-
 releasenotes/notes/ceph-client.yaml                | 1 +
 tools/deployment/multinode/030-ceph.sh             | 1 +
 tools/deployment/osh-infra-logging-tls/020-ceph.sh | 1 +
 tools/deployment/osh-infra-logging/020-ceph.sh     | 1 +
 tools/deployment/tenant-ceph/030-ceph.sh           | 1 +
 tools/deployment/tenant-ceph/040-tenant-ceph.sh    | 1 +
 8 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 9e5f3a216..0bea61982 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.40
+version: 0.1.41
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/pool/_init.sh.tpl b/ceph-client/templates/bin/pool/_init.sh.tpl
index 5da21cee9..a922a0ad1 100644
--- a/ceph-client/templates/bin/pool/_init.sh.tpl
+++ b/ceph-client/templates/bin/pool/_init.sh.tpl
@@ -218,9 +218,14 @@ function set_pool_property() {
   PROPERTY_NAME=$2
   CURRENT_PROPERTY_VALUE=$3
   TARGET_PROPERTY_VALUE=$4
+  REALLY_MEAN_IT=""
+
+  if [[ "${PROPERTY_NAME}" == "size" ]]; then
+    REALLY_MEAN_IT="--yes-i-really-mean-it"
+  fi
 
   if [[ "${CURRENT_PROPERTY_VALUE}" != "${TARGET_PROPERTY_VALUE}" ]]; then
-    ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" "${PROPERTY_NAME}" "${TARGET_PROPERTY_VALUE}"
+    ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" "${PROPERTY_NAME}" "${TARGET_PROPERTY_VALUE}" ${REALLY_MEAN_IT}
   fi
 
   echo "${TARGET_PROPERTY_VALUE}"
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 08fbab0f1..e7bfcea1d 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -41,4 +41,5 @@ ceph-client:
   - 0.1.38 Make use of noautoscale with Pacific
   - 0.1.39 Correct check for too many OSDs in the pool job
   - 0.1.40 Fix OSD count checks in the ceph-rbd-pool job
+  - 0.1.41 Allow gate scripts to use 1x replication in Ceph
 ...
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 977b92b12..d424e5efd 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -64,6 +64,7 @@ conf:
   ceph:
     global:
       fsid: ${CEPH_FS_ID}
+      mon_allow_pool_size_one: true
   rgw_ks:
     enabled: true
   pool:
diff --git a/tools/deployment/osh-infra-logging-tls/020-ceph.sh b/tools/deployment/osh-infra-logging-tls/020-ceph.sh
index 1439177cb..5c7020885 100755
--- a/tools/deployment/osh-infra-logging-tls/020-ceph.sh
+++ b/tools/deployment/osh-infra-logging-tls/020-ceph.sh
@@ -73,6 +73,7 @@ conf:
     global:
       fsid: ${CEPH_FS_ID}
       mon_addr: :6789
+      mon_allow_pool_size_one: true
       osd_pool_default_size: 1
     osd:
       osd_crush_chooseleaf_type: 0
diff --git a/tools/deployment/osh-infra-logging/020-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh
index 60a18627e..00daec5e3 100755
--- a/tools/deployment/osh-infra-logging/020-ceph.sh
+++ b/tools/deployment/osh-infra-logging/020-ceph.sh
@@ -73,6 +73,7 @@ conf:
     global:
       fsid: ${CEPH_FS_ID}
       mon_addr: :6789
+      mon_allow_pool_size_one: true
       osd_pool_default_size: 1
     osd:
       osd_crush_chooseleaf_type: 0
diff --git a/tools/deployment/tenant-ceph/030-ceph.sh b/tools/deployment/tenant-ceph/030-ceph.sh
index 111e74113..f7cac6e85 100755
--- a/tools/deployment/tenant-ceph/030-ceph.sh
+++ b/tools/deployment/tenant-ceph/030-ceph.sh
@@ -82,6 +82,7 @@ conf:
   ceph:
     global:
       fsid: ${CEPH_FS_ID}
+      mon_allow_pool_size_one: true
     mon:
       mon_clock_drift_allowed: 2.0
   rgw_ks:
diff --git a/tools/deployment/tenant-ceph/040-tenant-ceph.sh b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
index 8626a5cd1..cdcfea8fa 100755
--- a/tools/deployment/tenant-ceph/040-tenant-ceph.sh
+++ b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
@@ -127,6 +127,7 @@ conf:
   ceph:
     global:
       fsid: ${TENANT_CEPH_FS_ID}
+      mon_allow_pool_size_one: true
   rgw_ks:
     enabled: true
   pool: