Merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

Proposed by Chris MacNaughton on 2017-09-21
Status: Merged
Approved by: Ryan Beisner on 2017-09-25
Approved revision: 341
Merged at revision: 336
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade
Merge into: lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
Diff against target: 710 lines (+454/-14)
21 files modified
helper/bundles/ceph-charm-migration.yaml (+92/-0)
helper/bundles/charm-ceph.yaml (+88/-0)
helper/collect/collect-ceph-default (+3/-2)
helper/setup/delete_application.py (+21/-0)
helper/tests/test_ceph_store.py (+29/-12)
helper/utils/kiki.py (+12/-0)
helper/utils/mojo_utils.py (+6/-0)
specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/icehouse/manifest (+25/-0)
specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/kilo/manifest (+25/-0)
specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/liberty/manifest (+25/-0)
specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/mitaka/manifest (+25/-0)
specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/newton/manifest (+25/-0)
specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/ocata/manifest (+25/-0)
specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt (+4/-0)
specs/storage/ceph/charm_migration/pike/manifest (+25/-0)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade
Reviewer Review Type Date Requested Status
Ryan Beisner 2017-09-21 Needs Fixing on 2017-09-25
Review via email: mp+331146@code.launchpad.net
To post a comment you must log in.
336. By Chris MacNaughton on 2017-09-21

spec info updates and lint fixes

337. By Chris MacNaughton on 2017-09-21

syntax check for the test

338. By Chris MacNaughton on 2017-09-21

migrate ceph charms to charmstore

At the end of this spec, we have ceph-mon + ceph-osd :

Model Controller Cloud/Region Version SLA
icey icey-serverstack serverstack/serverstack 2.2.2 unsupported

App Version Status Scale Charm Store Rev OS Notes
ceph-mon 10.2.7 active 3 ceph-mon local 0 ubuntu
ceph-osd 10.2.7 active 6 ceph-osd local 15 ubuntu
ntp 4.2.8p4+dfsg active 6 ntp local 0 ubuntu

Unit Workload Agent Machine Public address Ports Message
ceph-mon/0* active idle 6 10.5.0.22 Unit is ready and clustered
ceph-mon/1 active idle 7 10.5.0.6 Unit is ready and clustered
ceph-mon/2 active idle 8 10.5.0.24 Unit is ready and clustered
ceph-osd/0* active idle 0 10.5.0.10 Unit is ready (1 OSD)
  ntp/1 active idle 10.5.0.10 123/udp Unit is ready
ceph-osd/1 active idle 1 10.5.0.9 Unit is ready (1 OSD)
  ntp/0* active executing 10.5.0.9 123/udp (update-status) Unit is ready
ceph-osd/2 active idle 2 10.5.0.28 Unit is ready (1 OSD)
  ntp/2 active idle 10.5.0.28 123/udp Unit is ready
ceph-osd/3 active idle 9 10.5.0.46 Unit is ready (1 OSD)
  ntp/3 active idle 10.5.0.46 123/udp Unit is ready
ceph-osd/4 active idle 10 10.5.0.49 Unit is ready (1 OSD)
  ntp/4 active idle 10.5.0.49 123/udp Unit is ready
ceph-osd/5 active idle 11 10.5.0.11 Unit is ready (1 OSD)
  ntp/5 active idle 10.5.0.11 123/udp Unit is ready

Machine State DNS Inst id Series AZ Message
0 started 10.5.0.10 050027ef-ba50-4974-90c5-eeeed901f742 xenial nova ACTIVE
1 started 10.5.0.9 2c86fed0-43ce-45ab-8fb7-c422a3453927 xenial nova ACTIVE
2 started 10.5.0.28 efd90b75-f39a-4a09-9a9b-5f5b4842413e xenial nova ACTIVE
6 started 10.5.0.22 085b71e1-fbd0-4b57-b199-acf1c12e095f xenial nova ACTIVE
7 started 10.5.0.6 e0769d30-0b85-4dd0-bf51-c09a5cd25b2b xenial nova ACTIVE
8 started 10.5.0.24 4ed91ac1-3e93-4a65-9bed-287f5208ea32 xenial nova ACTIVE
9 started 10.5.0.46 aa1d3f9d-25bf-46a1-92be-25720371ab59 xenial nova ACTIVE
10 started 10.5.0.49 17aaa991-cc1b-4040-8fd7-0bea88e3843d xenial nova ACTIVE
11 started 10.5.0.11 00d80a51-1c56-4d98-baf1-fe2a771164ff xenial nova ACTIVE

