Merge lp:~gnuoy/openstack-mojo-specs/swift-spec-fixes into lp:openstack-mojo-specs
- swift-spec-fixes
- Merge into mojo-openstack-specs
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 316 |
Proposed branch: | lp:~gnuoy/openstack-mojo-specs/swift-spec-fixes |
Merge into: | lp:openstack-mojo-specs |
Diff against target: |
467 lines (+160/-41) 14 files modified
helper/bundles/swift-ha-proxy-phase1.yaml (+17/-3) helper/bundles/swift-ha-proxy-phase2.yaml (+15/-3) helper/collect/collect-next-swift-proxy (+1/-3) helper/scripts/check-lint.sh (+1/-1) helper/setup/juju_set.py (+7/-1) specs/storage/swift/ha_serial_scaleout/icehouse/manifest (+3/-6) specs/storage/swift/ha_serial_scaleout/kilo/manifest (+3/-6) specs/storage/swift/ha_serial_scaleout/liberty/manifest (+3/-6) specs/storage/swift/ha_serial_scaleout/mitaka/manifest (+3/-6) specs/storage/swift/ha_serial_scaleout/newton/manifest (+3/-6) specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt (+3/-0) specs/storage/swift/ha_serial_scaleout/ocata/manifest (+49/-0) specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt (+3/-0) specs/storage/swift/ha_serial_scaleout/pike/manifest (+49/-0) |
To merge this branch: | bzr merge lp:~gnuoy/openstack-mojo-specs/swift-spec-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris MacNaughton (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'helper/bundles/swift-ha-proxy-phase1.yaml' |
2 | --- helper/bundles/swift-ha-proxy-phase1.yaml 2017-09-11 15:47:30 +0000 |
3 | +++ helper/bundles/swift-ha-proxy-phase1.yaml 2017-11-23 13:55:35 +0000 |
4 | @@ -27,21 +27,21 @@ |
5 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
6 | disable-ring-balance: False |
7 | swift-storage-z1: |
8 | - charm: swift-storage-z1 |
9 | + charm: swift-storage |
10 | constraints: mem=1G |
11 | options: |
12 | zone: 1 |
13 | block-device: vdb |
14 | overwrite: "true" |
15 | swift-storage-z2: |
16 | - charm: swift-storage-z2 |
17 | + charm: swift-storage |
18 | constraints: mem=1G |
19 | options: |
20 | zone: 2 |
21 | block-device: vdb |
22 | overwrite: "true" |
23 | swift-storage-z3: |
24 | - charm: swift-storage-z3 |
25 | + charm: swift-storage |
26 | constraints: mem=1G |
27 | options: |
28 | zone: 3 |
29 | @@ -56,6 +56,8 @@ |
30 | - [ keystone, mysql ] |
31 | - [ glance, mysql ] |
32 | - [ glance, keystone ] |
33 | + - [ glance, swift-proxy ] |
34 | + - [ swift-proxy, keystone ] |
35 | - [ swift-proxy, swift-hacluster ] |
36 | - [ swift-proxy, swift-storage-z1 ] |
37 | - [ swift-proxy, swift-storage-z2 ] |
38 | @@ -101,3 +103,15 @@ |
39 | ha-bindiface: ens2 |
40 | openstack-origin: cloud:xenial-ocata |
41 | source: cloud:xenial-ocata |
42 | +xenial-pike: |
43 | + inherits: openstack-services |
44 | + series: xenial |
45 | + overrides: |
46 | + ha-bindiface: ens2 |
47 | + openstack-origin: cloud:xenial-pike |
48 | + source: cloud:xenial-pike |
49 | +zesty-ocata: |
50 | + inherits: openstack-services |
51 | + series: zesty |
52 | + overrides: |
53 | + ha-bindiface: ens2 |
54 | |
55 | === modified file 'helper/bundles/swift-ha-proxy-phase2.yaml' |
56 | --- helper/bundles/swift-ha-proxy-phase2.yaml 2017-09-05 21:37:34 +0000 |
57 | +++ helper/bundles/swift-ha-proxy-phase2.yaml 2017-11-23 13:55:35 +0000 |
58 | @@ -11,11 +11,11 @@ |
59 | swift-proxy: |
60 | charm: swift-proxy |
61 | swift-storage-z1: |
62 | - charm: swift-storage-z1 |
63 | + charm: swift-storage |
64 | swift-storage-z2: |
65 | - charm: swift-storage-z2 |
66 | + charm: swift-storage |
67 | swift-storage-z3: |
68 | - charm: swift-storage-z3 |
69 | + charm: swift-storage |
70 | swift-hacluster: |
71 | charm: hacluster |
72 | relations: |
73 | @@ -65,3 +65,15 @@ |
74 | ha-bindiface: ens2 |
75 | openstack-origin: cloud:xenial-ocata |
76 | source: cloud:xenial-ocata |
77 | +xenial-pike: |
78 | + inherits: openstack-services |
79 | + series: xenial |
80 | + overrides: |
81 | + ha-bindiface: ens2 |
82 | + openstack-origin: cloud:xenial-pike |
83 | + source: cloud:xenial-pike |
84 | +zesty-ocata: |
85 | + inherits: openstack-services |
86 | + series: zesty |
87 | + overrides: |
88 | + ha-bindiface: ens2 |
89 | |
90 | === modified file 'helper/collect/collect-next-swift-proxy' |
91 | --- helper/collect/collect-next-swift-proxy 2017-09-06 14:46:47 +0000 |
92 | +++ helper/collect/collect-next-swift-proxy 2017-11-23 13:55:35 +0000 |
93 | @@ -3,6 +3,4 @@ |
94 | keystone cs:~openstack-charmers-next/keystone |
95 | mysql cs:~openstack-charmers-next/percona-cluster |
96 | swift-proxy cs:~openstack-charmers-next/swift-proxy |
97 | -swift-storage-z1 cs:~openstack-charmers-next/swift-storage |
98 | -swift-storage-z2 cs:~openstack-charmers-next/swift-storage |
99 | -swift-storage-z3 cs:~openstack-charmers-next/swift-storage |
100 | +swift-storage cs:~openstack-charmers-next/swift-storage |
101 | |
102 | === modified file 'helper/scripts/check-lint.sh' |
103 | --- helper/scripts/check-lint.sh 2016-04-18 14:36:47 +0000 |
104 | +++ helper/scripts/check-lint.sh 2017-11-23 13:55:35 +0000 |
105 | @@ -1,7 +1,7 @@ |
106 | #!/bin/bash |
107 | |
108 | echo "Checking specs..." |
109 | -for spec in $(find specs/{object_storage,full_stack} -name manifest); do |
110 | +for spec in $(find specs/{storage,full_stack} -name manifest); do |
111 | spec_dir=$(dirname $spec) |
112 | MSGS=$(./helper/scripts/mojo-spec-check.py $spec_dir 2>&1) |
113 | if [[ "$MSGS" == *WARNING* ]] || [[ "$MSGS" == *ERROR* ]]; then |
114 | |
115 | === modified file 'helper/setup/juju_set.py' |
116 | --- helper/setup/juju_set.py 2017-08-30 17:25:03 +0000 |
117 | +++ helper/setup/juju_set.py 2017-11-23 13:55:35 +0000 |
118 | @@ -8,12 +8,18 @@ |
119 | parser = argparse.ArgumentParser() |
120 | parser.add_argument("--service") |
121 | parser.add_argument("--kv") |
122 | + parser.add_argument("--wait") |
123 | options = parser.parse_args() |
124 | service = mojo_utils.parse_mojo_arg(options, 'service') |
125 | kv = mojo_utils.parse_mojo_arg(options, 'kv') |
126 | + wait = mojo_utils.parse_mojo_arg(options, 'wait') |
127 | + print("Wait: {}".format(wait)) |
128 | + if wait is not None: |
129 | + wait = wait == 'True' |
130 | print("Service: {}".format(service)) |
131 | print("Option: {}".format(kv)) |
132 | - mojo_utils.juju_set(service, kv) |
133 | + print("Wait: {}".format(wait)) |
134 | + mojo_utils.juju_set(service, kv, wait=wait) |
135 | |
136 | |
137 | if __name__ == "__main__": |
138 | |
139 | === added symlink 'specs/storage/swift/ha_serial_scaleout/icehouse/juju_set.py' |
140 | === target is u'../../../../../helper/setup/juju_set.py' |
141 | === modified file 'specs/storage/swift/ha_serial_scaleout/icehouse/manifest' |
142 | --- specs/storage/swift/ha_serial_scaleout/icehouse/manifest 2016-10-13 15:30:54 +0000 |
143 | +++ specs/storage/swift/ha_serial_scaleout/icehouse/manifest 2017-11-23 13:55:35 +0000 |
144 | @@ -7,12 +7,6 @@ |
145 | # Check juju statuses are green and that hooks have finished |
146 | verify config=check_juju.py |
147 | |
148 | -# Add service relations |
149 | -deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse |
150 | - |
151 | -# Check juju statuses are green and that hooks have finished |
152 | -verify config=check_juju.py |
153 | - |
154 | # Setup glance images |
155 | script config=image_setup.py |
156 | |
157 | @@ -25,6 +19,9 @@ |
158 | # Test obj store by sending and recieving files |
159 | verify config=test_obj_store.py |
160 | |
161 | +# Inc. cluster count |
162 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
163 | + |
164 | # Add a swift-proxy unit |
165 | script config=add_unit.py UNITS='swift-proxy:1' |
166 | |
167 | |
168 | === removed symlink 'specs/storage/swift/ha_serial_scaleout/icehouse/swift-ha-proxy-phase2.yaml' |
169 | === target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
170 | === added symlink 'specs/storage/swift/ha_serial_scaleout/kilo/juju_set.py' |
171 | === target is u'../../../../../helper/setup/juju_set.py' |
172 | === modified file 'specs/storage/swift/ha_serial_scaleout/kilo/manifest' |
173 | --- specs/storage/swift/ha_serial_scaleout/kilo/manifest 2016-10-13 15:30:54 +0000 |
174 | +++ specs/storage/swift/ha_serial_scaleout/kilo/manifest 2017-11-23 13:55:35 +0000 |
175 | @@ -7,12 +7,6 @@ |
176 | # Check juju statuses are green and that hooks have finished |
177 | verify config=check_juju.py |
178 | |
179 | -# Add service relations |
180 | -deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo |
181 | - |
182 | -# Check juju statuses are green and that hooks have finished |
183 | -verify config=check_juju.py |
184 | - |
185 | # Setup glance images |
186 | script config=image_setup.py |
187 | |
188 | @@ -25,6 +19,9 @@ |
189 | # Test obj store by sending and recieving files |
190 | verify config=test_obj_store.py |
191 | |
192 | +# Inc. cluster count |
193 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
194 | + |
195 | # Add a swift-proxy unit |
196 | script config=add_unit.py UNITS='swift-proxy:1' |
197 | |
198 | |
199 | === removed symlink 'specs/storage/swift/ha_serial_scaleout/kilo/swift-ha-proxy-phase2.yaml' |
200 | === target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
201 | === added symlink 'specs/storage/swift/ha_serial_scaleout/liberty/juju_set.py' |
202 | === target is u'../../../../../helper/setup/juju_set.py' |
203 | === modified file 'specs/storage/swift/ha_serial_scaleout/liberty/manifest' |
204 | --- specs/storage/swift/ha_serial_scaleout/liberty/manifest 2016-10-13 15:30:54 +0000 |
205 | +++ specs/storage/swift/ha_serial_scaleout/liberty/manifest 2017-11-23 13:55:35 +0000 |
206 | @@ -7,12 +7,6 @@ |
207 | # Check juju statuses are green and that hooks have finished |
208 | verify config=check_juju.py |
209 | |
210 | -# Add service relations |
211 | -deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty |
212 | - |
213 | -# Check juju statuses are green and that hooks have finished |
214 | -verify config=check_juju.py |
215 | - |
216 | # Setup glance images |
217 | script config=image_setup.py |
218 | |
219 | @@ -25,6 +19,9 @@ |
220 | # Test obj store by sending and recieving files |
221 | verify config=test_obj_store.py |
222 | |
223 | +# Inc. cluster count |
224 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
225 | + |
226 | # Add a swift-proxy unit |
227 | script config=add_unit.py UNITS='swift-proxy:1' |
228 | |
229 | |
230 | === removed symlink 'specs/storage/swift/ha_serial_scaleout/liberty/swift-ha-proxy-phase2.yaml' |
231 | === target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
232 | === added symlink 'specs/storage/swift/ha_serial_scaleout/mitaka/juju_set.py' |
233 | === target is u'../../../../../helper/setup/juju_set.py' |
234 | === modified file 'specs/storage/swift/ha_serial_scaleout/mitaka/manifest' |
235 | --- specs/storage/swift/ha_serial_scaleout/mitaka/manifest 2016-10-13 15:30:54 +0000 |
236 | +++ specs/storage/swift/ha_serial_scaleout/mitaka/manifest 2017-11-23 13:55:35 +0000 |
237 | @@ -7,12 +7,6 @@ |
238 | # Check juju statuses are green and that hooks have finished |
239 | verify config=check_juju.py |
240 | |
241 | -# Add service relations |
242 | -deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka |
243 | - |
244 | -# Check juju statuses are green and that hooks have finished |
245 | -verify config=check_juju.py |
246 | - |
247 | # Setup glance images |
248 | script config=image_setup.py |
249 | |
250 | @@ -25,6 +19,9 @@ |
251 | # Test obj store by sending and recieving files |
252 | verify config=test_obj_store.py |
253 | |
254 | +# Inc. cluster count |
255 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
256 | + |
257 | # Add a swift-proxy unit |
258 | script config=add_unit.py UNITS='swift-proxy:1' |
259 | |
260 | |
261 | === removed symlink 'specs/storage/swift/ha_serial_scaleout/mitaka/swift-ha-proxy-phase2.yaml' |
262 | === target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
263 | === added symlink 'specs/storage/swift/ha_serial_scaleout/newton/juju_set.py' |
264 | === target is u'../../../../../helper/setup/juju_set.py' |
265 | === modified file 'specs/storage/swift/ha_serial_scaleout/newton/manifest' |
266 | --- specs/storage/swift/ha_serial_scaleout/newton/manifest 2016-10-13 15:30:54 +0000 |
267 | +++ specs/storage/swift/ha_serial_scaleout/newton/manifest 2017-11-23 13:55:35 +0000 |
268 | @@ -7,12 +7,6 @@ |
269 | # Check juju statuses are green and that hooks have finished |
270 | verify config=check_juju.py |
271 | |
272 | -# Add service relations |
273 | -deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-newton |
274 | - |
275 | -# Check juju statuses are green and that hooks have finished |
276 | -verify config=check_juju.py |
277 | - |
278 | # Setup glance images |
279 | script config=image_setup.py |
280 | |
281 | @@ -25,6 +19,9 @@ |
282 | # Test obj store by sending and recieving files |
283 | verify config=test_obj_store.py |
284 | |
285 | +# Inc. cluster count |
286 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
287 | + |
288 | # Add a swift-proxy unit |
289 | script config=add_unit.py UNITS='swift-proxy:1' |
290 | |
291 | |
292 | === removed symlink 'specs/storage/swift/ha_serial_scaleout/newton/swift-ha-proxy-phase2.yaml' |
293 | === target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
294 | === added directory 'specs/storage/swift/ha_serial_scaleout/ocata' |
295 | === added file 'specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt' |
296 | --- specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
297 | +++ specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt 2017-11-23 13:55:35 +0000 |
298 | @@ -0,0 +1,3 @@ |
299 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
300 | +Swift proxy is then scaled out and once that has completed swift storage is |
301 | +scaled out. The resulting object store is then retested. |
302 | |
303 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/add_unit.py' |
304 | === target is u'../../../../../helper/setup/add_unit.py' |
305 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/check_juju.py' |
306 | === target is u'../../../../../helper/tests/check_juju.py' |
307 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/collect-next-swift-proxy' |
308 | === target is u'../../../../../helper/collect/collect-next-swift-proxy' |
309 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/image_setup.py' |
310 | === target is u'../../../../../helper/setup/image_setup.py' |
311 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/images.yaml' |
312 | === target is u'../../../../../helper/setup/images.yaml' |
313 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/juju_set.py' |
314 | === target is u'../../../../../helper/setup/juju_set.py' |
315 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/keystone_setup.py' |
316 | === target is u'../../../../../helper/setup/keystone_setup.py' |
317 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/keystone_users.yaml' |
318 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
319 | === added file 'specs/storage/swift/ha_serial_scaleout/ocata/manifest' |
320 | --- specs/storage/swift/ha_serial_scaleout/ocata/manifest 1970-01-01 00:00:00 +0000 |
321 | +++ specs/storage/swift/ha_serial_scaleout/ocata/manifest 2017-11-23 13:55:35 +0000 |
322 | @@ -0,0 +1,49 @@ |
323 | +# Collect the charm branches from Launchpad |
324 | +collect config=collect-next-swift-proxy |
325 | + |
326 | +# Deploy service units |
327 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata |
328 | + |
329 | +# Check juju statuses are green and that hooks have finished |
330 | +verify config=check_juju.py |
331 | + |
332 | +# Setup glance images |
333 | +script config=image_setup.py |
334 | + |
335 | +# Setup keystone users |
336 | +script config=keystone_setup.py |
337 | + |
338 | +# Check ring data is consistent accross proxies |
339 | +verify config=swift_ring_status.py |
340 | + |
341 | +# Test obj store by sending and recieving files |
342 | +verify config=test_obj_store.py |
343 | + |
344 | +# Inc. cluster count |
345 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
346 | + |
347 | +# Add a swift-proxy unit |
348 | +script config=add_unit.py UNITS='swift-proxy:1' |
349 | + |
350 | +# Check juju statuses are green and that hooks have finished |
351 | +verify config=check_juju.py |
352 | + |
353 | +# Check ring data is consistent accross proxies |
354 | +verify config=swift_ring_status.py |
355 | + |
356 | +# Test obj store by sending and recieving files |
357 | +verify config=test_obj_store.py |
358 | + |
359 | +# Add swift-storage units |
360 | +script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
361 | + |
362 | +# Check juju statuses are green and that hooks have finished |
363 | +verify config=check_juju.py |
364 | + |
365 | +# Check ring data is consistent accross proxies |
366 | +verify config=swift_ring_status.py |
367 | + |
368 | +# Test obj store by sending and recieving files |
369 | +verify config=test_obj_store.py |
370 | + |
371 | +# Success |
372 | |
373 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/swift-ha-proxy-phase1.yaml' |
374 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
375 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/swift_ring_status.py' |
376 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
377 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/test_obj_store.py' |
378 | === target is u'../../../../../helper/tests/test_obj_store.py' |
379 | === added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/utils' |
380 | === target is u'../../../../../helper/utils' |
381 | === added directory 'specs/storage/swift/ha_serial_scaleout/pike' |
382 | === added file 'specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt' |
383 | --- specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
384 | +++ specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt 2017-11-23 13:55:35 +0000 |
385 | @@ -0,0 +1,3 @@ |
386 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
387 | +Swift proxy is then scaled out and once that has completed swift storage is |
388 | +scaled out. The resulting object store is then retested. |
389 | |
390 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/add_unit.py' |
391 | === target is u'../../../../../helper/setup/add_unit.py' |
392 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/check_juju.py' |
393 | === target is u'../../../../../helper/tests/check_juju.py' |
394 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/collect-next-swift-proxy' |
395 | === target is u'../../../../../helper/collect/collect-next-swift-proxy' |
396 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/image_setup.py' |
397 | === target is u'../../../../../helper/setup/image_setup.py' |
398 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/images.yaml' |
399 | === target is u'../../../../../helper/setup/images.yaml' |
400 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/juju_set.py' |
401 | === target is u'../../../../../helper/setup/juju_set.py' |
402 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/keystone_setup.py' |
403 | === target is u'../../../../../helper/setup/keystone_setup.py' |
404 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/keystone_users.yaml' |
405 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
406 | === added file 'specs/storage/swift/ha_serial_scaleout/pike/manifest' |
407 | --- specs/storage/swift/ha_serial_scaleout/pike/manifest 1970-01-01 00:00:00 +0000 |
408 | +++ specs/storage/swift/ha_serial_scaleout/pike/manifest 2017-11-23 13:55:35 +0000 |
409 | @@ -0,0 +1,49 @@ |
410 | +# Collect the charm branches from Launchpad |
411 | +collect config=collect-next-swift-proxy |
412 | + |
413 | +# Deploy service units |
414 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-pike |
415 | + |
416 | +# Check juju statuses are green and that hooks have finished |
417 | +verify config=check_juju.py |
418 | + |
419 | +# Setup glance images |
420 | +script config=image_setup.py |
421 | + |
422 | +# Setup keystone users |
423 | +script config=keystone_setup.py |
424 | + |
425 | +# Check ring data is consistent accross proxies |
426 | +verify config=swift_ring_status.py |
427 | + |
428 | +# Test obj store by sending and recieving files |
429 | +verify config=test_obj_store.py |
430 | + |
431 | +# Inc. cluster count |
432 | +script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False' |
433 | + |
434 | +# Add a swift-proxy unit |
435 | +script config=add_unit.py UNITS='swift-proxy:1' |
436 | + |
437 | +# Check juju statuses are green and that hooks have finished |
438 | +verify config=check_juju.py |
439 | + |
440 | +# Check ring data is consistent accross proxies |
441 | +verify config=swift_ring_status.py |
442 | + |
443 | +# Test obj store by sending and recieving files |
444 | +verify config=test_obj_store.py |
445 | + |
446 | +# Add swift-storage units |
447 | +script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
448 | + |
449 | +# Check juju statuses are green and that hooks have finished |
450 | +verify config=check_juju.py |
451 | + |
452 | +# Check ring data is consistent accross proxies |
453 | +verify config=swift_ring_status.py |
454 | + |
455 | +# Test obj store by sending and recieving files |
456 | +verify config=test_obj_store.py |
457 | + |
458 | +# Success |
459 | |
460 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/swift-ha-proxy-phase1.yaml' |
461 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
462 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/swift_ring_status.py' |
463 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
464 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/test_obj_store.py' |
465 | === target is u'../../../../../helper/tests/test_obj_store.py' |
466 | === added symlink 'specs/storage/swift/ha_serial_scaleout/pike/utils' |
467 | === target is u'../../../../../helper/utils' |
Looks good to me, merging