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

Proposed by Chris MacNaughton
Status: Merged
Approved by: Ryan Beisner
Approved revision: 341
Merged at revision: 336
Proposed branch: lp://staging/~chris.macnaughton/openstack-mojo-specs/ceph-upgrade
Merge into: lp://staging/~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://staging/~chris.macnaughton/openstack-mojo-specs/ceph-upgrade
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Fixing
Review via email: mp+331146@code.staging.launchpad.net
To post a comment you must log in.
336. By Chris MacNaughton

spec info updates and lint fixes

337. By Chris MacNaughton

syntax check for the test

338. By Chris MacNaughton

migrate ceph charms to charmstore

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

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

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

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

Revision history for this message
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

style fix

Revision history for this message
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

rename from upgrade to migration

341. By Chris MacNaughton

replace hyphen with underscore

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches