Merge lp:~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka into lp:openstack-mojo-specs
- swift-simple-liberty-mitaka
- Merge into mojo-openstack-specs
Status: | Merged |
---|---|
Merged at revision: | 271 |
Proposed branch: | lp:~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka |
Merge into: | lp:openstack-mojo-specs |
Diff against target: |
929 lines (+478/-1) 30 files modified
helper/bundles/cephradosgw-ha.yaml (+11/-0) helper/bundles/cephradosgw.yaml (+15/-0) helper/bundles/swift-ha-proxy-phase1.yaml (+14/-0) helper/bundles/swift-ha-proxy-phase2.yaml (+11/-0) helper/bundles/swift-proxy.yaml (+9/-0) helper/collect/collect-cephradosgw (+2/-0) helper/collect/collect-swift-proxy (+1/-1) helper/setup/delete_crm_leader.py (+7/-0) specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/ha/liberty/manifest (+34/-0) specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/ha/mitaka/manifest (+34/-0) specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest (+19/-0) specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest (+19/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest (+39/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest (+39/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest (+39/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest (+52/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest (+52/-0) specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt (+2/-0) specs/object_storage/swift_proxy/simple_nonha/liberty/manifest (+22/-0) specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt (+2/-0) specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest (+22/-0) |
To merge this branch: | bzr merge lp:~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
David Ames (community) | Approve | ||
Review via email: mp+300766@code.launchpad.net |
Commit message
Description of the change
- 271. By Chris MacNaughton
-
update radosgw bundles
- 272. By Chris MacNaughton
-
Update non-working swift-ha-parallel spec
- 273. By Chris MacNaughton
-
update the rest of the object_storage specs to have liberty + mitaka
- 274. By Chris MacNaughton
-
add more updated specs
- swift-proxy/
ha/mitaka
- radosgw/ha/liberty
- radosgw/ha/mitaka
- 275. By Chris MacNaughton
-
Update to check version numbers
This does not use lsb-release because
lsb-release does NOT convert general release
names into numbers, rather it gives the currently
running release name and version number - 276. By Chris MacNaughton
-
switch to distro_info
Ryan Beisner (1chb1n) wrote : | # |
Please run `make lint` and clear up any issues.
Ryan Beisner (1chb1n) wrote : | # |
I'm seeing:
helper/
helper/
helper/
helper/
- 277. By Chris MacNaughton
-
lint fixes
- 278. By Chris MacNaughton
-
remove spurious print statement
David Ames (thedac) wrote : | # |
Works for me. We may need to look at other specs for issues with Xenial interface names.
Ryan Beisner (1chb1n) : | # |
Preview Diff
1 | === modified file 'helper/bundles/cephradosgw-ha.yaml' |
2 | --- helper/bundles/cephradosgw-ha.yaml 2016-04-08 14:00:41 +0000 |
3 | +++ helper/bundles/cephradosgw-ha.yaml 2016-08-08 18:06:59 +0000 |
4 | @@ -45,3 +45,14 @@ |
5 | trusty-icehouse: |
6 | inherits: openstack-services |
7 | series: trusty |
8 | +trusty-liberty: |
9 | + inherits: openstack-services |
10 | + series: trusty |
11 | + overrides: |
12 | + openstack-origin: cloud:trusty-liberty |
13 | + source: cloud:trusty-liberty |
14 | +xenial-mitaka: |
15 | + inherits: openstack-services |
16 | + series: xenial |
17 | + overrides: |
18 | + ha-bindiface: ens2 |
19 | \ No newline at end of file |
20 | |
21 | === modified file 'helper/bundles/cephradosgw.yaml' |
22 | --- helper/bundles/cephradosgw.yaml 2016-04-08 14:00:41 +0000 |
23 | +++ helper/bundles/cephradosgw.yaml 2016-08-08 18:06:59 +0000 |
24 | @@ -31,11 +31,17 @@ |
25 | options: |
26 | admin-password: openstack |
27 | admin-token: ubuntutesting |
28 | + glance: |
29 | + charm: glance |
30 | + constraints: mem=1G |
31 | ceph-radosgw: |
32 | charm: ceph-radosgw |
33 | relations: |
34 | - [ keystone, mysql ] |
35 | - [ ceph-radosgw, keystone ] |
36 | + - [ glance, keystone ] |
37 | + - [ glance, mysql ] |
38 | + - [ glance, ceph ] |
39 | - [ ceph-radosgw, ceph ] |
40 | - [ ceph, ceph-osd ] |
41 | precise-icehouse: |
42 | @@ -47,3 +53,12 @@ |
43 | trusty-icehouse: |
44 | inherits: openstack-services |
45 | series: trusty |
46 | +trusty-liberty: |
47 | + inherits: openstack-services |
48 | + series: trusty |
49 | + overrides: |
50 | + openstack-origin: cloud:trusty-liberty |
51 | + source: cloud:trusty-liberty |
52 | +xenial-mitaka: |
53 | + inherits: openstack-services |
54 | + series: xenial |
55 | |
56 | === modified file 'helper/bundles/swift-ha-proxy-phase1.yaml' |
57 | --- helper/bundles/swift-ha-proxy-phase1.yaml 2016-04-08 14:00:41 +0000 |
58 | +++ helper/bundles/swift-ha-proxy-phase1.yaml 2016-08-08 18:06:59 +0000 |
59 | @@ -54,6 +54,9 @@ |
60 | - [ glance, mysql ] |
61 | - [ glance, keystone ] |
62 | - [ swift-proxy, swift-hacluster ] |
63 | + - [ swift-proxy, swift-storage-z1 ] |
64 | + - [ swift-proxy, swift-storage-z2 ] |
65 | + - [ swift-proxy, swift-storage-z3 ] |
66 | # icehouse |
67 | precise-icehouse: |
68 | inherits: openstack-services |
69 | @@ -64,3 +67,14 @@ |
70 | trusty-icehouse: |
71 | inherits: openstack-services |
72 | series: trusty |
73 | +trusty-liberty: |
74 | + inherits: openstack-services |
75 | + series: trusty |
76 | + overrides: |
77 | + openstack-origin: cloud:trusty-liberty |
78 | + source: cloud:trusty-liberty |
79 | +xenial-mitaka: |
80 | + inherits: openstack-services |
81 | + series: xenial |
82 | + overrides: |
83 | + ha-bindiface: ens2 |
84 | \ No newline at end of file |
85 | |
86 | === modified file 'helper/bundles/swift-ha-proxy-phase2.yaml' |
87 | --- helper/bundles/swift-ha-proxy-phase2.yaml 2016-04-08 14:00:41 +0000 |
88 | +++ helper/bundles/swift-ha-proxy-phase2.yaml 2016-08-08 18:06:59 +0000 |
89 | @@ -34,3 +34,14 @@ |
90 | trusty-icehouse: |
91 | inherits: openstack-services |
92 | series: trusty |
93 | +trusty-liberty: |
94 | + inherits: openstack-services |
95 | + series: trusty |
96 | + overrides: |
97 | + openstack-origin: cloud:trusty-liberty |
98 | + source: cloud:trusty-liberty |
99 | +xenial-mitaka: |
100 | + inherits: openstack-services |
101 | + series: xenial |
102 | + overrides: |
103 | + ha-bindiface: ens2 |
104 | \ No newline at end of file |
105 | |
106 | === modified file 'helper/bundles/swift-proxy.yaml' |
107 | --- helper/bundles/swift-proxy.yaml 2016-04-08 14:00:41 +0000 |
108 | +++ helper/bundles/swift-proxy.yaml 2016-08-08 18:06:59 +0000 |
109 | @@ -63,3 +63,12 @@ |
110 | trusty-icehouse: |
111 | inherits: openstack-services |
112 | series: trusty |
113 | +trusty-liberty: |
114 | + inherits: openstack-services |
115 | + series: trusty |
116 | + overrides: |
117 | + openstack-origin: cloud:trusty-liberty |
118 | + source: cloud:trusty-liberty |
119 | +xenial-mitaka: |
120 | + inherits: openstack-services |
121 | + series: xenial |
122 | |
123 | === modified file 'helper/collect/collect-cephradosgw' |
124 | --- helper/collect/collect-cephradosgw 2016-04-12 08:43:49 +0000 |
125 | +++ helper/collect/collect-cephradosgw 2016-08-08 18:06:59 +0000 |
126 | @@ -1,5 +1,7 @@ |
127 | ceph git://github.com/openstack/charm-ceph |
128 | +ceph-osd git://github.com/openstack/charm-ceph-osd |
129 | ceph-radosgw git://github.com/openstack/charm-ceph-radosgw |
130 | +glance git://github.com/openstack/charm-glance |
131 | hacluster lp:~openstack-charmers/charms/trusty/hacluster/next |
132 | keystone git://github.com/openstack/charm-keystone |
133 | mysql git://github.com/openstack/charm-percona-cluster |
134 | |
135 | === modified file 'helper/collect/collect-swift-proxy' |
136 | --- helper/collect/collect-swift-proxy 2016-04-12 08:43:49 +0000 |
137 | +++ helper/collect/collect-swift-proxy 2016-08-08 18:06:59 +0000 |
138 | @@ -1,5 +1,5 @@ |
139 | glance git://github.com/openstack/charm-glance |
140 | -hacluster lp:~openstack-charmers/charms/trusty/hacluster/next |
141 | +hacluster git://github.com/openstack/charm-hacluster |
142 | keystone git://github.com/openstack/charm-keystone |
143 | mysql git://github.com/openstack/charm-percona-cluster |
144 | swift-proxy git://github.com/openstack/charm-swift-proxy |
145 | |
146 | === modified file 'helper/setup/delete_crm_leader.py' |
147 | --- helper/setup/delete_crm_leader.py 2015-01-21 09:46:18 +0000 |
148 | +++ helper/setup/delete_crm_leader.py 2016-08-08 18:06:59 +0000 |
149 | @@ -1,7 +1,9 @@ |
150 | #!/usr/bin/python |
151 | import sys |
152 | +import os |
153 | import utils.mojo_utils as mojo_utils |
154 | import utils.mojo_os_utils as mojo_os_utils |
155 | +import distro_info |
156 | import logging |
157 | import argparse |
158 | |
159 | @@ -14,6 +16,11 @@ |
160 | options = parser.parse_args() |
161 | service = mojo_utils.parse_mojo_arg(options, 'service') |
162 | resource = mojo_utils.parse_mojo_arg(options, 'resource') |
163 | + xenial = distro_info.UbuntuDistroInfo().all.index('xenial') |
164 | + series = os.environ.get('MOJO_SERIES') |
165 | + mojo_env = distro_info.UbuntuDistroInfo().all.index(series) |
166 | + if mojo_env >= xenial: |
167 | + resource = resource.replace('eth0', 'ens2') |
168 | mojo_os_utils.delete_crm_leader(service, resource) |
169 | |
170 | if __name__ == "__main__": |
171 | |
172 | === added directory 'specs/object_storage/ceph_radosgw/ha/liberty' |
173 | === added file 'specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt' |
174 | --- specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
175 | +++ specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
176 | @@ -0,0 +1,3 @@ |
177 | +This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes. |
178 | +The rados gw leader is removed and additional units added. With tests run |
179 | +after each change |
180 | |
181 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/add_unit.py' |
182 | === target is u'../../../../../helper/setup/add_unit.py' |
183 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/cephradosgw-ha.yaml' |
184 | === target is u'../../../../../helper/bundles/cephradosgw-ha.yaml' |
185 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/check_juju.py' |
186 | === target is u'../../../../../helper/tests/check_juju.py' |
187 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/collect-cephradosgw-ha' |
188 | === target is u'../../../../../helper/collect/collect-cephradosgw-ha' |
189 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/delete_crm_leader.py' |
190 | === target is u'../../../../../helper/setup/delete_crm_leader.py' |
191 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/juju_set.py' |
192 | === target is u'../../../../../helper/setup/juju_set.py' |
193 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/keystone_setup.py' |
194 | === target is u'../../../../../helper/setup/keystone_setup.py' |
195 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/keystone_users.yaml' |
196 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
197 | === added file 'specs/object_storage/ceph_radosgw/ha/liberty/manifest' |
198 | --- specs/object_storage/ceph_radosgw/ha/liberty/manifest 1970-01-01 00:00:00 +0000 |
199 | +++ specs/object_storage/ceph_radosgw/ha/liberty/manifest 2016-08-08 18:06:59 +0000 |
200 | @@ -0,0 +1,34 @@ |
201 | +# Collect the charm branches from Launchpad |
202 | +collect config=collect-cephradosgw-ha |
203 | + |
204 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
205 | +deploy config=cephradosgw-ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
206 | + |
207 | +# Check juju statuses are green and that hooks have finished |
208 | +verify config=check_juju.py |
209 | + |
210 | +# Setup keystone users |
211 | +script config=keystone_setup.py |
212 | + |
213 | +# Test obj store by sending and recieving files |
214 | +verify config=test_obj_store.py |
215 | + |
216 | +# Delete the unit which is currently the leader (according to corosync) |
217 | +script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip' |
218 | + |
219 | +# Test obj store by sending and recieving files |
220 | +verify config=test_obj_store.py |
221 | + |
222 | +# Add 2 new ceph-radosgw units |
223 | +script config=add_unit.py UNITS='ceph-radosgw:2' |
224 | + |
225 | +# Test obj store by sending and recieving files |
226 | +verify config=test_obj_store.py |
227 | + |
228 | +# Switch to using the ceph-radosgw embedded webserver |
229 | +script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True" |
230 | + |
231 | +# Test obj store by sending and recieving files |
232 | +verify config=test_obj_store.py |
233 | + |
234 | +# Success |
235 | |
236 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/test_obj_store.py' |
237 | === target is u'../../../../../helper/tests/test_obj_store.py' |
238 | === added symlink 'specs/object_storage/ceph_radosgw/ha/liberty/utils' |
239 | === target is u'../../../../../helper/utils' |
240 | === added directory 'specs/object_storage/ceph_radosgw/ha/mitaka' |
241 | === added file 'specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt' |
242 | --- specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
243 | +++ specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
244 | @@ -0,0 +1,3 @@ |
245 | +This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes. |
246 | +The rados gw leader is removed and additional units added. With tests run |
247 | +after each change |
248 | |
249 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/add_unit.py' |
250 | === target is u'../../../../../helper/setup/add_unit.py' |
251 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/cephradosgw-ha.yaml' |
252 | === target is u'../../../../../helper/bundles/cephradosgw-ha.yaml' |
253 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/check_juju.py' |
254 | === target is u'../../../../../helper/tests/check_juju.py' |
255 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/collect-cephradosgw-ha' |
256 | === target is u'../../../../../helper/collect/collect-cephradosgw-ha' |
257 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/delete_crm_leader.py' |
258 | === target is u'../../../../../helper/setup/delete_crm_leader.py' |
259 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/juju_set.py' |
260 | === target is u'../../../../../helper/setup/juju_set.py' |
261 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/keystone_setup.py' |
262 | === target is u'../../../../../helper/setup/keystone_setup.py' |
263 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/keystone_users.yaml' |
264 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
265 | === added file 'specs/object_storage/ceph_radosgw/ha/mitaka/manifest' |
266 | --- specs/object_storage/ceph_radosgw/ha/mitaka/manifest 1970-01-01 00:00:00 +0000 |
267 | +++ specs/object_storage/ceph_radosgw/ha/mitaka/manifest 2016-08-08 18:06:59 +0000 |
268 | @@ -0,0 +1,34 @@ |
269 | +# Collect the charm branches from Launchpad |
270 | +collect config=collect-cephradosgw-ha |
271 | + |
272 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
273 | +deploy config=cephradosgw-ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
274 | + |
275 | +# Check juju statuses are green and that hooks have finished |
276 | +verify config=check_juju.py |
277 | + |
278 | +# Setup keystone users |
279 | +script config=keystone_setup.py |
280 | + |
281 | +# Test obj store by sending and recieving files |
282 | +verify config=test_obj_store.py |
283 | + |
284 | +# Delete the unit which is currently the leader (according to corosync) |
285 | +script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip' |
286 | + |
287 | +# Test obj store by sending and recieving files |
288 | +verify config=test_obj_store.py |
289 | + |
290 | +# Add 2 new ceph-radosgw units |
291 | +script config=add_unit.py UNITS='ceph-radosgw:2' |
292 | + |
293 | +# Test obj store by sending and recieving files |
294 | +verify config=test_obj_store.py |
295 | + |
296 | +# Switch to using the ceph-radosgw embedded webserver |
297 | +script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True" |
298 | + |
299 | +# Test obj store by sending and recieving files |
300 | +verify config=test_obj_store.py |
301 | + |
302 | +# Success |
303 | |
304 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/test_obj_store.py' |
305 | === target is u'../../../../../helper/tests/test_obj_store.py' |
306 | === added symlink 'specs/object_storage/ceph_radosgw/ha/mitaka/utils' |
307 | === target is u'../../../../../helper/utils' |
308 | === added directory 'specs/object_storage/ceph_radosgw/simple_nonha/liberty' |
309 | === added file 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt' |
310 | --- specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
311 | +++ specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
312 | @@ -0,0 +1,3 @@ |
313 | +This spec deploys a ceph cluster fronted by a single ceph rados gateway node. |
314 | +The cluster is then tested with mulitple object store gets and retrivals. |
315 | +Glance integeration is also tested. |
316 | |
317 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/cephradosgw.yaml' |
318 | === target is u'../../../../../helper/bundles/cephradosgw.yaml' |
319 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/check_juju.py' |
320 | === target is u'../../../../../helper/tests/check_juju.py' |
321 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/collect-cephradosgw' |
322 | === target is u'../../../../../helper/collect/collect-cephradosgw' |
323 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/image_setup.py' |
324 | === target is u'../../../../../helper/setup/image_setup.py' |
325 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/images.yaml' |
326 | === target is u'../../../../../helper/setup/images.yaml' |
327 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/keystone_setup.py' |
328 | === target is u'../../../../../helper/setup/keystone_setup.py' |
329 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/keystone_users.yaml' |
330 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
331 | === added file 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest' |
332 | --- specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest 1970-01-01 00:00:00 +0000 |
333 | +++ specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest 2016-08-08 18:06:59 +0000 |
334 | @@ -0,0 +1,19 @@ |
335 | +# Collect the charm branches from Launchpad |
336 | +collect config=collect-cephradosgw |
337 | + |
338 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
339 | +deploy config=cephradosgw.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
340 | + |
341 | +# Check juju statuses are green and that hooks have finished |
342 | +verify config=check_juju.py |
343 | + |
344 | +# Setup images |
345 | +script config=image_setup.py |
346 | + |
347 | +# Setup keystone users |
348 | +script config=keystone_setup.py |
349 | + |
350 | +# Test obj store by sending and recieving files |
351 | +verify config=test_obj_store.py |
352 | + |
353 | +# Success |
354 | |
355 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/test_obj_store.py' |
356 | === target is u'../../../../../helper/tests/test_obj_store.py' |
357 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/liberty/utils' |
358 | === target is u'../../../../../helper/utils' |
359 | === added directory 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka' |
360 | === added file 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt' |
361 | --- specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
362 | +++ specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
363 | @@ -0,0 +1,3 @@ |
364 | +This spec deploys a ceph cluster fronted by a single ceph rados gateway node. |
365 | +The cluster is then tested with mulitple object store gets and retrivals. |
366 | +Glance integeration is also tested. |
367 | |
368 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/cephradosgw.yaml' |
369 | === target is u'../../../../../helper/bundles/cephradosgw.yaml' |
370 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/check_juju.py' |
371 | === target is u'../../../../../helper/tests/check_juju.py' |
372 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/collect-cephradosgw' |
373 | === target is u'../../../../../helper/collect/collect-cephradosgw' |
374 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/image_setup.py' |
375 | === target is u'../../../../../helper/setup/image_setup.py' |
376 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/images.yaml' |
377 | === target is u'../../../../../helper/setup/images.yaml' |
378 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/keystone_setup.py' |
379 | === target is u'../../../../../helper/setup/keystone_setup.py' |
380 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/keystone_users.yaml' |
381 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
382 | === added file 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest' |
383 | --- specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest 1970-01-01 00:00:00 +0000 |
384 | +++ specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest 2016-08-08 18:06:59 +0000 |
385 | @@ -0,0 +1,19 @@ |
386 | +# Collect the charm branches from Launchpad |
387 | +collect config=collect-cephradosgw |
388 | + |
389 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
390 | +deploy config=cephradosgw.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
391 | + |
392 | +# Check juju statuses are green and that hooks have finished |
393 | +verify config=check_juju.py |
394 | + |
395 | +# Setup images |
396 | +script config=image_setup.py |
397 | + |
398 | +# Setup keystone users |
399 | +script config=keystone_setup.py |
400 | + |
401 | +# Test obj store by sending and recieving files |
402 | +verify config=test_obj_store.py |
403 | + |
404 | +# Success |
405 | |
406 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/test_obj_store.py' |
407 | === target is u'../../../../../helper/tests/test_obj_store.py' |
408 | === added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/mitaka/utils' |
409 | === target is u'../../../../../helper/utils' |
410 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt' |
411 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
412 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
413 | @@ -0,0 +1,5 @@ |
414 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
415 | +Swift proxy and swift storage are then simultaniously scaled out and the |
416 | +resulting object store retested. WARNING: Scaling swift-proxy and |
417 | +swift-storage is simultaiously is currently not supported so this spec is |
418 | +known to fail |
419 | |
420 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/add_unit.py' |
421 | === target is u'../../../../../helper/setup/add_unit.py' |
422 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/check_juju.py' |
423 | === target is u'../../../../../helper/tests/check_juju.py' |
424 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/collect-swift-proxy' |
425 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
426 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/image_setup.py' |
427 | === target is u'../../../../../helper/setup/image_setup.py' |
428 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/images.yaml' |
429 | === target is u'../../../../../helper/setup/images.yaml' |
430 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/keystone_setup.py' |
431 | === target is u'../../../../../helper/setup/keystone_setup.py' |
432 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/keystone_users.yaml' |
433 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
434 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest' |
435 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest 1970-01-01 00:00:00 +0000 |
436 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest 2016-08-08 18:06:59 +0000 |
437 | @@ -0,0 +1,39 @@ |
438 | +# Collect the charm branches from Launchpad |
439 | +collect config=collect-swift-proxy |
440 | + |
441 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
442 | + |
443 | +# Check juju statuses are green and that hooks have finished |
444 | +verify config=check_juju.py |
445 | + |
446 | +# Add service relations |
447 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
448 | + |
449 | +# Check juju statuses are green and that hooks have finished |
450 | +verify config=check_juju.py |
451 | + |
452 | +# Setup glance images |
453 | +script config=image_setup.py |
454 | + |
455 | +# Setup keystone users |
456 | +script config=keystone_setup.py |
457 | + |
458 | +# Check ring data is consistent accross proxies |
459 | +verify config=swift_ring_status.py |
460 | + |
461 | +# Test obj store by sending and recieving files |
462 | +verify config=test_obj_store.py |
463 | + |
464 | +# Add a swift-proxy and swift-storage units |
465 | +script config=add_unit.py UNITS='swift-proxy:1 swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
466 | + |
467 | +# Check juju statuses are green and that hooks have finished |
468 | +verify config=check_juju.py |
469 | + |
470 | +# Check ring data is consistent accross proxies |
471 | +verify config=swift_ring_status.py |
472 | + |
473 | +# Test obj store by sending and recieving files |
474 | +verify config=test_obj_store.py |
475 | + |
476 | +# Success |
477 | |
478 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/swift-ha-proxy-phase1.yaml' |
479 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
480 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/swift_ring_status.py' |
481 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
482 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/test_obj_store.py' |
483 | === target is u'../../../../../helper/tests/test_obj_store.py' |
484 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/utils' |
485 | === target is u'../../../../../helper/utils' |
486 | === added directory 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty' |
487 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt' |
488 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
489 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
490 | @@ -0,0 +1,5 @@ |
491 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
492 | +Swift proxy and swift storage are then simultaniously scaled out and the |
493 | +resulting object store retested. WARNING: Scaling swift-proxy and |
494 | +swift-storage is simultaiously is currently not supported so this spec is |
495 | +known to fail |
496 | |
497 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/add_unit.py' |
498 | === target is u'../../../../../helper/setup/add_unit.py' |
499 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/check_juju.py' |
500 | === target is u'../../../../../helper/tests/check_juju.py' |
501 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/collect-swift-proxy' |
502 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
503 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/image_setup.py' |
504 | === target is u'../../../../../helper/setup/image_setup.py' |
505 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/images.yaml' |
506 | === target is u'../../../../../helper/setup/images.yaml' |
507 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/keystone_setup.py' |
508 | === target is u'../../../../../helper/setup/keystone_setup.py' |
509 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/keystone_users.yaml' |
510 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
511 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest' |
512 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest 1970-01-01 00:00:00 +0000 |
513 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest 2016-08-08 18:06:59 +0000 |
514 | @@ -0,0 +1,39 @@ |
515 | +# Collect the charm branches from Launchpad |
516 | +collect config=collect-swift-proxy |
517 | + |
518 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
519 | + |
520 | +# Check juju statuses are green and that hooks have finished |
521 | +verify config=check_juju.py |
522 | + |
523 | +# Add service relations |
524 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
525 | + |
526 | +# Check juju statuses are green and that hooks have finished |
527 | +verify config=check_juju.py |
528 | + |
529 | +# Setup glance images |
530 | +script config=image_setup.py |
531 | + |
532 | +# Setup keystone users |
533 | +script config=keystone_setup.py |
534 | + |
535 | +# Check ring data is consistent accross proxies |
536 | +verify config=swift_ring_status.py |
537 | + |
538 | +# Test obj store by sending and recieving files |
539 | +verify config=test_obj_store.py |
540 | + |
541 | +# Add a swift-proxy and swift-storage units |
542 | +script config=add_unit.py UNITS='swift-proxy:1 swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
543 | + |
544 | +# Check juju statuses are green and that hooks have finished |
545 | +verify config=check_juju.py |
546 | + |
547 | +# Check ring data is consistent accross proxies |
548 | +verify config=swift_ring_status.py |
549 | + |
550 | +# Test obj store by sending and recieving files |
551 | +verify config=test_obj_store.py |
552 | + |
553 | +# Success |
554 | |
555 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/swift-ha-proxy-phase1.yaml' |
556 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
557 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/swift_ring_status.py' |
558 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
559 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/test_obj_store.py' |
560 | === target is u'../../../../../helper/tests/test_obj_store.py' |
561 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/utils' |
562 | === target is u'../../../../../helper/utils' |
563 | === added directory 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka' |
564 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt' |
565 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
566 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
567 | @@ -0,0 +1,5 @@ |
568 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
569 | +Swift proxy and swift storage are then simultaniously scaled out and the |
570 | +resulting object store retested. WARNING: Scaling swift-proxy and |
571 | +swift-storage is simultaiously is currently not supported so this spec is |
572 | +known to fail |
573 | |
574 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/add_unit.py' |
575 | === target is u'../../../../../helper/setup/add_unit.py' |
576 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/check_juju.py' |
577 | === target is u'../../../../../helper/tests/check_juju.py' |
578 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/collect-swift-proxy' |
579 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
580 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/image_setup.py' |
581 | === target is u'../../../../../helper/setup/image_setup.py' |
582 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/images.yaml' |
583 | === target is u'../../../../../helper/setup/images.yaml' |
584 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/keystone_setup.py' |
585 | === target is u'../../../../../helper/setup/keystone_setup.py' |
586 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/keystone_users.yaml' |
587 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
588 | === added file 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest' |
589 | --- specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest 1970-01-01 00:00:00 +0000 |
590 | +++ specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest 2016-08-08 18:06:59 +0000 |
591 | @@ -0,0 +1,39 @@ |
592 | +# Collect the charm branches from Launchpad |
593 | +collect config=collect-swift-proxy |
594 | + |
595 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
596 | + |
597 | +# Check juju statuses are green and that hooks have finished |
598 | +verify config=check_juju.py |
599 | + |
600 | +# Add service relations |
601 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
602 | + |
603 | +# Check juju statuses are green and that hooks have finished |
604 | +verify config=check_juju.py |
605 | + |
606 | +# Setup glance images |
607 | +script config=image_setup.py |
608 | + |
609 | +# Setup keystone users |
610 | +script config=keystone_setup.py |
611 | + |
612 | +# Check ring data is consistent accross proxies |
613 | +verify config=swift_ring_status.py |
614 | + |
615 | +# Test obj store by sending and recieving files |
616 | +verify config=test_obj_store.py |
617 | + |
618 | +# Add a swift-proxy and swift-storage units |
619 | +script config=add_unit.py UNITS='swift-proxy:1 swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
620 | + |
621 | +# Check juju statuses are green and that hooks have finished |
622 | +verify config=check_juju.py |
623 | + |
624 | +# Check ring data is consistent accross proxies |
625 | +verify config=swift_ring_status.py |
626 | + |
627 | +# Test obj store by sending and recieving files |
628 | +verify config=test_obj_store.py |
629 | + |
630 | +# Success |
631 | |
632 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/swift-ha-proxy-phase1.yaml' |
633 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
634 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/swift_ring_status.py' |
635 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
636 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/test_obj_store.py' |
637 | === target is u'../../../../../helper/tests/test_obj_store.py' |
638 | === added symlink 'specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/utils' |
639 | === target is u'../../../../../helper/utils' |
640 | === added directory 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty' |
641 | === added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt' |
642 | --- specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
643 | +++ specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
644 | @@ -0,0 +1,3 @@ |
645 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
646 | +Swift proxy is then scaled out and once that has completed swift storage is |
647 | +scaled out. The resulting object store is then retested. |
648 | |
649 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/add_unit.py' |
650 | === target is u'../../../../../helper/setup/add_unit.py' |
651 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/check_juju.py' |
652 | === target is u'../../../../../helper/tests/check_juju.py' |
653 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/collect-swift-proxy' |
654 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
655 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/image_setup.py' |
656 | === target is u'../../../../../helper/setup/image_setup.py' |
657 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/images.yaml' |
658 | === target is u'../../../../../helper/setup/images.yaml' |
659 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/keystone_setup.py' |
660 | === target is u'../../../../../helper/setup/keystone_setup.py' |
661 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/keystone_users.yaml' |
662 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
663 | === added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest' |
664 | --- specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest 1970-01-01 00:00:00 +0000 |
665 | +++ specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest 2016-08-08 18:06:59 +0000 |
666 | @@ -0,0 +1,52 @@ |
667 | +# Collect the charm branches from Launchpad |
668 | +collect config=collect-swift-proxy |
669 | + |
670 | +# Deploy service units |
671 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
672 | + |
673 | +# Check juju statuses are green and that hooks have finished |
674 | +verify config=check_juju.py |
675 | + |
676 | +# Add service relations |
677 | +deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
678 | + |
679 | +# Check juju statuses are green and that hooks have finished |
680 | +verify config=check_juju.py |
681 | + |
682 | +# Setup glance images |
683 | +script config=image_setup.py |
684 | + |
685 | +# Setup keystone users |
686 | +script config=keystone_setup.py |
687 | + |
688 | +# Check ring data is consistent accross proxies |
689 | +verify config=swift_ring_status.py |
690 | + |
691 | +# Test obj store by sending and recieving files |
692 | +verify config=test_obj_store.py |
693 | + |
694 | +# Add a swift-proxy unit |
695 | +script config=add_unit.py UNITS='swift-proxy:1' |
696 | + |
697 | +# Check juju statuses are green and that hooks have finished |
698 | +verify config=check_juju.py |
699 | + |
700 | +# Check ring data is consistent accross proxies |
701 | +verify config=swift_ring_status.py |
702 | + |
703 | +# Test obj store by sending and recieving files |
704 | +verify config=test_obj_store.py |
705 | + |
706 | +# Add swift-storage units |
707 | +script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
708 | + |
709 | +# Check juju statuses are green and that hooks have finished |
710 | +verify config=check_juju.py |
711 | + |
712 | +# Check ring data is consistent accross proxies |
713 | +verify config=swift_ring_status.py |
714 | + |
715 | +# Test obj store by sending and recieving files |
716 | +verify config=test_obj_store.py |
717 | + |
718 | +# Success |
719 | |
720 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/swift-ha-proxy-phase1.yaml' |
721 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
722 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/swift-ha-proxy-phase2.yaml' |
723 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
724 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/swift_ring_status.py' |
725 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
726 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/test_obj_store.py' |
727 | === target is u'../../../../../helper/tests/test_obj_store.py' |
728 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/utils' |
729 | === target is u'../../../../../helper/utils' |
730 | === added directory 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka' |
731 | === added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt' |
732 | --- specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
733 | +++ specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
734 | @@ -0,0 +1,3 @@ |
735 | +This spec deploys a swift cluster fronted by multiple swift proxy front ends. |
736 | +Swift proxy is then scaled out and once that has completed swift storage is |
737 | +scaled out. The resulting object store is then retested. |
738 | |
739 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/add_unit.py' |
740 | === target is u'../../../../../helper/setup/add_unit.py' |
741 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/check_juju.py' |
742 | === target is u'../../../../../helper/tests/check_juju.py' |
743 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/collect-swift-proxy' |
744 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
745 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/image_setup.py' |
746 | === target is u'../../../../../helper/setup/image_setup.py' |
747 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/images.yaml' |
748 | === target is u'../../../../../helper/setup/images.yaml' |
749 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/keystone_setup.py' |
750 | === target is u'../../../../../helper/setup/keystone_setup.py' |
751 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/keystone_users.yaml' |
752 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
753 | === added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest' |
754 | --- specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest 1970-01-01 00:00:00 +0000 |
755 | +++ specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest 2016-08-08 18:06:59 +0000 |
756 | @@ -0,0 +1,52 @@ |
757 | +# Collect the charm branches from Launchpad |
758 | +collect config=collect-swift-proxy |
759 | + |
760 | +# Deploy service units |
761 | +deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
762 | + |
763 | +# Check juju statuses are green and that hooks have finished |
764 | +verify config=check_juju.py |
765 | + |
766 | +# Add service relations |
767 | +deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
768 | + |
769 | +# Check juju statuses are green and that hooks have finished |
770 | +verify config=check_juju.py |
771 | + |
772 | +# Setup glance images |
773 | +script config=image_setup.py |
774 | + |
775 | +# Setup keystone users |
776 | +script config=keystone_setup.py |
777 | + |
778 | +# Check ring data is consistent accross proxies |
779 | +verify config=swift_ring_status.py |
780 | + |
781 | +# Test obj store by sending and recieving files |
782 | +verify config=test_obj_store.py |
783 | + |
784 | +# Add a swift-proxy unit |
785 | +script config=add_unit.py UNITS='swift-proxy:1' |
786 | + |
787 | +# Check juju statuses are green and that hooks have finished |
788 | +verify config=check_juju.py |
789 | + |
790 | +# Check ring data is consistent accross proxies |
791 | +verify config=swift_ring_status.py |
792 | + |
793 | +# Test obj store by sending and recieving files |
794 | +verify config=test_obj_store.py |
795 | + |
796 | +# Add swift-storage units |
797 | +script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1' |
798 | + |
799 | +# Check juju statuses are green and that hooks have finished |
800 | +verify config=check_juju.py |
801 | + |
802 | +# Check ring data is consistent accross proxies |
803 | +verify config=swift_ring_status.py |
804 | + |
805 | +# Test obj store by sending and recieving files |
806 | +verify config=test_obj_store.py |
807 | + |
808 | +# Success |
809 | |
810 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/swift-ha-proxy-phase1.yaml' |
811 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml' |
812 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/swift-ha-proxy-phase2.yaml' |
813 | === target is u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml' |
814 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/swift_ring_status.py' |
815 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
816 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/test_obj_store.py' |
817 | === target is u'../../../../../helper/tests/test_obj_store.py' |
818 | === added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/utils' |
819 | === target is u'../../../../../helper/utils' |
820 | === added directory 'specs/object_storage/swift_proxy/simple_nonha/liberty' |
821 | === added file 'specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt' |
822 | --- specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
823 | +++ specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
824 | @@ -0,0 +1,2 @@ |
825 | +This spec deploys a swift cluster fronted by a single swift proxy. The |
826 | +resulting object store is then tested. |
827 | |
828 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/check_juju.py' |
829 | === target is u'../../../../../helper/tests/check_juju.py' |
830 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/collect-swift-proxy' |
831 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
832 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/image_setup.py' |
833 | === target is u'../../../../../helper/setup/image_setup.py' |
834 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/images.yaml' |
835 | === target is u'../../../../../helper/setup/images.yaml' |
836 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/keystone_setup.py' |
837 | === target is u'../../../../../helper/setup/keystone_setup.py' |
838 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/keystone_users.yaml' |
839 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
840 | === added file 'specs/object_storage/swift_proxy/simple_nonha/liberty/manifest' |
841 | --- specs/object_storage/swift_proxy/simple_nonha/liberty/manifest 1970-01-01 00:00:00 +0000 |
842 | +++ specs/object_storage/swift_proxy/simple_nonha/liberty/manifest 2016-08-08 18:06:59 +0000 |
843 | @@ -0,0 +1,22 @@ |
844 | +# Collect the charm branches from Launchpad |
845 | +collect config=collect-swift-proxy |
846 | + |
847 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
848 | +deploy config=swift-proxy.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
849 | + |
850 | +# Check juju statuses are green and that hooks have finished |
851 | +verify config=check_juju.py |
852 | + |
853 | +# Setup glance images |
854 | +script config=image_setup.py |
855 | + |
856 | +# Setup keystone users |
857 | +script config=keystone_setup.py |
858 | + |
859 | +# Check ring data is consistent accross proxies |
860 | +verify config=swift_ring_status.py |
861 | + |
862 | +# Test obj store by sending and recieving files |
863 | +verify config=test_obj_store.py |
864 | + |
865 | +# Success |
866 | |
867 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/swift-proxy.yaml' |
868 | === target is u'../../../../../helper/bundles/swift-proxy.yaml' |
869 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/swift_ring_status.py' |
870 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
871 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/test_obj_store.py' |
872 | === target is u'../../../../../helper/tests/test_obj_store.py' |
873 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/liberty/utils' |
874 | === target is u'../../../../../helper/utils' |
875 | === added directory 'specs/object_storage/swift_proxy/simple_nonha/mitaka' |
876 | === added file 'specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt' |
877 | --- specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 |
878 | +++ specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt 2016-08-08 18:06:59 +0000 |
879 | @@ -0,0 +1,2 @@ |
880 | +This spec deploys a swift cluster fronted by a single swift proxy. The |
881 | +resulting object store is then tested. |
882 | |
883 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/check_juju.py' |
884 | === target is u'../../../../../helper/tests/check_juju.py' |
885 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/collect-swift-proxy' |
886 | === target is u'../../../../../helper/collect/collect-swift-proxy' |
887 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/image_setup.py' |
888 | === target is u'../../../../../helper/setup/image_setup.py' |
889 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/images.yaml' |
890 | === target is u'../../../../../helper/setup/images.yaml' |
891 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/keystone_setup.py' |
892 | === target is u'../../../../../helper/setup/keystone_setup.py' |
893 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/keystone_users.yaml' |
894 | === target is u'../../../../../helper/setup/keystone_users.yaml' |
895 | === added file 'specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest' |
896 | --- specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest 1970-01-01 00:00:00 +0000 |
897 | +++ specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest 2016-08-08 18:06:59 +0000 |
898 | @@ -0,0 +1,22 @@ |
899 | +# Collect the charm branches from Launchpad |
900 | +collect config=collect-swift-proxy |
901 | + |
902 | +# Use juju deployer with cephradosgw-ha.yaml bundle |
903 | +deploy config=swift-proxy.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka |
904 | + |
905 | +# Check juju statuses are green and that hooks have finished |
906 | +verify config=check_juju.py |
907 | + |
908 | +# Setup glance images |
909 | +script config=image_setup.py |
910 | + |
911 | +# Setup keystone users |
912 | +script config=keystone_setup.py |
913 | + |
914 | +# Check ring data is consistent accross proxies |
915 | +verify config=swift_ring_status.py |
916 | + |
917 | +# Test obj store by sending and recieving files |
918 | +verify config=test_obj_store.py |
919 | + |
920 | +# Success |
921 | |
922 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/swift-proxy.yaml' |
923 | === target is u'../../../../../helper/bundles/swift-proxy.yaml' |
924 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/swift_ring_status.py' |
925 | === target is u'../../../../../helper/tests/swift_ring_status.py' |
926 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/test_obj_store.py' |
927 | === target is u'../../../../../helper/tests/test_obj_store.py' |
928 | === added symlink 'specs/object_storage/swift_proxy/simple_nonha/mitaka/utils' |
929 | === target is u'../../../../../helper/utils' |
Please see inline comment re: series.
Also, some minor lint to clean up:
checking helper/ setup/delete_ crm_leader. py setup/delete_ crm_leader. py:19:5: E101 indentation contains mixed spaces and tabs setup/delete_ crm_leader. py:19:5: W191 indentation contains tabs
helper/
helper/