Merge "Ceph journal partitions automation"

site/airship-seaworthy/profiles/host/cp_r720.yaml

@@ -76,27 +76,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j5'
-            size: '10g'
-          - name: 'ceph-j6'
-            size: '10g'
-          - name: 'ceph-j7'
-            size: '10g'
-          - name: 'ceph-j8'
-            size: '10g'
-
   platform:
     kernel: 'hwe-16.04'
     kernel_params:
@@ -182,27 +161,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j5'
-            size: '10g'
-          - name: 'ceph-j6'
-            size: '10g'
-          - name: 'ceph-j7'
-            size: '10g'
-          - name: 'ceph-j8'
-            size: '10g'
-
   platform:
     kernel: 'hwe-16.04'
     kernel_params:

site/airship-seaworthy/profiles/host/dp_r720.yaml

@@ -75,19 +75,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
-
       ephemeral:
         partitions:
           - name: 'nova'

site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml

@@ -33,23 +33,23 @@ data:
               location: /dev/sde
             journal:
               type: block-logical
-              location: /dev/sdb1
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdf
             journal:
               type: block-logical
-              location: /dev/sdb2
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdg
             journal:
               type: block-logical
-              location: /dev/sdc1
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdh
             journal:
               type: block-logical
-              location: /dev/sdc2
+              location: /dev/sdc
 ...

site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml

@@ -29,47 +29,47 @@ data:
               location: /dev/sdd
             journal:
               type: block-logical
-              location: /dev/sdb1
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sde
             journal:
               type: block-logical
-              location: /dev/sdb2
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdf
             journal:
               type: block-logical
-              location: /dev/sdb3
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdg
             journal:
               type: block-logical
-              location: /dev/sdb4
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdh
             journal:
               type: block-logical
-              location: /dev/sdc1
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdi
             journal:
               type: block-logical
-              location: /dev/sdc2
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdj
             journal:
               type: block-logical
-              location: /dev/sdc3
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdk
             journal:
               type: block-logical
-              location: /dev/sdc4
+              location: /dev/sdc
 ...

site/airskiff/profiles/host/cp_r720.yaml

@@ -78,26 +78,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j5'
-            size: '10g'
-          - name: 'ceph-j6'
-            size: '10g'
-          - name: 'ceph-j7'
-            size: '10g'
-          - name: 'ceph-j8'
-            size: '10g'
 
   platform:
     kernel: 'hwe-16.04'
@@ -184,26 +164,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j5'
-            size: '10g'
-          - name: 'ceph-j6'
-            size: '10g'
-          - name: 'ceph-j7'
-            size: '10g'
-          - name: 'ceph-j8'
-            size: '10g'
 
   platform:
     kernel: 'hwe-16.04'

site/airskiff/profiles/host/dp_r720.yaml

@@ -77,18 +77,6 @@ data:
               fstype: 'ext4'
               mount_options: 'defaults'
 
-      cephjournal1:
-        partitions:
-          - name: 'ceph-j1'
-            size: '10g'
-          - name: 'ceph-j2'
-            size: '10g'
-      cephjournal2:
-        partitions:
-          - name: 'ceph-j3'
-            size: '10g'
-          - name: 'ceph-j4'
-            size: '10g'
 
       ephemeral:
         partitions:

site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml

@@ -31,47 +31,47 @@ data:
               location: /dev/sdd
             journal:
               type: block-logical
-              location: /dev/sdb1
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sde
             journal:
               type: block-logical
-              location: /dev/sdb2
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdf
             journal:
               type: block-logical
-              location: /dev/sdb3
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdg
             journal:
               type: block-logical
-              location: /dev/sdb4
+              location: /dev/sdb
           - data:
               type: block-logical
               location: /dev/sdh
             journal:
               type: block-logical
-              location: /dev/sdc1
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdi
             journal:
               type: block-logical
-              location: /dev/sdc2
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdj
             journal:
               type: block-logical
-              location: /dev/sdc3
+              location: /dev/sdc
           - data:
               type: block-logical
               location: /dev/sdk
             journal:
               type: block-logical
-              location: /dev/sdc4
+              location: /dev/sdc
 ...