summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-14 22:32:22 +0000
committerGerrit Code Review <review@openstack.org>2019-01-14 22:32:22 +0000
commit916b3550867e595dac1556e771ffb2793fc91f3b (patch)
tree7511a2ff47a3f19534d38faab38c935fa4340fc4
parentf96c3016a06c39c028a3e290f769ba001d44a8a3 (diff)
parentac41fb5961e500f65a2e7c19b998374a9773f896 (diff)
Merge "Ceph journal partitions automation"
-rw-r--r--site/airship-seaworthy/profiles/host/cp_r720.yaml42
-rw-r--r--site/airship-seaworthy/profiles/host/dp_r720.yaml13
-rw-r--r--site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml8
-rw-r--r--site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml16
-rw-r--r--site/airskiff/profiles/host/cp_r720.yaml40
-rw-r--r--site/airskiff/profiles/host/dp_r720.yaml12
-rw-r--r--site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml16
7 files changed, 20 insertions, 127 deletions
diff --git a/site/airship-seaworthy/profiles/host/cp_r720.yaml b/site/airship-seaworthy/profiles/host/cp_r720.yaml
index aa60287..3883890 100644
--- a/site/airship-seaworthy/profiles/host/cp_r720.yaml
+++ b/site/airship-seaworthy/profiles/host/cp_r720.yaml
@@ -76,27 +76,6 @@ data:
76 fstype: 'ext4' 76 fstype: 'ext4'
77 mount_options: 'defaults' 77 mount_options: 'defaults'
78 78
79 cephjournal1:
80 partitions:
81 - name: 'ceph-j1'
82 size: '10g'
83 - name: 'ceph-j2'
84 size: '10g'
85 - name: 'ceph-j3'
86 size: '10g'
87 - name: 'ceph-j4'
88 size: '10g'
89 cephjournal2:
90 partitions:
91 - name: 'ceph-j5'
92 size: '10g'
93 - name: 'ceph-j6'
94 size: '10g'
95 - name: 'ceph-j7'
96 size: '10g'
97 - name: 'ceph-j8'
98 size: '10g'
99
100 platform: 79 platform:
101 kernel: 'hwe-16.04' 80 kernel: 'hwe-16.04'
102 kernel_params: 81 kernel_params:
@@ -182,27 +161,6 @@ data:
182 fstype: 'ext4' 161 fstype: 'ext4'
183 mount_options: 'defaults' 162 mount_options: 'defaults'
184 163
185 cephjournal1:
186 partitions:
187 - name: 'ceph-j1'
188 size: '10g'
189 - name: 'ceph-j2'
190 size: '10g'
191 - name: 'ceph-j3'
192 size: '10g'
193 - name: 'ceph-j4'
194 size: '10g'
195 cephjournal2:
196 partitions:
197 - name: 'ceph-j5'
198 size: '10g'
199 - name: 'ceph-j6'
200 size: '10g'
201 - name: 'ceph-j7'
202 size: '10g'
203 - name: 'ceph-j8'
204 size: '10g'
205
206 platform: 164 platform:
207 kernel: 'hwe-16.04' 165 kernel: 'hwe-16.04'
208 kernel_params: 166 kernel_params:
diff --git a/site/airship-seaworthy/profiles/host/dp_r720.yaml b/site/airship-seaworthy/profiles/host/dp_r720.yaml
index d686571..7158768 100644
--- a/site/airship-seaworthy/profiles/host/dp_r720.yaml
+++ b/site/airship-seaworthy/profiles/host/dp_r720.yaml
@@ -75,19 +75,6 @@ data:
75 fstype: 'ext4' 75 fstype: 'ext4'
76 mount_options: 'defaults' 76 mount_options: 'defaults'
77 77
78 cephjournal1:
79 partitions:
80 - name: 'ceph-j1'
81 size: '10g'
82 - name: 'ceph-j2'
83 size: '10g'
84 cephjournal2:
85 partitions:
86 - name: 'ceph-j3'
87 size: '10g'
88 - name: 'ceph-j4'
89 size: '10g'
90
91 ephemeral: 78 ephemeral:
92 partitions: 79 partitions:
93 - name: 'nova' 80 - name: 'nova'
diff --git a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
index 051dd17..6bcb770 100644
--- a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
+++ b/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
@@ -33,23 +33,23 @@ data:
33 location: /dev/sde 33 location: /dev/sde
34 journal: 34 journal:
35 type: block-logical 35 type: block-logical
36 location: /dev/sdb1 36 location: /dev/sdb
37 - data: 37 - data:
38 type: block-logical 38 type: block-logical
39 location: /dev/sdf 39 location: /dev/sdf
40 journal: 40 journal:
41 type: block-logical 41 type: block-logical
42 location: /dev/sdb2 42 location: /dev/sdb
43 - data: 43 - data:
44 type: block-logical 44 type: block-logical
45 location: /dev/sdg 45 location: /dev/sdg
46 journal: 46 journal:
47 type: block-logical 47 type: block-logical
48 location: /dev/sdc1 48 location: /dev/sdc
49 - data: 49 - data:
50 type: block-logical 50 type: block-logical
51 location: /dev/sdh 51 location: /dev/sdh
52 journal: 52 journal:
53 type: block-logical 53 type: block-logical
54 location: /dev/sdc2 54 location: /dev/sdc
55... 55...
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 927521c..38c0149 100644
--- a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
+++ b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml
@@ -29,47 +29,47 @@ data:
29 location: /dev/sdd 29 location: /dev/sdd
30 journal: 30 journal:
31 type: block-logical 31 type: block-logical
32 location: /dev/sdb1 32 location: /dev/sdb
33 - data: 33 - data:
34 type: block-logical 34 type: block-logical
35 location: /dev/sde 35 location: /dev/sde
36 journal: 36 journal:
37 type: block-logical 37 type: block-logical
38 location: /dev/sdb2 38 location: /dev/sdb
39 - data: 39 - data:
40 type: block-logical 40 type: block-logical
41 location: /dev/sdf 41 location: /dev/sdf
42 journal: 42 journal:
43 type: block-logical 43 type: block-logical
44 location: /dev/sdb3 44 location: /dev/sdb
45 - data: 45 - data:
46 type: block-logical 46 type: block-logical
47 location: /dev/sdg 47 location: /dev/sdg
48 journal: 48 journal:
49 type: block-logical 49 type: block-logical
50 location: /dev/sdb4 50 location: /dev/sdb
51 - data: 51 - data:
52 type: block-logical 52 type: block-logical
53 location: /dev/sdh 53 location: /dev/sdh
54 journal: 54 journal:
55 type: block-logical 55 type: block-logical
56 location: /dev/sdc1 56 location: /dev/sdc
57 - data: 57 - data:
58 type: block-logical 58 type: block-logical
59 location: /dev/sdi 59 location: /dev/sdi
60 journal: 60 journal:
61 type: block-logical 61 type: block-logical
62 location: /dev/sdc2 62 location: /dev/sdc
63 - data: 63 - data:
64 type: block-logical 64 type: block-logical
65 location: /dev/sdj 65 location: /dev/sdj
66 journal: 66 journal:
67 type: block-logical 67 type: block-logical
68 location: /dev/sdc3 68 location: /dev/sdc
69 - data: 69 - data:
70 type: block-logical 70 type: block-logical
71 location: /dev/sdk 71 location: /dev/sdk
72 journal: 72 journal:
73 type: block-logical 73 type: block-logical
74 location: /dev/sdc4 74 location: /dev/sdc
75... 75...
diff --git a/site/airskiff/profiles/host/cp_r720.yaml b/site/airskiff/profiles/host/cp_r720.yaml
index d61ba2a..283bb83 100644
--- a/site/airskiff/profiles/host/cp_r720.yaml
+++ b/site/airskiff/profiles/host/cp_r720.yaml
@@ -78,26 +78,6 @@ data:
78 fstype: 'ext4' 78 fstype: 'ext4'
79 mount_options: 'defaults' 79 mount_options: 'defaults'
80 80
81 cephjournal1:
82 partitions:
83 - name: 'ceph-j1'
84 size: '10g'
85 - name: 'ceph-j2'
86 size: '10g'
87 - name: 'ceph-j3'
88 size: '10g'
89 - name: 'ceph-j4'
90 size: '10g'
91 cephjournal2:
92 partitions:
93 - name: 'ceph-j5'
94 size: '10g'
95 - name: 'ceph-j6'
96 size: '10g'
97 - name: 'ceph-j7'
98 size: '10g'
99 - name: 'ceph-j8'
100 size: '10g'
101 81
102 platform: 82 platform:
103 kernel: 'hwe-16.04' 83 kernel: 'hwe-16.04'
@@ -184,26 +164,6 @@ data:
184 fstype: 'ext4' 164 fstype: 'ext4'
185 mount_options: 'defaults' 165 mount_options: 'defaults'
186 166
187 cephjournal1:
188 partitions:
189 - name: 'ceph-j1'
190 size: '10g'
191 - name: 'ceph-j2'
192 size: '10g'
193 - name: 'ceph-j3'
194 size: '10g'
195 - name: 'ceph-j4'
196 size: '10g'
197 cephjournal2:
198 partitions:
199 - name: 'ceph-j5'
200 size: '10g'
201 - name: 'ceph-j6'
202 size: '10g'
203 - name: 'ceph-j7'
204 size: '10g'
205 - name: 'ceph-j8'
206 size: '10g'
207 167
208 platform: 168 platform:
209 kernel: 'hwe-16.04' 169 kernel: 'hwe-16.04'
diff --git a/site/airskiff/profiles/host/dp_r720.yaml b/site/airskiff/profiles/host/dp_r720.yaml
index 3393ced..1e4c5c4 100644
--- a/site/airskiff/profiles/host/dp_r720.yaml
+++ b/site/airskiff/profiles/host/dp_r720.yaml
@@ -77,18 +77,6 @@ data:
77 fstype: 'ext4' 77 fstype: 'ext4'
78 mount_options: 'defaults' 78 mount_options: 'defaults'
79 79
80 cephjournal1:
81 partitions:
82 - name: 'ceph-j1'
83 size: '10g'
84 - name: 'ceph-j2'
85 size: '10g'
86 cephjournal2:
87 partitions:
88 - name: 'ceph-j3'
89 size: '10g'
90 - name: 'ceph-j4'
91 size: '10g'
92 80
93 ephemeral: 81 ephemeral:
94 partitions: 82 partitions:
diff --git a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml b/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml
index f2a82b1..8abd4eb 100644
--- a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml
+++ b/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml
@@ -31,47 +31,47 @@ data:
31 location: /dev/sdd 31 location: /dev/sdd
32 journal: 32 journal:
33 type: block-logical 33 type: block-logical
34 location: /dev/sdb1 34 location: /dev/sdb
35 - data: 35 - data:
36 type: block-logical 36 type: block-logical
37 location: /dev/sde 37 location: /dev/sde
38 journal: 38 journal:
39 type: block-logical 39 type: block-logical
40 location: /dev/sdb2 40 location: /dev/sdb
41 - data: 41 - data:
42 type: block-logical 42 type: block-logical
43 location: /dev/sdf 43 location: /dev/sdf
44 journal: 44 journal:
45 type: block-logical 45 type: block-logical
46 location: /dev/sdb3 46 location: /dev/sdb
47 - data: 47 - data:
48 type: block-logical 48 type: block-logical
49 location: /dev/sdg 49 location: /dev/sdg
50 journal: 50 journal:
51 type: block-logical 51 type: block-logical
52 location: /dev/sdb4 52 location: /dev/sdb
53 - data: 53 - data:
54 type: block-logical 54 type: block-logical
55 location: /dev/sdh 55 location: /dev/sdh
56 journal: 56 journal:
57 type: block-logical 57 type: block-logical
58 location: /dev/sdc1 58 location: /dev/sdc
59 - data: 59 - data:
60 type: block-logical 60 type: block-logical
61 location: /dev/sdi 61 location: /dev/sdi
62 journal: 62 journal:
63 type: block-logical 63 type: block-logical
64 location: /dev/sdc2 64 location: /dev/sdc
65 - data: 65 - data:
66 type: block-logical 66 type: block-logical
67 location: /dev/sdj 67 location: /dev/sdj
68 journal: 68 journal:
69 type: block-logical 69 type: block-logical
70 location: /dev/sdc3 70 location: /dev/sdc
71 - data: 71 - data:
72 type: block-logical 72 type: block-logical
73 location: /dev/sdk 73 location: /dev/sdk
74 journal: 74 journal:
75 type: block-logical 75 type: block-logical
76 location: /dev/sdc4 76 location: /dev/sdc
77... 77...