Merge lp:~chris.macnaughton/openstack-mojo-specs/update-ceph-test into lp:openstack-mojo-specs

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 311
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/update-ceph-test
Merge into: lp:openstack-mojo-specs
Diff against target: 77 lines (+16/-7)
3 files modified
helper/bundles/ceph-charm-migration.yaml (+11/-1)
helper/tests/test_ceph_store.py (+2/-6)
specs/storage/ceph/charm_migration/pike/manifest (+3/-0)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/update-ceph-test
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+332421@code.launchpad.net

Description of the change

The bundles are updated to deploy the architecture we intend, with monitors going into containers on the existing machines, and ceph-osd going onto the metal on those machines. This change also adds a check to ensure the juju deployment is healthy before finishing tests

To post a comment you must log in.
309. By Chris MacNaughton

clean up specs, update bundle, fail when ceph charm removal fails

310. By Chris MacNaughton

do not use lxd placement yet as it seems broken still

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Approved, merging. Fixing two trivial items in-flight:

* One bit of lint. Please be sure to run `make lint` with spec mods.
  helper/tests/test_ceph_store.py:8:1: E302 expected 2 blank lines, found 1

* Removed the commented placement lines from the ceph migration bundle.

http://10.245.162.49:8080/view/MojoMatrix/job/mojo_runner/1816/

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/ceph-charm-migration.yaml'
2--- helper/bundles/ceph-charm-migration.yaml 2017-09-25 19:22:01 +0000
3+++ helper/bundles/ceph-charm-migration.yaml 2017-11-03 13:56:59 +0000
4@@ -27,6 +27,10 @@
5 options:
6 expected-osd-count: 6
7 no-bootstrap: True
8+ # to:
9+ # - "lxc:ceph=0"
10+ # - "lxc:ceph=1"
11+ # - "lxc:ceph=2"
12 ceph-osd:
13 annotations:
14 gui-x: '1000'
15@@ -37,7 +41,13 @@
16 ephemeral-unmount: /mnt
17 osd-devices: /dev/vdb /dev/sdb /dev/xvdb
18 osd-reformat: 'no'
19- to: ceph
20+ to:
21+ - "3"
22+ - "4"
23+ - "5"
24+ - "ceph=0"
25+ - "ceph=1"
26+ - "ceph=2"
27 # icehouse
28 trusty-icehouse:
29 inherits: base
30
31=== modified file 'helper/tests/test_ceph_store.py'
32--- helper/tests/test_ceph_store.py 2017-09-21 15:16:02 +0000
33+++ helper/tests/test_ceph_store.py 2017-11-03 13:56:59 +0000
34@@ -5,7 +5,6 @@
35 import utils.mojo_utils as mojo_utils
36 import argparse
37
38-
39 def main(argv):
40 parser = argparse.ArgumentParser()
41 parser.add_argument("application", default="ceph-mon", nargs="*")
42@@ -16,7 +15,7 @@
43 units = mojo_utils.parse_mojo_arg(options, 'units', multiargs=True)
44
45 mojo_utils.remote_run(
46- '{}/{}'.format(application, units[0]), 'ceph osd pool create rbd 128')
47+ '{}/{}'.format(application, units[-1]), 'ceph osd pool create rbd 128')
48 # Check
49 mojo_utils.remote_run(
50 '{}/{}'.format(application, units[0]),
51@@ -26,12 +25,9 @@
52 'rados put -p rbd test_input /tmp/input.txt')
53
54 # Check
55- mojo_utils.remote_run(
56- '{}/{}'.format(application, units[-1]),
57- 'rados get -p rbd test_input /tmp/input.txt')
58 output = mojo_utils.remote_run(
59 '{}/{}'.format(application, units[-1]),
60- 'cat /tmp/input.txt')
61+ 'rados get -p rbd test_input /dev/stdout')
62
63 # Cleanup
64 mojo_utils.remote_run(
65
66=== modified file 'specs/storage/ceph/charm_migration/pike/manifest'
67--- specs/storage/ceph/charm_migration/pike/manifest 2017-09-25 19:16:16 +0000
68+++ specs/storage/ceph/charm_migration/pike/manifest 2017-11-03 13:56:59 +0000
69@@ -19,6 +19,9 @@
70 # Remove charm-ceph from the deployment
71 verify config=delete_application.py APPLICATION=ceph
72
73+# Check juju statuses are green and that hooks have finished
74+verify config=check_juju.py
75+
76 # Test obj store by sending and recieving files
77 verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
78

Subscribers

People subscribed via source and target branches