Merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-mon-osd into lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802

[Chris MacNaughton]

[Ryan Beisner (1chb1n)]

Please exercise this in OSCI and confirm here with CI link(s).

review: Needs Information

[Chris MacNaughton (chris.macnaughton)]

http://10.245.162.49:8080/job/mojo_runner/5098/ should have this (once OSCI gets around to it) on bionic-queens

[lp:~chris.macnaughton/openstack-mojo-specs/ceph-mon-osd]

354. By Chris MacNaughton on 2018-03-06

shift to configuration in ceph

355. By Chris MacNaughton on 2018-03-06

update collect to ceph-mon

356. By Chris MacNaughton on 2018-03-06

fix charm name

[Chris MacNaughton (chris.macnaughton)]

This has passed on xenial-queens on OSCI @ http://10.245.162.49:8080/job/mojo_runner/5106/

[Ryan Beisner (1chb1n)]

Thanks!

review: Approve

=== modified file 'helper/bundles/cephradosgw-ha.yaml'
--- helper/bundles/cephradosgw-ha.yaml	2018-02-21 19:10:05 +0000
+++ helper/bundles/cephradosgw-ha.yaml	2018-03-06 13:04:14 +0000
@@ -6,17 +6,17 @@
       constraints: mem=1G
       options:
         dataset-size: 50%
-    ceph:
-      charm: ceph
+    ceph-osd:
       num_units: 3
       constraints: mem=1G
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
+        ephemeral-unmount: /mnt
         osd-devices: /dev/vdb
-        osd-reformat: "yes"
-        ephemeral-unmount: /mnt
+    ceph-mon:
+      num_units: 3
+      constraints: mem=1G
+      options:
+        expected-osd-count: 3
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -33,8 +33,9 @@
   relations:
     - [ keystone, mysql ]
     - [ ceph-radosgw, keystone ]
-    - [ ceph-radosgw, ceph ]
+    - [ ceph-radosgw, ceph-mon ]
     - [ ceph-radosgw, cephrgw-hacluster ]
+    - [ ceph-mon, ceph-osd ]
 precise-icehouse:
   inherits: openstack-services
   series: precise

=== modified file 'helper/bundles/cephradosgw.yaml'
--- helper/bundles/cephradosgw.yaml	2018-02-24 07:50:04 +0000
+++ helper/bundles/cephradosgw.yaml	2018-03-06 13:04:14 +0000
@@ -6,17 +6,11 @@
       constraints: mem=1G
       options:
         dataset-size: 50%
-    ceph:
-      charm: ceph
+    ceph-mon:
       num_units: 3
       constraints: mem=1G
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
-        ephemeral-unmount: /mnt
+        expected-osd-count: 3
     ceph-osd:
       charm: ceph-osd
       num_units: 3
@@ -41,9 +35,9 @@
     - [ ceph-radosgw, keystone ]
     - [ glance, keystone ]
     - [ glance, mysql ]
-    - [ glance, ceph ]
-    - [ ceph-radosgw, ceph ]
-    - [ ceph, ceph-osd ]
+    - [ glance, ceph-mon ]
+    - [ ceph-radosgw, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
 precise-icehouse:
   inherits: openstack-services
   series: precise

=== modified file 'helper/collect/collect-next-cephradosgw'
--- helper/collect/collect-next-cephradosgw	2016-09-27 05:11:38 +0000
+++ helper/collect/collect-next-cephradosgw	2018-03-06 13:04:14 +0000
@@ -1,4 +1,4 @@
-ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-osd               cs:~openstack-charmers-next/ceph-osd
 ceph-radosgw           cs:~openstack-charmers-next/ceph-radosgw
 glance                 cs:~openstack-charmers-next/glance

=== modified file 'helper/collect/collect-next-cephradosgw-ha'
--- helper/collect/collect-next-cephradosgw-ha	2016-09-22 21:25:04 +0000
+++ helper/collect/collect-next-cephradosgw-ha	2018-03-06 13:04:14 +0000
@@ -1,4 +1,4 @@
-ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-radosgw           cs:~openstack-charmers-next/ceph-radosgw
 hacluster              cs:~openstack-charmers-next/hacluster
 keystone               cs:~openstack-charmers-next/keystone