From 085a0dd1a9f860976a13b87d71e24cd94e1b0f43 Mon Sep 17 00:00:00 2001
From: "Huang, Sophie (sh879n)" <sh879n@att.com>
Date: Tue, 6 Oct 2020 21:30:17 +0000
Subject: [PATCH] [Cinder] Updates for external ceph backend

Example override yaml file is added to indicate how to
override the manifest for configure an additional externally
managed Ceph Cinder backend.

In ceph.conf, either "mon_host" or "mon host" can be used for
the same parameter. In order not to force the user to use it one
way or the other, "mon_host" is removed from default setting.

Change-Id: I179567d77196ab2fb82d7a78e3a08efb966ed68c
---
 cinder/Chart.yaml                             |  2 +-
 cinder/values.yaml                            |  6 +-
 .../external-ceph-backend.yaml                | 56 +++++++++++++++++++
 3 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 cinder/values_overrides/external-ceph-backend.yaml

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 1517c1f001..a4dd13849a 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.1.2
+version: 0.1.3
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 422cb8a6df..d21d980492 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -390,8 +390,7 @@ ceph_client:
     rbd_user: null
     rbd_user_keyring: null
     conf:
-      global:
-        mon_host: null
+      global: null
       osd: null
 conf:
   paste:
@@ -1082,8 +1081,7 @@ backup:
     enabled: false
     admin_keyring: null
     conf:
-      global:
-        mon_host: null
+      global: null
       osd: null
   posix:
     volume:
diff --git a/cinder/values_overrides/external-ceph-backend.yaml b/cinder/values_overrides/external-ceph-backend.yaml
new file mode 100644
index 0000000000..663846551a
--- /dev/null
+++ b/cinder/values_overrides/external-ceph-backend.yaml
@@ -0,0 +1,56 @@
+# Note: This yaml file serves as an example for overriding the manifest
+# to enable additional externally managed Ceph Cinder backend.
+# libvirt/values_overrides/cinder-external-ceph-backend.yaml in repo
+# openstack-helm-infra is also needed for the attachment of ceph volumes.
+---
+ceph_client:
+  enable_external_ceph_backend: True
+  external_ceph:
+    rbd_user: cinder2
+    rbd_user_keyring: RBDUserKeyRing
+    conf:
+      global:
+        auth client required: none
+        auth cluster required: none
+        auth service required: none
+        cluster network: 172.31.0.128/25
+        fsid: 538fe375-1ee2-4719-a89e-1ff2cd851a1f
+        log_to_syslog: False
+        mon_host: "[v2:172.31.0.187:3300,v1:172.31.0.187:6789],[v2:172.31.0.188:3300,v1:172.31.0.188:6789],[v2:172.31.0.189:3300,v1:172.31.0.189:6789]"
+        mon initial members: "host1,host2,host3"
+        mon_allow_pool_delete: True
+        mon_compact_on_trim: False
+        mutex_perf_counter: False
+        osd pool default crush rule: -1
+        public network: 172.31.0.128/25
+      osd:
+        ms_dispatch_throttle_bytes: 1048576000
+        objecter_inflight_op_bytes: 1048576000
+        objecter_inflight_ops: 102400
+        osd memory target: 17599882854
+        osd_max_pg_log_entries: 10
+        osd_min_pg_log_entries: 10
+        osd_pg_log_dups_tracked: 10
+        osd_pg_log_trim_min: 10
+
+conf:
+  cinder:
+    DEFAULT:
+      enabled_backends: "rbd1,rbd2"
+  backends:
+    rbd2:
+      volume_driver: cinder.volume.drivers.rbd.RBDDriver
+      volume_backend_name: rbd2
+      rbd_pool: cinder2.volumes
+      rbd_ceph_conf: "/etc/ceph/external-ceph.conf"
+      rbd_flatten_volume_from_snapshot: False
+      report_discard_supported: True
+      rbd_max_clone_depth: 5
+      rbd_store_chunk_size: 4
+      rados_connect_timeout: -1
+      rbd_user: cinder2
+      rbd_secret_uuid: 3f0133e4-8384-4743-9473-fecacc095c74
+      image_volume_cache_enabled: True
+      image_volume_cache_max_size_gb: 200
+      image_volume_cache_max_count: 50
+...