Moving dev branch code to master branch

[yaml_builds.git] / site / dellgen10 / software / charts / ucp / ceph / ceph-osd.yaml

diff --git a/site/site30/software/charts/ucp/ceph/ceph-update.yaml b/site/dellgen10/software/charts/ucp/ceph/ceph-osd.yaml
similarity index 72%
rename from site/site30/software/charts/ucp/ceph/ceph-update.yaml
rename to site/dellgen10/software/charts/ucp/ceph/ceph-osd.yaml
index aa1f372..d5a95d4 100644 (file)
--- a/site/site30/software/charts/ucp/ceph/ceph-update.yaml
+++ b/site/dellgen10/software/charts/ucp/ceph/ceph-osd.yaml
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -18,12 +18,12 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: ucp-ceph-update
+  name: ucp-ceph-osd
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: ucp-ceph-global
+      name: ucp-ceph-osd-global
     actions:
       - method: replace
         path: .values.conf.storage.osd
@@ -35,6 +35,12 @@ data:
     conf:
       storage:
         osd:
+          - data:
+              type: block-logical
+              location: /dev/sda
+            journal:
+              type: directory
+              location: /var/lib/ceph/journal/journal-sda
           - data:
               type: block-logical
               location: /dev/sdb
@@ -65,41 +71,4 @@ data:
             journal:
               type: directory
               location: /var/lib/ceph/journal/journal-sdf
-          - data:
-              type: block-logical
-              location: /dev/sdg
-            journal:
-              type: directory
-              location: /var/lib/ceph/journal/journal-sdg
-          - data:
-              type: block-logical
-              location: /dev/sdh
-            journal:
-              type: directory
-              location: /var/lib/ceph/journal/journal-sdh
-          - data:
-              type: block-logical
-              location: /dev/sdi
-            journal:
-              type: directory
-              location: /var/lib/ceph/journal/journal-sdi
-      pool:
-        target:
-          osd: 24
-        default:
-          crush_rule: replicated_rule
-...
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ucp-ceph-update
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data:
-  description: Ceph post intall update
-  chart_group:
-    - ucp-ceph-update
 ...