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

[Chris MacNaughton]

Updates to reduce machine use and handle metal and virtual servers

[lp:~chris.macnaughton/openstack-charm-testing/add-ceph-multi-az]

187. By Chris MacNaughton on 2016-03-17

fix drives

[Ryan Beisner (1chb1n)]

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

review: Needs Information

[Ryan Beisner (1chb1n)]

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

=== modified file 'bundles/dev/storage-ceph-az.yaml'
--- bundles/dev/storage-ceph-az.yaml	2016-03-17 15:35:22 +0000
+++ bundles/dev/storage-ceph-az.yaml	2016-03-17 16:56:56 +0000
@@ -1,16 +1,31 @@
 series: trusty
 services: 
-  "ceph-osd":
+  "ceph-osd": 
     branch: https://review.openstack.org/openstack/charm-ceph-osd#changeref=293694/4
     num_units: 3
     options: 
       "ephemeral-unmount": /mnt
-      "osd-devices": /dev/vdb
-  "ceph-mon":
+      "osd-devices": /dev/vdb /dev/sdb
+    to: 
+      - "0"
+      - "1"
+      - "2"
+  "ceph-mon": 
     branch: https://review.openstack.org/openstack/charm-ceph-mon#changeref=293982/2
     num_units: 3
     options: 
       "customize-failure-domain": true
+    to: 
+      - "lxc:ceph-osd/0"
+      - "lxc:ceph-osd/1"
+      - "lxc:ceph-osd/2"
 relations: 
   - - "ceph-osd:mon"
-    - "ceph-mon:osd"
\ No newline at end of file
+    - "ceph-mon:osd"
+machines: 
+  "0": 
+    series: trusty
+  "1": 
+    series: trusty
+  "2": 
+    series: trusty
\ No newline at end of file