Relation provider Requirer Interface Type
ceph-mon:mon ceph-mon:mon ceph peer
ceph-mon:osd ceph-osd:mon ceph-osd regular
ceph-osd:juju-info ntp:juju-info juju-info subordinate
ntp:ntp-peers ntp:ntp-peers ntp peer

Some output from the mojo run: https://pastebin.ubuntu.com/25615994/

Ryan Beisner (1chb1n) wrote :

helper/setup/delete_application.py:19:1: E305 expected 2 blank lines after class or function definition, found 1

review: Needs Fixing
339. By Chris MacNaughton on 2017-09-25

style fix

Ryan Beisner (1chb1n) wrote :

Let's make some changes in naming for clarity. This is not a ceph upgrade. It is a charm migration.

So, instead of "specs/storage/ceph/upgrade" perhaps:

specs/storage/ceph/charm-migrate

Also update bundle names and other assets to suit. Thank you.

review: Needs Fixing
340. By Chris MacNaughton on 2017-09-25

rename from upgrade to migration

341. By Chris MacNaughton on 2017-09-25

replace hyphen with underscore

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'helper/bundles/ceph-charm-migration.yaml'
2--- helper/bundles/ceph-charm-migration.yaml 1970-01-01 00:00:00 +0000
3+++ helper/bundles/ceph-charm-migration.yaml 2017-09-25 19:22:27 +0000
4@@ -0,0 +1,92 @@
5+# This bundle is intended to closely resemble the ceph-base bundle from openstack-bundles.
6+base:
7+ relations:
8+ - - ceph-osd:mon
9+ - ceph-mon:osd
10+ - - ceph:bootstrap-source
11+ - ceph-mon:bootstrap-source
12+ services:
13+ ceph:
14+ annotations:
15+ gui-x: '750'
16+ gui-y: '500'
17+ charm: ceph
18+ num_units: 3
19+ options:
20+ ephemeral-unmount: /mnt
21+ osd-devices: /dev/vdb /dev/sdb /dev/xvdb
22+ osd-reformat: 'no'
23+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
24+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
25+ ceph-mon:
26+ annotations:
27+ gui-x: '750'
28+ gui-y: '500'
29+ charm: ceph-mon
30+ num_units: 3
31+ options:
32+ expected-osd-count: 6
33+ no-bootstrap: True
34+ ceph-osd:
35+ annotations:
36+ gui-x: '1000'
37+ gui-y: '500'
38+ charm: ceph-osd
39+ num_units: 6
40+ options:
41+ ephemeral-unmount: /mnt
42+ osd-devices: /dev/vdb /dev/sdb /dev/xvdb
43+ osd-reformat: 'no'
44+ to: ceph
45+# icehouse
46+trusty-icehouse:
47+ inherits: base
48+ series: trusty
49+# kilo
50+trusty-kilo:
51+ inherits: base
52+ series: trusty
53+ overrides:
54+ source: cloud:trusty-kilo
55+# liberty
56+trusty-liberty:
57+ inherits: base
58+ series: trusty
59+ overrides:
60+ source: cloud:trusty-liberty
61+# mitaka
62+trusty-mitaka:
63+ inherits: base
64+ series: trusty
65+ overrides:
66+ source: cloud:trusty-mitaka
67+xenial-mitaka:
68+ inherits: base
69+ series: xenial
70+# newton
71+xenial-newton:
72+ inherits: base
73+ series: xenial
74+ overrides:
75+ source: cloud:xenial-newton
76+yakkety-newton:
77+ inherits: base
78+ series: yakkety
79+# ocata
80+xenial-ocata:
81+ inherits: base
82+ series: xenial
83+ overrides:
84+ source: cloud:xenial-ocata
85+zesty-ocata:
86+ inherits: base
87+ series: zesty
88+# pike
89+xenial-pike:
90+ inherits: base
91+ series: xenial
92+ overrides:
93+ source: cloud:xenial-pike
94+artful-pike:
95+ inherits: base
96+ series: artful
97
98=== added file 'helper/bundles/charm-ceph.yaml'
99--- helper/bundles/charm-ceph.yaml 1970-01-01 00:00:00 +0000
100+++ helper/bundles/charm-ceph.yaml 2017-09-25 19:22:27 +0000
101@@ -0,0 +1,88 @@
102+# This bundle is intended to closely resemble the ceph-base bundle from openstack-bundles.
103+base:
104+ relations:
105+ - - ceph-osd:mon
106+ - ceph:osd
107+ - - ntp:juju-info
108+ - ceph-osd:juju-info
109+ services:
110+ ceph:
111+ annotations:
112+ gui-x: '750'
113+ gui-y: '500'
114+ charm: ceph
115+ num_units: 3
116+ options:
117+ ephemeral-unmount: /mnt
118+ osd-devices: /dev/vdb /dev/sdb /dev/xvdb
119+ osd-reformat: 'yes'
120+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
121+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
122+ ceph-osd:
123+ annotations:
124+ gui-x: '1000'
125+ gui-y: '500'
126+ charm: ceph-osd
127+ num_units: 3
128+ options:
129+ ephemeral-unmount: /mnt
130+ osd-devices: /dev/vdb /dev/sdb /dev/xvdb
131+ osd-reformat: 'yes'
132+ ntp:
133+ annotations:
134+ gui-x: '1000'
135+ gui-y: '0'
136+ charm: ntp
137+ num_units: 0
138+# icehouse
139+trusty-icehouse:
140+ inherits: base
141+ series: trusty
142+# kilo
143+trusty-kilo:
144+ inherits: base
145+ series: trusty
146+ overrides:
147+ source: cloud:trusty-kilo
148+# liberty
149+trusty-liberty:
150+ inherits: base
151+ series: trusty
152+ overrides:
153+ source: cloud:trusty-liberty
154+# mitaka
155+trusty-mitaka:
156+ inherits: base
157+ series: trusty
158+ overrides:
159+ source: cloud:trusty-mitaka
160+xenial-mitaka:
161+ inherits: base
162+ series: xenial
163+# newton
164+xenial-newton:
165+ inherits: base
166+ series: xenial
167+ overrides:
168+ source: cloud:xenial-newton
169+yakkety-newton:
170+ inherits: base
171+ series: yakkety
172+# ocata
173+xenial-ocata:
174+ inherits: base
175+ series: xenial
176+ overrides:
177+ source: cloud:xenial-ocata
178+zesty-ocata:
179+ inherits: base
180+ series: zesty
181+# pike
182+xenial-pike:
183+ inherits: base
184+ series: xenial
185+ overrides:
186+ source: cloud:xenial-pike
187+artful-pike:
188+ inherits: base
189+ series: artful
190
191=== modified file 'helper/collect/collect-ceph-default'
192--- helper/collect/collect-ceph-default 2017-09-06 17:15:11 +0000
193+++ helper/collect/collect-ceph-default 2017-09-25 19:22:27 +0000
194@@ -1,3 +1,4 @@
195-ceph-mon git://github.com/openstack/charm-ceph-mon
196-ceph-osd git://github.com/openstack/charm-ceph-osd
197+ceph cs:~openstack-charmers-next/ceph
198+ceph-mon cs:~openstack-charmers-next/ceph-mon
199+ceph-osd cs:~openstack-charmers-next/ceph-osd
200 ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
201
202=== added file 'helper/setup/delete_application.py'
203--- helper/setup/delete_application.py 1970-01-01 00:00:00 +0000
204+++ helper/setup/delete_application.py 2017-09-25 19:22:27 +0000
205@@ -0,0 +1,21 @@
206+#!/usr/bin/env python
207+import sys
208+import utils.mojo_utils as mojo_utils
209+import logging
210+import argparse
211+
212+
213+def main(argv):
214+ logging.basicConfig(level=logging.INFO)
215+ parser = argparse.ArgumentParser()
216+ parser.add_argument("application", nargs="*")
217+ options = parser.parse_args()
218+ unit_args = mojo_utils.parse_mojo_arg(
219+ options,
220+ 'application', multiargs=True)
221+ for application in unit_args:
222+ mojo_utils.delete_application(application)
223+
224+
225+if __name__ == "__main__":
226+ sys.exit(main(sys.argv))
227
228=== modified file 'helper/tests/test_ceph_store.py'
229--- helper/tests/test_ceph_store.py 2017-09-06 05:54:23 +0000
230+++ helper/tests/test_ceph_store.py 2017-09-25 19:22:27 +0000
231@@ -3,23 +3,40 @@
232 import sys
233
234 import utils.mojo_utils as mojo_utils
235+import argparse
236
237
238 def main(argv):
239- mojo_utils.remote_run(
240- 'ceph-mon/0', 'ceph osd pool create rbd 128')
241- # Check
242- mojo_utils.remote_run('ceph-mon/0', 'echo 123456789 > /tmp/input.txt')
243- mojo_utils.remote_run(
244- 'ceph-mon/0', 'rados put -p rbd test_input /tmp/input.txt')
245-
246- # Check
247- mojo_utils.remote_run(
248- 'ceph-mon/1', 'rados get -p rbd test_input /tmp/input.txt')
249- output = mojo_utils.remote_run('ceph-mon/1', 'cat /tmp/input.txt')
250+ parser = argparse.ArgumentParser()
251+ parser.add_argument("application", default="ceph-mon", nargs="*")
252+ parser.add_argument("units", default=[0, 1], nargs="*")
253+ options = parser.parse_args()
254+ application = mojo_utils.parse_mojo_arg(options,
255+ 'application', multiargs=False)
256+ units = mojo_utils.parse_mojo_arg(options, 'units', multiargs=True)
257+
258+ mojo_utils.remote_run(
259+ '{}/{}'.format(application, units[0]), 'ceph osd pool create rbd 128')
260+ # Check
261+ mojo_utils.remote_run(
262+ '{}/{}'.format(application, units[0]),
263+ 'echo 123456789 > /tmp/input.txt')
264+ mojo_utils.remote_run(
265+ '{}/{}'.format(application, units[0]),
266+ 'rados put -p rbd test_input /tmp/input.txt')
267+
268+ # Check
269+ mojo_utils.remote_run(
270+ '{}/{}'.format(application, units[-1]),
271+ 'rados get -p rbd test_input /tmp/input.txt')
272+ output = mojo_utils.remote_run(
273+ '{}/{}'.format(application, units[-1]),
274+ 'cat /tmp/input.txt')
275
276 # Cleanup
277- mojo_utils.remote_run('ceph-mon/2', 'rados rm -p rbd test_input')
278+ mojo_utils.remote_run(
279+ '{}/{}'.format(application, units[-1]),
280+ 'rados rm -p rbd test_input')
281 if output[0].strip() != "123456789":
282 sys.exit(1)
283
284
285=== modified file 'helper/utils/kiki.py'
286--- helper/utils/kiki.py 2017-09-05 22:27:05 +0000
287+++ helper/utils/kiki.py 2017-09-25 19:22:27 +0000
288@@ -251,6 +251,18 @@
289
290
291 @cached
292+def remove_application():
293+ """Translate argument for remove-unit
294+
295+ @returns string Juju argument for remove-unit
296+ """
297+ if min_version('2.1'):
298+ return "remove-application"
299+ else:
300+ return "remove-service"
301+
302+
303+@cached
304 def juju_state():
305 """Translate identifier for juju-state
306
307
308=== modified file 'helper/utils/mojo_utils.py'
309--- helper/utils/mojo_utils.py 2017-09-25 18:51:44 +0000
310+++ helper/utils/mojo_utils.py 2017-09-25 19:22:27 +0000
311@@ -181,6 +181,12 @@
312 delete_unit_provider(unit)
313
314
315+def delete_application(application, wait=True):
316+ logging.info('Removing application ' + application)
317+ cmd = [kiki.cmd(), kiki.remove_application(), application]
318+ subprocess.check_call(cmd)
319+
320+
321 def delete_oldest(service, method='juju'):
322 units = unit_sorted(get_juju_units(service=service))
323 delete_unit(units[0], method='juju')
324
325=== added directory 'specs/storage/ceph/charm_migration'
326=== added directory 'specs/storage/ceph/charm_migration/icehouse'
327=== added file 'specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt'
328--- specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
329+++ specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
330@@ -0,0 +1,4 @@
331+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
332+Rados can write to and read from the cluster. It deploys ceph-mon in addition
333+to ceph, and then tears down ceph to verify that the cluster upgrade
334+works.
335\ No newline at end of file
336
337=== added symlink 'specs/storage/ceph/charm_migration/icehouse/ceph-charm-migration.yaml'
338=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
339=== added symlink 'specs/storage/ceph/charm_migration/icehouse/charm-ceph.yaml'
340=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
341=== added symlink 'specs/storage/ceph/charm_migration/icehouse/check_juju.py'
342=== target is u'../../../../../helper/tests/check_juju.py'
343=== added symlink 'specs/storage/ceph/charm_migration/icehouse/collect-ceph-default'
344=== target is u'../../../../../helper/collect/collect-ceph-default'
345=== added symlink 'specs/storage/ceph/charm_migration/icehouse/delete_application.py'
346=== target is u'../../../../../helper/setup/delete_application.py'
347=== added file 'specs/storage/ceph/charm_migration/icehouse/manifest'
348--- specs/storage/ceph/charm_migration/icehouse/manifest 1970-01-01 00:00:00 +0000
349+++ specs/storage/ceph/charm_migration/icehouse/manifest 2017-09-25 19:22:27 +0000
350@@ -0,0 +1,25 @@
351+# Collect the charm branches from Launchpad
352+collect config=collect-ceph-default
353+
354+# Use juju deployer with charm-ceph.yaml bundle
355+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
356+
357+# Check juju statuses are green and that hooks have finished
358+verify config=check_juju.py
359+
360+# Test obj store by sending and recieving files
361+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
362+
363+# Use juju deployer with ceph-charm-migration.yaml bundle
364+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
365+
366+# Check juju statuses are green and that hooks have finished
367+verify config=check_juju.py
368+
369+# Remove charm-ceph from the deployment
370+verify config=delete_application.py APPLICATION=ceph
371+
372+# Test obj store by sending and recieving files
373+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
374+
375+# Success
376
377=== added symlink 'specs/storage/ceph/charm_migration/icehouse/test_ceph_store.py'
378=== target is u'../../../../../helper/tests/test_ceph_store.py'
379=== added symlink 'specs/storage/ceph/charm_migration/icehouse/utils'
380=== target is u'../../../../../helper/utils'
381=== added directory 'specs/storage/ceph/charm_migration/kilo'
382=== added file 'specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt'
383--- specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
384+++ specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
385@@ -0,0 +1,4 @@
386+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
387+Rados can write to and read from the cluster. It deploys ceph-mon in addition
388+to ceph, and then tears down ceph to verify that the cluster upgrade
389+works.
390\ No newline at end of file
391
392=== added symlink 'specs/storage/ceph/charm_migration/kilo/ceph-charm-migration.yaml'
393=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
394=== added symlink 'specs/storage/ceph/charm_migration/kilo/charm-ceph.yaml'
395=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
396=== added symlink 'specs/storage/ceph/charm_migration/kilo/check_juju.py'
397=== target is u'../../../../../helper/tests/check_juju.py'
398=== added symlink 'specs/storage/ceph/charm_migration/kilo/collect-ceph-default'
399=== target is u'../../../../../helper/collect/collect-ceph-default'
400=== added symlink 'specs/storage/ceph/charm_migration/kilo/delete_application.py'
401=== target is u'../../../../../helper/setup/delete_application.py'
402=== added file 'specs/storage/ceph/charm_migration/kilo/manifest'
403--- specs/storage/ceph/charm_migration/kilo/manifest 1970-01-01 00:00:00 +0000
404+++ specs/storage/ceph/charm_migration/kilo/manifest 2017-09-25 19:22:27 +0000
405@@ -0,0 +1,25 @@
406+# Collect the charm branches from Launchpad
407+collect config=collect-ceph-default
408+
409+# Use juju deployer with charm-ceph.yaml bundle
410+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
411+
412+# Check juju statuses are green and that hooks have finished
413+verify config=check_juju.py
414+
415+# Test obj store by sending and recieving files
416+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
417+
418+# Use juju deployer with ceph-charm-migration.yaml bundle
419+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
420+
421+# Check juju statuses are green and that hooks have finished
422+verify config=check_juju.py
423+
424+# Remove charm-ceph from the deployment
425+verify config=delete_application.py APPLICATION=ceph
426+
427+# Test obj store by sending and recieving files
428+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
429+
430+# Success
431
432=== added symlink 'specs/storage/ceph/charm_migration/kilo/test_ceph_store.py'
433=== target is u'../../../../../helper/tests/test_ceph_store.py'
434=== added symlink 'specs/storage/ceph/charm_migration/kilo/utils'
435=== target is u'../../../../../helper/utils'
436=== added directory 'specs/storage/ceph/charm_migration/liberty'
437=== added file 'specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt'
438--- specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
439+++ specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
440@@ -0,0 +1,4 @@
441+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
442+Rados can write to and read from the cluster. It deploys ceph-mon in addition
443+to ceph, and then tears down ceph to verify that the cluster upgrade
444+works.
445\ No newline at end of file
446
447=== added symlink 'specs/storage/ceph/charm_migration/liberty/ceph-charm-migration.yaml'
448=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
449=== added symlink 'specs/storage/ceph/charm_migration/liberty/charm-ceph.yaml'
450=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
451=== added symlink 'specs/storage/ceph/charm_migration/liberty/check_juju.py'
452=== target is u'../../../../../helper/tests/check_juju.py'
453=== added symlink 'specs/storage/ceph/charm_migration/liberty/collect-ceph-default'
454=== target is u'../../../../../helper/collect/collect-ceph-default'
455=== added symlink 'specs/storage/ceph/charm_migration/liberty/delete_application.py'
456=== target is u'../../../../../helper/setup/delete_application.py'
457=== added file 'specs/storage/ceph/charm_migration/liberty/manifest'
458--- specs/storage/ceph/charm_migration/liberty/manifest 1970-01-01 00:00:00 +0000
459+++ specs/storage/ceph/charm_migration/liberty/manifest 2017-09-25 19:22:27 +0000
460@@ -0,0 +1,25 @@
461+# Collect the charm branches from Launchpad
462+collect config=collect-ceph-default
463+
464+# Use juju deployer with charm-ceph.yaml bundle
465+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
466+
467+# Check juju statuses are green and that hooks have finished
468+verify config=check_juju.py
469+
470+# Test obj store by sending and recieving files
471+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
472+
473+# Use juju deployer with ceph-charm-migration.yaml bundle
474+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
475+
476+# Check juju statuses are green and that hooks have finished
477+verify config=check_juju.py
478+
479+# Remove charm-ceph from the deployment
480+verify config=delete_application.py APPLICATION=ceph
481+
482+# Test obj store by sending and recieving files
483+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
484+
485+# Success
486
487=== added symlink 'specs/storage/ceph/charm_migration/liberty/test_ceph_store.py'
488=== target is u'../../../../../helper/tests/test_ceph_store.py'
489=== added symlink 'specs/storage/ceph/charm_migration/liberty/utils'
490=== target is u'../../../../../helper/utils'
491=== added directory 'specs/storage/ceph/charm_migration/mitaka'
492=== added file 'specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt'
493--- specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
494+++ specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
495@@ -0,0 +1,4 @@
496+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
497+Rados can write to and read from the cluster. It deploys ceph-mon in addition
498+to ceph, and then tears down ceph to verify that the cluster upgrade
499+works.
500\ No newline at end of file
501
502=== added symlink 'specs/storage/ceph/charm_migration/mitaka/ceph-charm-migration.yaml'
503=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
504=== added symlink 'specs/storage/ceph/charm_migration/mitaka/charm-ceph.yaml'
505=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
506=== added symlink 'specs/storage/ceph/charm_migration/mitaka/check_juju.py'
507=== target is u'../../../../../helper/tests/check_juju.py'
508=== added symlink 'specs/storage/ceph/charm_migration/mitaka/collect-ceph-default'
509=== target is u'../../../../../helper/collect/collect-ceph-default'
510=== added symlink 'specs/storage/ceph/charm_migration/mitaka/delete_application.py'
511=== target is u'../../../../../helper/setup/delete_application.py'
512=== added file 'specs/storage/ceph/charm_migration/mitaka/manifest'
513--- specs/storage/ceph/charm_migration/mitaka/manifest 1970-01-01 00:00:00 +0000
514+++ specs/storage/ceph/charm_migration/mitaka/manifest 2017-09-25 19:22:27 +0000
515@@ -0,0 +1,25 @@
516+# Collect the charm branches from Launchpad
517+collect config=collect-ceph-default
518+
519+# Use juju deployer with charm-ceph.yaml bundle
520+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
521+
522+# Check juju statuses are green and that hooks have finished
523+verify config=check_juju.py
524+
525+# Test obj store by sending and recieving files
526+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
527+
528+# Use juju deployer with ceph-charm-migration.yaml bundle
529+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
530+
531+# Check juju statuses are green and that hooks have finished
532+verify config=check_juju.py
533+
534+# Remove charm-ceph from the deployment
535+verify config=delete_application.py APPLICATION=ceph
536+
537+# Test obj store by sending and recieving files
538+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
539+
540+# Success
541
542=== added symlink 'specs/storage/ceph/charm_migration/mitaka/test_ceph_store.py'
543=== target is u'../../../../../helper/tests/test_ceph_store.py'
544=== added symlink 'specs/storage/ceph/charm_migration/mitaka/utils'
545=== target is u'../../../../../helper/utils'
546=== added directory 'specs/storage/ceph/charm_migration/newton'
547=== added file 'specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt'
548--- specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
549+++ specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
550@@ -0,0 +1,4 @@
551+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
552+Rados can write to and read from the cluster. It deploys ceph-mon in addition
553+to ceph, and then tears down ceph to verify that the cluster upgrade
554+works.
555\ No newline at end of file
556
557=== added symlink 'specs/storage/ceph/charm_migration/newton/ceph-charm-migration.yaml'
558=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
559=== added symlink 'specs/storage/ceph/charm_migration/newton/charm-ceph.yaml'
560=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
561=== added symlink 'specs/storage/ceph/charm_migration/newton/check_juju.py'
562=== target is u'../../../../../helper/tests/check_juju.py'
563=== added symlink 'specs/storage/ceph/charm_migration/newton/collect-ceph-default'
564=== target is u'../../../../../helper/collect/collect-ceph-default'
565=== added symlink 'specs/storage/ceph/charm_migration/newton/delete_application.py'
566=== target is u'../../../../../helper/setup/delete_application.py'
567=== added file 'specs/storage/ceph/charm_migration/newton/manifest'
568--- specs/storage/ceph/charm_migration/newton/manifest 1970-01-01 00:00:00 +0000
569+++ specs/storage/ceph/charm_migration/newton/manifest 2017-09-25 19:22:27 +0000
570@@ -0,0 +1,25 @@
571+# Collect the charm branches from Launchpad
572+collect config=collect-ceph-default
573+
574+# Use juju deployer with charm-ceph.yaml bundle
575+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
576+
577+# Check juju statuses are green and that hooks have finished
578+verify config=check_juju.py
579+
580+# Test obj store by sending and recieving files
581+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
582+
583+# Use juju deployer with ceph-charm-migration.yaml bundle
584+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
585+
586+# Check juju statuses are green and that hooks have finished
587+verify config=check_juju.py
588+
589+# Remove charm-ceph from the deployment
590+verify config=delete_application.py APPLICATION=ceph
591+
592+# Test obj store by sending and recieving files
593+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
594+
595+# Success
596
597=== added symlink 'specs/storage/ceph/charm_migration/newton/test_ceph_store.py'
598=== target is u'../../../../../helper/tests/test_ceph_store.py'
599=== added symlink 'specs/storage/ceph/charm_migration/newton/utils'
600=== target is u'../../../../../helper/utils'
601=== added directory 'specs/storage/ceph/charm_migration/ocata'
602=== added file 'specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt'
603--- specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
604+++ specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
605@@ -0,0 +1,4 @@
606+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
607+Rados can write to and read from the cluster. It deploys ceph-mon in addition
608+to ceph, and then tears down ceph to verify that the cluster upgrade
609+works.
610\ No newline at end of file
611
612=== added symlink 'specs/storage/ceph/charm_migration/ocata/ceph-charm-migration.yaml'
613=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
614=== added symlink 'specs/storage/ceph/charm_migration/ocata/charm-ceph.yaml'
615=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
616=== added symlink 'specs/storage/ceph/charm_migration/ocata/check_juju.py'
617=== target is u'../../../../../helper/tests/check_juju.py'
618=== added symlink 'specs/storage/ceph/charm_migration/ocata/collect-ceph-default'
619=== target is u'../../../../../helper/collect/collect-ceph-default'
620=== added symlink 'specs/storage/ceph/charm_migration/ocata/delete_application.py'
621=== target is u'../../../../../helper/setup/delete_application.py'
622=== added file 'specs/storage/ceph/charm_migration/ocata/manifest'
623--- specs/storage/ceph/charm_migration/ocata/manifest 1970-01-01 00:00:00 +0000
624+++ specs/storage/ceph/charm_migration/ocata/manifest 2017-09-25 19:22:27 +0000
625@@ -0,0 +1,25 @@
626+# Collect the charm branches from Launchpad
627+collect config=collect-ceph-default
628+
629+# Use juju deployer with charm-ceph.yaml bundle
630+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
631+
632+# Check juju statuses are green and that hooks have finished
633+verify config=check_juju.py
634+
635+# Test obj store by sending and recieving files
636+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
637+
638+# Use juju deployer with ceph-charm-migration.yaml bundle
639+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
640+
641+# Check juju statuses are green and that hooks have finished
642+verify config=check_juju.py
643+
644+# Remove charm-ceph from the deployment
645+verify config=delete_application.py APPLICATION=ceph
646+
647+# Test obj store by sending and recieving files
648+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
649+
650+# Success
651
652=== added symlink 'specs/storage/ceph/charm_migration/ocata/test_ceph_store.py'
653=== target is u'../../../../../helper/tests/test_ceph_store.py'
654=== added symlink 'specs/storage/ceph/charm_migration/ocata/utils'
655=== target is u'../../../../../helper/utils'
656=== added directory 'specs/storage/ceph/charm_migration/pike'
657=== added file 'specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt'
658--- specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
659+++ specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt 2017-09-25 19:22:27 +0000
660@@ -0,0 +1,4 @@
661+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
662+Rados can write to and read from the cluster. It deploys ceph-mon in addition
663+to ceph, and then tears down ceph to verify that the cluster upgrade
664+works.
665\ No newline at end of file
666
667=== added symlink 'specs/storage/ceph/charm_migration/pike/ceph-charm-migration.yaml'
668=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
669=== added symlink 'specs/storage/ceph/charm_migration/pike/charm-ceph.yaml'
670=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
671=== added symlink 'specs/storage/ceph/charm_migration/pike/check_juju.py'
672=== target is u'../../../../../helper/tests/check_juju.py'
673=== added symlink 'specs/storage/ceph/charm_migration/pike/collect-ceph-default'
674=== target is u'../../../../../helper/collect/collect-ceph-default'
675=== added symlink 'specs/storage/ceph/charm_migration/pike/delete_application.py'
676=== target is u'../../../../../helper/setup/delete_application.py'
677=== added file 'specs/storage/ceph/charm_migration/pike/manifest'
678--- specs/storage/ceph/charm_migration/pike/manifest 1970-01-01 00:00:00 +0000
679+++ specs/storage/ceph/charm_migration/pike/manifest 2017-09-25 19:22:27 +0000
680@@ -0,0 +1,25 @@
681+# Collect the charm branches from Launchpad
682+collect config=collect-ceph-default
683+
684+# Use juju deployer with charm-ceph.yaml bundle
685+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
686+
687+# Check juju statuses are green and that hooks have finished
688+verify config=check_juju.py
689+
690+# Test obj store by sending and recieving files
691+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
692+
693+# Use juju deployer with ceph-charm-migration.yaml bundle
694+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
695+
696+# Check juju statuses are green and that hooks have finished
697+verify config=check_juju.py
698+
699+# Remove charm-ceph from the deployment
700+verify config=delete_application.py APPLICATION=ceph
701+
702+# Test obj store by sending and recieving files
703+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
704+
705+# Success
706
707=== added symlink 'specs/storage/ceph/charm_migration/pike/test_ceph_store.py'
708=== target is u'../../../../../helper/tests/test_ceph_store.py'
709=== added symlink 'specs/storage/ceph/charm_migration/pike/utils'
710=== target is u'../../../../../helper/utils'

Subscribers

People subscribed via source and target branches