From 81b5c0c48220aeb3f780086541f7c56cba69eee0 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Fri, 12 Jul 2019 11:33:11 -0500
Subject: [PATCH] [CEPH] Enable rack level failure domains

- uplift ceph charts

- This is to enable rack level failure domains as we are running on
host based failure domains

- updating the site to have one override which will create custom domain
names since current logic uses hostnames to get domain names.

- this lab running on single rack so using site override to create custom failure
domain names.

Change-Id: I2b92055e77dac6eba4fe59694c5291046149a6c4
---
 .../osh/openstack-tenant-ceph/ceph-osd.yaml      | 16 ++++++++++++++++
 .../software/charts/ucp/ceph/ceph-osd.yaml       | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
index 24f180786..d00702c89 100644
--- a/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
+++ b/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
@@ -24,6 +24,7 @@ data:
         node_selector_value: enabled
     conf:
       storage:
+        failure_domain: "rack"
         # NEWSITE-CHANGEME: The OSD count and configuration here should not need
         # to change if your HW matches the HW used in this environment.
         # Otherwise you may need to add or subtract disks to this list.
@@ -54,4 +55,19 @@ data:
             journal:
               type: block-logical
               location: /dev/sdc2
+      overrides:
+        ceph_osd:
+          hosts:
+            - name: cab23-r720-14
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_1"
+            - name: cab23-r720-17
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_2"
+            - name: cab23-r720-19
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_3"
 ...
diff --git a/site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml b/site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
index 81b671a63..c6be7e477 100644
--- a/site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
+++ b/site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
@@ -20,6 +20,7 @@ data:
   values:
     conf:
       storage:
+        failure_domain: "rack"
         # NEWSITE-CHANGEME: The OSD count and configuration here should not need
         # to change if your HW matches the HW used in this environment.
         # Otherwise you may need to add or subtract disks to this list.
@@ -74,4 +75,19 @@ data:
             journal:
               type: block-logical
               location: /dev/sdc4
+      overrides:
+        ceph_osd:
+          hosts:
+            - name: cab23-r720-11
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_1"
+            - name: cab23-r720-12
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_2"
+            - name: cab23-r720-13
+              conf:
+                storage:
+                  failure_domain_name: "cab23_rack_3"
 ...