From 908db10033abc52d4ee93afc8129c90ef15ef968 Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Thu, 4 Oct 2018 18:14:40 -0500
Subject: [PATCH] Set ceph OSDs to use ceph-bootstrap label for genesis
 deployment

Change-Id: Id6610ee9b376f74be845b43c5b6d7c5a1ca0f801
---
 global/profiles/host/cp.yaml                  |  1 -
 .../charts/ucp/ceph/chart-group-update.yaml   |  2 +-
 .../profiles/host/cp_r720.yaml                |  1 -
 .../charts/ucp/ceph/ceph-osd-update.yaml      | 75 +++++++++++++++++++
 .../software/charts/ucp/ceph/ceph-osd.yaml    |  4 +
 5 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd-update.yaml

diff --git a/global/profiles/host/cp.yaml b/global/profiles/host/cp.yaml
index f976652bd..e121dce50 100644
--- a/global/profiles/host/cp.yaml
+++ b/global/profiles/host/cp.yaml
@@ -70,7 +70,6 @@ data:
       openstack-neutron: enabled
       openvswitch: enabled
       ucp-barbican: enabled
-      ceph-bootstrap: enabled
       ceph-mon: enabled
       ceph-mgr: enabled
       ceph-osd: enabled
diff --git a/global/software/charts/ucp/ceph/chart-group-update.yaml b/global/software/charts/ucp/ceph/chart-group-update.yaml
index 6335f6e72..851bd08bf 100644
--- a/global/software/charts/ucp/ceph/chart-group-update.yaml
+++ b/global/software/charts/ucp/ceph/chart-group-update.yaml
@@ -13,7 +13,7 @@ data:
   chart_group:
     - ucp-ceph-ingress
     - ucp-ceph-mon
-    - ucp-ceph-osd
+    - ucp-ceph-osd-update
     - ucp-ceph-client-update
     - ucp-ceph-provisioners
     - ucp-ceph-rgw
diff --git a/site/airship-seaworthy/profiles/host/cp_r720.yaml b/site/airship-seaworthy/profiles/host/cp_r720.yaml
index 7fab8341a..7239be986 100644
--- a/site/airship-seaworthy/profiles/host/cp_r720.yaml
+++ b/site/airship-seaworthy/profiles/host/cp_r720.yaml
@@ -203,7 +203,6 @@ data:
       openstack-neutron: enabled
       openvswitch: enabled
       ucp-barbican: enabled
-      ceph-bootstrap: enabled
       # ceph-mon: enabled
       ceph-mgr: enabled
       ceph-osd: enabled
diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd-update.yaml b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd-update.yaml
new file mode 100644
index 000000000..6228ffa2b
--- /dev/null
+++ b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd-update.yaml
@@ -0,0 +1,75 @@
+---
+# The purpose of this file is to define environment-specific parameters for
+# ceph-osd
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-ceph-osd-update
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      name: ucp-ceph-osd-global
+    actions:
+      - method: replace
+        path: .values.conf.storage.osd
+      - method: merge
+        path: .
+  storagePolicy: cleartext
+data:
+  values:
+    conf:
+      storage:
+        # 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.
+        osd:
+          - data:
+              type: block-logical
+              location: /dev/sdc
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdc
+          - data:
+              type: block-logical
+              location: /dev/sdd
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdd
+          - data:
+              type: block-logical
+              location: /dev/sde
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sde
+          - data:
+              type: block-logical
+              location: /dev/sdf
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdf
+          - data:
+              type: block-logical
+              location: /dev/sdg
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdg
+          - data:
+              type: block-logical
+              location: /dev/sdh
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdh
+          - data:
+              type: block-logical
+              location: /dev/sdi
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdi
+          - data:
+              type: block-logical
+              location: /dev/sdj
+            journal:
+              type: directory
+              location: /var/lib/ceph/cp/journal-sdj
+...
diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
index 265c5b22e..5e2cf4c35 100644
--- a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
+++ b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
@@ -18,6 +18,10 @@ metadata:
   storagePolicy: cleartext
 data:
   values:
+    labels:
+      osd:
+        node_selector_key: ceph-bootstrap
+        node_selector_value: enabled
     conf:
       storage:
         # NEWSITE-CHANGEME: The OSD count and configuration here should not need