Merge lp:~chris.macnaughton/openstack-charm-testing/add-ceph-multi-az into lp:openstack-charm-testing

Proposed by Chris MacNaughton on 2016-03-17
Status: Rejected
Rejected by: Ryan Beisner on 2017-02-02
Proposed branch: lp:~chris.macnaughton/openstack-charm-testing/add-ceph-multi-az
Merge into: lp:openstack-charm-testing
Diff against target: 41 lines (+19/-4)
1 file modified
bundles/dev/storage-ceph-az.yaml (+19/-4)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-charm-testing/add-ceph-multi-az
Reviewer Review Type Date Requested Status
Ryan Beisner 2016-03-17 Disapprove on 2017-02-02
Review via email: mp+289394@code.launchpad.net

Description of the change

Updates to reduce machine use and handle metal and virtual servers

To post a comment you must log in.
187. By Chris MacNaughton on 2016-03-17

fix drives

Ryan Beisner (1chb1n) wrote :

Please rebase and update this merge proposal status when ready for review. Thank you.

review: Needs Information
Ryan Beisner (1chb1n) wrote :

The Juju openstack provider does not support placement of application units to lxc/lxd containers. A separate baremetal bundle would be necessary in order to provide that.

review: Disapprove

Unmerged revisions

187. By Chris MacNaughton on 2016-03-17

fix drives

186. By Chris MacNaughton on 2016-03-17

remove constraints

185. By Chris MacNaughton on 2016-03-17

colocate OSD and MON nodes

184. By Chris MacNaughton on 2016-03-17

update osd-devices so they will work on metal as well

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/dev/storage-ceph-az.yaml'
2--- bundles/dev/storage-ceph-az.yaml 2016-03-17 15:35:22 +0000
3+++ bundles/dev/storage-ceph-az.yaml 2016-03-17 16:56:56 +0000
4@@ -1,16 +1,31 @@
5 series: trusty
6 services:
7- "ceph-osd":
8+ "ceph-osd":
9 branch: https://review.openstack.org/openstack/charm-ceph-osd#changeref=293694/4
10 num_units: 3
11 options:
12 "ephemeral-unmount": /mnt
13- "osd-devices": /dev/vdb
14- "ceph-mon":
15+ "osd-devices": /dev/vdb /dev/sdb
16+ to:
17+ - "0"
18+ - "1"
19+ - "2"
20+ "ceph-mon":
21 branch: https://review.openstack.org/openstack/charm-ceph-mon#changeref=293982/2
22 num_units: 3
23 options:
24 "customize-failure-domain": true
25+ to:
26+ - "lxc:ceph-osd/0"
27+ - "lxc:ceph-osd/1"
28+ - "lxc:ceph-osd/2"
29 relations:
30 - - "ceph-osd:mon"
31- - "ceph-mon:osd"
32\ No newline at end of file
33+ - "ceph-mon:osd"
34+machines:
35+ "0":
36+ series: trusty
37+ "1":
38+ series: trusty
39+ "2":
40+ series: trusty
41\ No newline at end of file

Subscribers

People subscribed via source and target branches

to status/vote changes: