Merge lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802 into lp:openstack-mojo-specs

[Chris MacNaughton]

*WIP* Do not merge.

Add Queens specs and collect 1802 freeze release improvements

FYI - This mojo specs branch is running live in OSCI during the 18.02 freeze. https://github.com/openstack-charmers/bot-control/pull/48

[lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802]

335. By Chris MacNaughton on 2018-02-21

Update queens specs with bad bundle links

336. By Chris MacNaughton on 2018-02-21

actually add the collects

337. By Ryan Beisner on 2018-02-21

Make the xenial-queens target deploy proposed

This is necessary as job automation will expect
xenial-queens as a target. Jobs are not yet wired
to pivot proposed.

338. By Ryan Beisner on 2018-02-21

Make the bionic-queens target deploy proposed

This is necessary as job automation will expect
bionic-queens as a target. Jobs are not yet wired
to pivot proposed.

339. By Ryan Beisner on 2018-02-21

Rename designate_ha spec for jjb

340. By Ryan Beisner on 2018-02-22

Simplify the designate-ha bundle in prep for kitchen sink

341. By Ryan Beisner on 2018-02-22

Add missing series for swift base bionic

342. By Ryan Beisner on 2018-02-22

Update manifest targets for queens

Proposed or not-proposed is now controlled in
a single place, the bundle file.

343. By Ryan Beisner on 2018-02-22

Update a missed inheritence target in the designate ha bundle

344. By Ryan Beisner on 2018-02-22

Fix several inconsistencies

Make overcloud instance launches consistent across all specs

Increase overcloud instance launch wait from 5m to 10m

Make temp fork mongodb test fixture consistent across all specs

Use 5400s default timeout for check_juju (juju-wait)

345. By Ryan Beisner on 2018-02-22

Move unused bundle

346. By Chris MacNaughton on 2018-02-23

[gnuoy, r=chris.macnaughton] Fix validate_aodh.py to respect virtual envs

347. By Ryan Beisner on 2018-02-23

Temporary change to designate collect for bug fix verification

348. By Ryan Beisner on 2018-02-24

Switch back to designate master after lp 1751338

349. By Ryan Beisner on 2018-02-24

Fix invalid inheritance target in cephradosgw bundle

350. By Chris MacNaughton on 2018-02-28

[james-page, r=chris.macnaughton] Update auth helper to be series default aware

351. By Chris MacNaughton on 2018-02-28

[fnordahl, r=chris.macnaughton] Move and split ceilometer config into inheritable parts

352. By Ryan Beisner on 2018-02-28

[chris.macnaughton, r=1chb1n] pass neutron_client into the boot_and_test helper

353. By Ryan Beisner on 2018-03-06

[fnordahl, r=chris.macnaughton] add gnocchi and memcached to collects

354. By Chris MacNaughton on 2018-03-06

[thedac, r=chris.macnaughton] Update test_vrrp_ha.py for session based authentication

355. By Ryan Beisner on 2018-03-06

[chris.macnaughton, r=1chb1n] Update radosgw specs to use ceph-mon

356. By Ryan Beisner on 2018-03-07

[chris.macnaughton, r=1chb1n] Fix mongodb and gnocchi inheritance

Pike needs both mongodb and gnocchi

Ocata and earlier use just mongodb

357. By Chris MacNaughton on 2018-03-07

[petevg, r=chris.macnaughton] Fixes for full_dvr test automation

358. By Ryan Beisner on 2018-03-07

[gnuoy, r=1chb1n] Update validate_aodh retries

359. By Ryan Beisner on 2018-03-07

[chris.macnaughton, r=1chb1n] Shrink flavors to reduce test footprint

360. By Ryan Beisner on 2018-03-08

[gnuoy, r=1chb1n] Rework designate for Queens and Keystone v3

361. By Ryan Beisner on 2018-03-14

[chris.macnaughton, r=1chb1n] Update ceph-mon and gnocchi usage

362. By Chris MacNaughton on 2018-03-20

[chris.macnaughton, r=gnuoy] re-add charm-ceph to the default ceph collection

=== modified file 'helper/bundles/baremetal7-next.yaml'
--- helper/bundles/baremetal7-next.yaml	2017-02-13 18:46:34 +0000
+++ helper/bundles/baremetal7-next.yaml	2018-03-20 11:51:13 +0000
@@ -147,17 +147,17 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
@@ -380,4 +380,33 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-
+# pike
+xenial-pike:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-pike
+    source: cloud:xenial-pike
+xenial-pike-proposed:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-pike/proposed
+    source: cloud:xenial-proposed/pike
+xenial-pike-staging:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
+    source: ppa:ubuntu-cloud-archive/pike-staging
+artful-pike:
+  inherits: openstack-icehouse
+  series: artful
+xenial-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/baremetal7.yaml'
--- helper/bundles/baremetal7.yaml	2017-02-13 18:46:34 +0000
+++ helper/bundles/baremetal7.yaml	2018-03-20 11:51:13 +0000
@@ -147,17 +147,17 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]

=== modified file 'helper/bundles/ceph-base.yaml'
--- helper/bundles/ceph-base.yaml	2017-12-06 22:15:49 +0000
+++ helper/bundles/ceph-base.yaml	2018-03-20 11:51:13 +0000
@@ -87,7 +87,7 @@
   inherits: base
   series: xenial
   overrides:
-    source: cloud:xenial-queens
+    source: cloud:xenial-queens/proposed
 bionic-queens:
   inherits: base
   series: bionic

=== modified file 'helper/bundles/ceph-charm-migration.yaml'
--- helper/bundles/ceph-charm-migration.yaml	2017-11-03 22:03:48 +0000
+++ helper/bundles/ceph-charm-migration.yaml	2018-03-20 11:51:13 +0000
@@ -96,3 +96,12 @@
 artful-pike:
   inherits: base
   series: artful
+# queens
+xenial-queens:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: base
+  series: bionic

=== modified file 'helper/bundles/ceph-encrypt.yaml'
--- helper/bundles/ceph-encrypt.yaml	2017-08-30 17:25:03 +0000
+++ helper/bundles/ceph-encrypt.yaml	2018-03-20 11:51:13 +0000
@@ -68,3 +68,12 @@
 artful-pike:
   inherits: base
   series: artful
+# queens
+xenial-queens:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: base
+  series: bionic

=== modified file 'helper/bundles/ceph-harden.yaml'
--- helper/bundles/ceph-harden.yaml	2017-08-30 19:34:23 +0000
+++ helper/bundles/ceph-harden.yaml	2018-03-20 11:51:13 +0000
@@ -70,4 +70,12 @@
 artful-pike:
   inherits: base
   series: artful
-
+# queens
+xenial-queens:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: base
+  series: bionic

=== modified file 'helper/bundles/cephradosgw-ha.yaml'
--- helper/bundles/cephradosgw-ha.yaml	2017-11-23 15:31:58 +0000
+++ helper/bundles/cephradosgw-ha.yaml	2018-03-20 11:51:13 +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
@@ -97,3 +98,12 @@
   series: artful
   overrides:
     ha-bindiface: ens2
+# queens
+xenial-queens:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: base
+  series: bionic

=== modified file 'helper/bundles/cephradosgw.yaml'
--- helper/bundles/cephradosgw.yaml	2017-08-30 19:34:23 +0000
+++ helper/bundles/cephradosgw.yaml	2018-03-20 11:51:13 +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
@@ -101,4 +95,12 @@
 artful-pike:
   inherits: openstack-services
   series: artful
-
+# queens
+xenial-queens:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: openstack-services
+  series: bionic

=== modified file 'helper/bundles/charm-ceph.yaml'
--- helper/bundles/charm-ceph.yaml	2017-09-21 14:10:57 +0000
+++ helper/bundles/charm-ceph.yaml	2018-03-20 11:51:13 +0000
@@ -86,3 +86,12 @@
 artful-pike:
   inherits: base
   series: artful
+# queens
+xenial-queens:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: base
+  series: bionic

=== renamed file 'helper/bundles/reactive-next.yaml' => 'helper/bundles/deprecated/reactive-next.yaml'
--- helper/bundles/reactive-next.yaml	2018-01-22 08:05:07 +0000
+++ helper/bundles/deprecated/reactive-next.yaml	2018-03-20 11:51:13 +0000
@@ -1,3 +1,5 @@
+# NOTE(beisner): I moved this out of the main directory as this bundle file is not referenced by any specs.
+#
 # vim: set ts=2 et:
 # deployer bundle for development ('next') charms
 # UOSCI relies on this for OS-on-OS deployment testing

=== modified file 'helper/bundles/designate-next-ha.yaml'
--- helper/bundles/designate-next-ha.yaml	2018-02-08 13:16:22 +0000
+++ helper/bundles/designate-next-ha.yaml	2018-03-20 11:51:13 +0000
@@ -1,8 +1,18 @@
-# vim: set ts=2 et:
-# deployer bundle for development ('next') charms
-# UOSCI relies on this for OS-on-OS deployment testing
+# Currently this is a "Designate HA" bundle, but it is the beginning of the Kitchen Sink.
+#
+# TODO:
+#         - Add SSL everywhere
+#         - Add HA everywhere
+#         - Add KSV3 everywhere
+#
+# Targeted only for the more modern sets of charms, thus the corresponding release
+# combos are limited to Trusty-Mitaka and later.  Releases earlier than Trusty-Mitaka
+# will be tested via legacy bundles as separate scenarios.
 base-services:
   services:
+    mysql:
+      charm: mysql
+      constraints: mem=4G
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
@@ -159,18 +169,9 @@
     - [ neutron-openvswitch, rabbitmq-server ]
     - [ ceph-osd, ceph-mon ]
     - [ ntp, ceph-osd ]
-openstack-services:
+openstack-services-trusty-mitaka:
   inherits: base-services
   services:
-    mysql:
-      charm: mysql
-      constraints: mem=4G
-      options:
-        root-password: ChangeMe123
-        sst-password: ChangeMe123
-openstack-services-trusty-mitaka:
-  inherits: openstack-services
-  services:
     aodh:
       charm: aodh
       constraints: mem=1G
@@ -213,7 +214,7 @@
     # designate <-> nova-compute needed for legacy notifications
     - [ designate, nova-compute ]
     - [ keystone, tempest ]
-openstack-services-xenial:
+openstack-services-xenial-mitaka:
   inherits: openstack-services-trusty-mitaka
   services:
     barbican:
@@ -224,7 +225,7 @@
     - [ barbican, mysql ]
     - [ barbican, keystone ]
 openstack-services-xenial-ocata:
-  inherits: openstack-services-xenial
+  inherits: openstack-services-xenial-mitaka
   services:
     gnocchi:
       charm: gnocchi
@@ -238,61 +239,19 @@
     - [ gnocchi, ceilometer ]
     - [ gnocchi, keystone ]
     - [ cinder-ceph, nova-compute ]
-# icehouse
-trusty-icehouse:
-  inherits: openstack-services
-  series: trusty
-trusty-icehouse-proposed:
-  inherits: trusty-icehouse
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
-trusty-icehouse-trunk:
-  inherits: trusty-icehouse
-  overrides:
-    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
-    source: ppa:openstack-ubuntu-testing/icehouse
-    offline-compression: "no"
-# kilo
-trusty-kilo:
-  inherits: openstack-services
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-trusty-kilo-proposed:
-  inherits: trusty-kilo
-  overrides:
-    openstack-origin: cloud:trusty-kilo/proposed
-    source: cloud:trusty-kilo/proposed
-trusty-kilo-staging:
-  inherits: trusty-kilo
-  overrides:
-    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
-    source: ppa:ubuntu-cloud-archive/kilo-staging
-# liberty
-trusty-liberty:
-  inherits: openstack-services
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-liberty
-    source: cloud:trusty-liberty
-trusty-liberty-proposed:
-  inherits: trusty-liberty
-  overrides:
-    openstack-origin: cloud:trusty-liberty/proposed
-    source: cloud:trusty-liberty/proposed
-trusty-liberty-staging:
-  inherits: trusty-liberty
-  overrides:
-    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
-    source: ppa:ubuntu-cloud-archive/liberty-staging
+openstack-services-xenial-queens:
+  inherits: openstack-services-xenial-ocata
+  overrides:
+    nova-domain: ''
+    neutron-domain: ''
+    nova-domain-email: ''
+    neutron-domain-email: ''
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 # mitaka
 trusty-mitaka:
-  #NOTE(coreycb): Temporarily disable reactive charms until
-  #               https://bugs.launchpad.net/bugs/1643027 is resolved.
-  #inherits: openstack-services-trusty-mitaka
-  inherits: openstack-services
+  inherits: openstack-services-trusty-mitaka
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -308,7 +267,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-services-xenial
+  inherits: openstack-services-xenial-mitaka
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -317,7 +276,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-services-xenial
+  inherits: openstack-services-xenial-mitaka
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -407,3 +366,15 @@
   overrides:
     openstack-origin: ppa:openstack-ubuntu-testing/pike
     source: ppa:openstack-ubuntu-testing/pike
+xenial-queens:
+  inherits: openstack-services-xenial-queens
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: openstack-services-xenial-queens
+  series: xenial
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/full-dvr-next.yaml'
--- helper/bundles/full-dvr-next.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/full-dvr-next.yaml	2018-03-20 11:51:13 +0000
@@ -9,17 +9,17 @@
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
-    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
@@ -90,16 +90,17 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
-    - [ cinder, ceph ]
+    - [ cinder, ceph-mon ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
@@ -281,3 +282,15 @@
   overrides:
     openstack-origin: cloud:zesty-pike
     source: cloud:zesty-pike
+# queens
+xenial-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-pike
+  series: bionic
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/full-next.yaml'
--- helper/bundles/full-next.yaml	2018-02-13 16:16:00 +0000
+++ helper/bundles/full-next.yaml	2018-03-20 11:51:13 +0000
@@ -9,17 +9,19 @@
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -85,14 +87,6 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -104,27 +98,75 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
-    - [ cinder, ceph ]
+    - [ cinder, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - [ "ceilometer:identity-service", keystone ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
     - [ ceilometer, rabbitmq-server ]
     - [ ceilometer, mongodb ]
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -175,7 +217,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   overrides:
     openstack-origin: cloud:precise-icehouse
@@ -196,10 +238,10 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -214,7 +256,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -231,7 +273,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -248,7 +290,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -264,7 +306,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -273,7 +315,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -288,17 +330,9 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
@@ -314,11 +348,11 @@
     openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
     source: ppa:ubuntu-cloud-archive/ocata-staging
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: zesty
 # pike
 xenial-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-pike
@@ -334,15 +368,17 @@
     openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
     source: ppa:ubuntu-cloud-archive/pike-staging
 artful-pike:
-  inherits: openstack-icehouse
+  inherits: xenial-pike
   series: artful
-xenial-queens-proposed:
-  inherits: xenial-pike
+xenial-queens:
+  inherits: [ openstack-icehouse, ceilometer-gnocchi ]
+  series: xenial
   overrides:
     openstack-origin: cloud:xenial-queens/proposed
     source: cloud:xenial-queens/proposed
-bionic-queens-proposed:
-  inherits: xenial-pike
+bionic-queens:
+  inherits: xenial-queens
+  series: bionic
   overrides:
     openstack-origin: distro-proposed
     source: distro-proposed

=== modified file 'helper/bundles/full-ssl-next.yaml'
--- helper/bundles/full-ssl-next.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/full-ssl-next.yaml	2018-03-20 11:51:13 +0000
@@ -11,17 +11,19 @@
       constraints: mem=1G
       options:
         ssl: "only"
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -89,14 +91,6 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -108,27 +102,75 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
-    - [ cinder, ceph ]
+    - [ cinder, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - [ "ceilometer:identity-service", keystone ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
     - [ ceilometer, rabbitmq-server ]
     - [ ceilometer, mongodb ]
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -179,7 +221,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   overrides:
     openstack-origin: cloud:precise-icehouse
@@ -200,10 +242,10 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -218,7 +260,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -235,7 +277,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -252,7 +294,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -268,7 +310,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -277,7 +319,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -292,17 +334,9 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
@@ -318,7 +352,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
     source: ppa:ubuntu-cloud-archive/ocata-staging
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: zesty
 zesty-ocata-proposed:
   inherits: zesty-ocata
@@ -327,7 +361,7 @@
     openstack-origin: distro-proposed
 # pike
 xenial-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-pike
@@ -343,10 +377,22 @@
     openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
     source: ppa:ubuntu-cloud-archive/pike-staging
 artful-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: artful
 artful-pike-proposed:
   inherits: artful-pike
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+xenial-queens:
+  inherits: [ openstack-icehouse, ceilometer-gnocchi ]
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-queens
+  series: queens
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/full-ssl.yaml'
--- helper/bundles/full-ssl.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/full-ssl.yaml	2018-03-20 11:51:13 +0000
@@ -11,17 +11,19 @@
       constraints: mem=1G
       options:
         ssl: "only"
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -89,14 +91,6 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -108,27 +102,75 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
-    - [ cinder, ceph ]
+    - [ cinder, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - [ "ceilometer:identity-service", keystone ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
     - [ ceilometer, rabbitmq-server ]
     - [ ceilometer, mongodb ]
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -179,7 +221,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   overrides:
     openstack-origin: cloud:precise-icehouse
@@ -200,7 +242,7 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
   inherits: openstack-icehouse-msg-split
@@ -218,7 +260,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -235,7 +277,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -252,7 +294,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -268,7 +310,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -277,7 +319,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -292,17 +334,9 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
@@ -318,7 +352,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
     source: ppa:ubuntu-cloud-archive/ocata-staging
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: zesty
 zesty-ocata-proposed:
   inherits: zesty-ocata

=== modified file 'helper/bundles/full-vrrpha-next.yaml'
--- helper/bundles/full-vrrpha-next.yaml	2017-10-10 10:25:16 +0000
+++ helper/bundles/full-vrrpha-next.yaml	2018-03-20 11:51:13 +0000
@@ -239,3 +239,14 @@
 artful-pike:
   inherits: openstack-icehouse
   series: artful
+# queens
+xenial-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/full.yaml	2018-03-20 11:51:13 +0000
@@ -12,17 +12,19 @@
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -88,14 +90,6 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
     tempest:
       charm: tempest
       constraints: mem=1G
@@ -110,28 +104,76 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
-    - [ cinder, ceph ]
+    - [ cinder, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - [ "ceilometer:identity-service", keystone ]
+    - [ keystone, tempest ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
     - [ ceilometer, rabbitmq-server ]
     - [ ceilometer, mongodb ]
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
-    - [ keystone, tempest ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -182,7 +224,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   overrides:
     openstack-origin: cloud:precise-icehouse
@@ -203,10 +245,10 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -221,7 +263,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -238,7 +280,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -255,7 +297,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -271,7 +313,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -280,7 +322,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -295,31 +337,23 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: zesty
 # pike
 xenial-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-pike
     source: cloud:xenial-pike
 artful-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: artful

=== modified file 'helper/bundles/ha-next.yaml'
--- helper/bundles/ha-next.yaml	2018-02-14 10:55:51 +0000
+++ helper/bundles/ha-next.yaml	2018-03-20 11:51:13 +0000
@@ -19,17 +19,19 @@
       charm: rabbitmq-server
       constraints: mem=1G
       num_units: 3
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -141,24 +143,8 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-      num_units: 3
-      options:
-        vip: "{{ MOJO_OS_VIP08 }}"
-    ceilometer-hacluster:
-      charm: hacluster
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    ceilometer-agent:
-      charm: ceilometer-agent
     heat:
       charm: heat
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
     neutron-api:
       charm: neutron-api
       constraints: mem=1G
@@ -185,29 +171,24 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
     - [ heat, mysql ]
     - [ heat, keystone ]
     - [ heat, rabbitmq-server ]
@@ -217,7 +198,6 @@
     - [ cinder, cinder-hacluster ]
     - [ glance, glance-hacluster ]
     - [ openstack-dashboard, dashboard-hacluster ]
-    - [ ceilometer, ceilometer-hacluster ]
     - [ swift-proxy, swift-hacluster ]
     - [ "neutron-gateway:amqp", rabbitmq-server ]
     - [ neutron-api, mysql ]
@@ -229,37 +209,107 @@
     - [ neutron-openvswitch, nova-compute ]
     - [ neutron-openvswitch, rabbitmq-server ]
     - [ neutron-api, neutron-hacluster ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+      num_units: 3
+      options:
+        vip: "{{ MOJO_OS_VIP08 }}"
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ ceilometer, ceilometer-hacluster ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+      num_units: 3
+      options:
+        vip: "{{ MOJO_OS_VIP08 }}"
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+    - [ ceilometer, ceilometer-hacluster ]
+ceilometer-gnocchi:
+  inherits: charm-ceilometer-gnocchi
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 # icehouse
 trusty-icehouse-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
 # kilo
 trusty-kilo-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
     source: cloud:trusty-kilo
 trusty-liberty-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
     source: cloud:trusty-liberty
 trusty-mitaka-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka/proposed
     source: cloud:trusty-mitaka
 trusty-mitaka-proposed:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka/proposed
     source: cloud:trusty-mitaka/proposed
 xenial-mitaka-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   overrides:
     ha-bindiface: ens2
@@ -270,7 +320,7 @@
     openstack-origin: distro-proposed
     ha-bindiface: ens2
 xenial-newton-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   overrides:
     ha-bindiface: ens2
@@ -278,40 +328,40 @@
     source: cloud:xenial-newton
 # ocata
 xenial-ocata-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   overrides:
     ha-bindiface: ens2
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
 zesty-ocata-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: zesty
   overrides:
     ha-bindiface: ens2
 # pike
 xenial-pike-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     ha-bindiface: ens2
     openstack-origin: cloud:xenial-pike
     source: cloud:xenial-pike
 artful-pike-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: artful
   overrides:
     ha-bindiface: ens2
 # queens
-xenial-queens-proposed:
-  inherits: xenial-pike-ha
+xenial-queens-ha:
+  inherits: [ openstack-services, ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-queens/proposed
     source: cloud:xenial-queens/proposed
-bionic-queens-proposed:
-  inherits: xenial-pike-ha
+bionic-queens-ha:
+  inherits: xenial-queens-ha
   series: bionic
   overrides:
     openstack-origin: distro-proposed
-    source: distro-proposed
\ No newline at end of file
+    source: distro-proposed

=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/ha.yaml	2018-03-20 11:51:13 +0000
@@ -22,17 +22,19 @@
       charm: rabbitmq-server
       constraints: mem=1G
       num_units: 3
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -144,24 +146,8 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-      num_units: 3
-      options:
-        vip: "{{ MOJO_OS_VIP08 }}"
-    ceilometer-hacluster:
-      charm: hacluster
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    ceilometer-agent:
-      charm: ceilometer-agent
     heat:
       charm: heat
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
     neutron-api:
       charm: neutron-api
       constraints: mem=1G
@@ -188,29 +174,24 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
     - [ heat, mysql ]
     - [ heat, keystone ]
     - [ heat, rabbitmq-server ]
@@ -220,7 +201,6 @@
     - [ cinder, cinder-hacluster ]
     - [ glance, glance-hacluster ]
     - [ openstack-dashboard, dashboard-hacluster ]
-    - [ ceilometer, ceilometer-hacluster ]
     - [ swift-proxy, swift-hacluster ]
     - [ "neutron-gateway:amqp", rabbitmq-server ]
     - [ neutron-api, mysql ]
@@ -232,37 +212,107 @@
     - [ neutron-openvswitch, nova-compute ]
     - [ neutron-openvswitch, rabbitmq-server ]
     - [ neutron-api, neutron-hacluster ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+      num_units: 3
+      options:
+        vip: "{{ MOJO_OS_VIP08 }}"
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ ceilometer, ceilometer-hacluster ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+      num_units: 3
+      options:
+        vip: "{{ MOJO_OS_VIP08 }}"
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+    - [ ceilometer, ceilometer-hacluster ]
+ceilometer-gnocchi:
+  inherits: charm-ceilometer-gnocchi
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 # icehouse
 trusty-icehouse-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
 # kilo
 trusty-kilo-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
     source: cloud:trusty-kilo
 trusty-liberty-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
     source: cloud:trusty-liberty
 trusty-mitaka-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka/proposed
     source: cloud:trusty-mitaka
 trusty-mitaka-proposed:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka/proposed
     source: cloud:trusty-mitaka/proposed
 xenial-mitaka-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   services:
     mysql:
@@ -274,28 +324,28 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
     source: cloud:xenial-newton
 # ocata
 xenial-ocata-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
 zesty-ocata-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb ]
   series: zesty
 # pike
 xenial-pike-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-pike
     source: cloud:xenial-pike
 artful-pike-ha:
-  inherits: openstack-services
+  inherits: [ openstack-services, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: artful

=== modified file 'helper/bundles/ksv3-full-next.yaml'
--- helper/bundles/ksv3-full-next.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/ksv3-full-next.yaml	2018-03-20 11:51:13 +0000
@@ -12,17 +12,19 @@
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -91,16 +93,8 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
     heat:
       charm: heat
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -112,32 +106,79 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
     - [ heat, mysql ]
     - [ heat, keystone ]
     - [ heat, rabbitmq-server ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -188,7 +229,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   services:
     mysql:
@@ -212,10 +253,10 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -230,7 +271,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -247,7 +288,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -264,7 +305,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse,  ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -280,7 +321,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -289,7 +330,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -304,17 +345,9 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
@@ -330,7 +363,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
     source: ppa:ubuntu-cloud-archive/ocata-staging
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: zesty
 zesty-ocata-proposed:
   inherits: zesty-ocata
@@ -339,7 +372,7 @@
     openstack-origin: distro-proposed
 # pike
 xenial-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-pike
@@ -355,10 +388,23 @@
     openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
     source: ppa:ubuntu-cloud-archive/pike-staging
 artful-pike:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb, charm-ceilometer-gnocchi ]
   series: artful
 artful-pike-proposed:
   inherits: artful-pike
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# queens
+xenial-queens:
+  inherits: [ openstack-icehouse, ceilometer-gnocchi ]
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-queens
+  series: bionic
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/ksv3-full.yaml'
--- helper/bundles/ksv3-full.yaml	2018-01-15 20:46:39 +0000
+++ helper/bundles/ksv3-full.yaml	2018-03-20 11:51:13 +0000
@@ -12,17 +12,19 @@
     rabbitmq-server:
       charm: rabbitmq-server
       constraints: mem=1G
-    ceph:
-      charm: ceph
+    ceph-mon:
+      charm: ceph-mon
       num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
       constraints: mem=1G
+      num_units: 3
       options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
         ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
     keystone:
       charm: keystone
       constraints: mem=1G
@@ -91,16 +93,8 @@
         zone: 3
         block-device: vdb
         overwrite: "true"
-    ceilometer:
-      charm: ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      charm: ceilometer-agent
     heat:
       charm: heat
-    mongodb:
-      charm: mongodb
-      constraints: mem=1G
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -112,32 +106,79 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
+    - [ nova-compute, ceph-mon ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ glance, ceph ]
+    - [ glance, ceph-mon ]
+    - [ ceph-mon, ceph-osd ]
     - [ glance, "cinder:image-service" ]
     - [ cinder, mysql ]
     - [ cinder, rabbitmq-server ]
     - [ cinder, nova-cloud-controller ]
     - [ cinder, keystone ]
     - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
+    - [ cinder-ceph, ceph-mon ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
     - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
     - [ heat, mysql ]
     - [ heat, keystone ]
     - [ heat, rabbitmq-server ]
+ceilometer-mongodb:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - - ceilometer
+      - keystone:identity-service
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+charm-ceilometer-gnocchi:
+  services:
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: memcached
+  relations:
+    - - ceilometer
+      - keystone:identity-notifications
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, gnocchi ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - - ceph-mon
+      - gnocchi
+    - - gnocchi
+      - memcached
+    - - gnocchi
+      - ceilometer
+    - - gnocchi
+      - keystone
+    - - gnocchi
+      - mysql
+ceilometer-gnocchi:
+  inherits: [ charm-ceilometer-gnocchi]
+  relations:
+    - - ceilometer
+      - keystone:identity-credentials
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -188,7 +229,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: precise
   services:
     mysql:
@@ -212,10 +253,10 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
 trusty-icehouse:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -230,7 +271,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -247,7 +288,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -264,7 +305,7 @@
     source: ppa:ubuntu-cloud-archive/liberty-staging
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -280,7 +321,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -289,7 +330,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -304,17 +345,9 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
     source: ppa:ubuntu-cloud-archive/newton-staging
-yakkety-newton:
-  inherits: openstack-icehouse
-  series: yakkety
-yakkety-newton-proposed:
-  inherits: yakkety-newton
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # ocata
 xenial-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
@@ -330,7 +363,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
     source: ppa:ubuntu-cloud-archive/ocata-staging
 zesty-ocata:
-  inherits: openstack-icehouse
+  inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
   series: zesty
 zesty-ocata-proposed:
   inherits: zesty-ocata

=== modified file 'helper/bundles/swift-ha-proxy-phase1.yaml'
--- helper/bundles/swift-ha-proxy-phase1.yaml	2017-11-29 13:31:05 +0000
+++ helper/bundles/swift-ha-proxy-phase1.yaml	2018-03-20 11:51:13 +0000
@@ -121,3 +121,13 @@
   series: zesty
   overrides:
     ha-bindiface: ens2
+xenial-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== modified file 'helper/bundles/swift-proxy.yaml'
--- helper/bundles/swift-proxy.yaml	2017-11-28 13:44:07 +0000
+++ helper/bundles/swift-proxy.yaml	2018-03-20 11:51:13 +0000
@@ -112,3 +112,15 @@
 artful-pike:
   inherits: openstack-services
   series: artful
+# queens
+xenial-queens:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-queens/proposed
+    source: cloud:xenial-queens/proposed
+bionic-queens:
+  inherits: xenial-pike
+  series: bionic
+  overrides:
+    openstack-origin: distro-proposed
+    source: distro-proposed

=== 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-20 11:51:13 +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-20 11:51:13 +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

=== modified file 'helper/collect/collect-next-ha'
--- helper/collect/collect-next-ha	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-next-ha	2018-03-20 11:51:13 +0000
@@ -1,6 +1,6 @@
 ceilometer-agent       cs:~openstack-charmers-next/ceilometer-agent
 ceilometer             cs:~openstack-charmers-next/ceilometer
-ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-osd               cs:~openstack-charmers-next/ceph-osd
 cinder-ceph            cs:~openstack-charmers-next/cinder-ceph
 cinder                 cs:~openstack-charmers-next/cinder
@@ -8,7 +8,7 @@
 hacluster              cs:~openstack-charmers-next/hacluster
 heat                   cs:~openstack-charmers-next/heat
 keystone               cs:~openstack-charmers-next/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 neutron-api            cs:~openstack-charmers-next/neutron-api
 neutron-gateway        cs:~openstack-charmers-next/neutron-gateway
 neutron-openvswitch    cs:~openstack-charmers-next/neutron-openvswitch
@@ -22,3 +22,5 @@
 swift-storage-z1       cs:~openstack-charmers-next/swift-storage
 swift-storage-z2       cs:~openstack-charmers-next/swift-storage
 swift-storage-z3       cs:~openstack-charmers-next/swift-storage
+gnocchi                cs:~openstack-charmers-next/gnocchi
+memcached              cs:memcached

=== added symlink 'helper/collect/collect-next-reactive-bionic'
=== target is u'collect-next-reactive-xenial'
=== modified file 'helper/collect/collect-next-reactive-xenial'
--- helper/collect/collect-next-reactive-xenial	2018-02-10 07:30:51 +0000
+++ helper/collect/collect-next-reactive-xenial	2018-03-20 11:51:13 +0000
@@ -1,7 +1,6 @@
 aodh                   cs:~openstack-charmers-next/aodh
 ceilometer-agent       cs:~openstack-charmers-next/ceilometer-agent
 ceilometer             cs:~openstack-charmers-next/ceilometer
-ceph                   cs:~openstack-charmers-next/ceph
 ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-osd               cs:~openstack-charmers-next/ceph-osd
 cinder-ceph            cs:~openstack-charmers-next/cinder-ceph

=== modified file 'helper/collect/collect-next-trusty'
--- helper/collect/collect-next-trusty	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-next-trusty	2018-03-20 11:51:13 +0000
@@ -1,14 +1,14 @@
 aodh                   cs:~openstack-charmers-next/aodh
 ceilometer-agent       cs:~openstack-charmers-next/ceilometer-agent
 ceilometer             cs:~openstack-charmers-next/ceilometer
-ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-osd               cs:~openstack-charmers-next/ceph-osd
 cinder-ceph            cs:~openstack-charmers-next/cinder-ceph
 cinder                 cs:~openstack-charmers-next/cinder
 glance                 cs:~openstack-charmers-next/glance
 heat                   cs:~openstack-charmers-next/heat
 keystone               cs:~openstack-charmers-next/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 mysql                  cs:~openstack-charmers-next/percona-cluster
 neutron-api            cs:~openstack-charmers-next/neutron-api
 neutron-gateway        cs:~openstack-charmers-next/neutron-gateway
@@ -23,3 +23,5 @@
 swift-storage-z2       cs:~openstack-charmers-next/swift-storage
 swift-storage-z3       cs:~openstack-charmers-next/swift-storage
 tempest                cs:~openstack-charmers-next/tempest
+gnocchi                cs:~openstack-charmers-next/gnocchi
+memcached              cs:memcached

=== modified file 'helper/collect/collect-next-xenial'
--- helper/collect/collect-next-xenial	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-next-xenial	2018-03-20 11:51:13 +0000
@@ -1,14 +1,14 @@
 aodh                   cs:~openstack-charmers-next/aodh
 ceilometer-agent       cs:~openstack-charmers-next/ceilometer-agent
 ceilometer             cs:~openstack-charmers-next/ceilometer
-ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
 ceph-osd               cs:~openstack-charmers-next/ceph-osd
 cinder-ceph            cs:~openstack-charmers-next/cinder-ceph
 cinder                 cs:~openstack-charmers-next/cinder
 glance                 cs:~openstack-charmers-next/glance
 heat                   cs:~openstack-charmers-next/heat
 keystone               cs:~openstack-charmers-next/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 mysql                  cs:~openstack-charmers-next/percona-cluster
 neutron-api            cs:~openstack-charmers-next/neutron-api
 neutron-gateway        cs:~openstack-charmers-next/neutron-gateway
@@ -23,3 +23,5 @@
 swift-storage-z2       cs:~openstack-charmers-next/swift-storage
 swift-storage-z3       cs:~openstack-charmers-next/swift-storage
 tempest                cs:~openstack-charmers-next/tempest
+gnocchi                cs:~openstack-charmers-next/gnocchi
+memcached              cs:memcached

=== modified file 'helper/collect/collect-stable-ha'
--- helper/collect/collect-stable-ha	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-stable-ha	2018-03-20 11:51:13 +0000
@@ -1,6 +1,6 @@
 ceilometer-agent       cs:~openstack-charmers/ceilometer-agent
 ceilometer             cs:~openstack-charmers/ceilometer
-ceph                   cs:~openstack-charmers/ceph
+ceph-mon               cs:~openstack-charmers/ceph-mon
 ceph-osd               cs:~openstack-charmers/ceph-osd
 cinder-ceph            cs:~openstack-charmers/cinder-ceph
 cinder                 cs:~openstack-charmers/cinder
@@ -8,7 +8,7 @@
 hacluster              cs:~openstack-charmers/hacluster
 heat                   cs:~openstack-charmers/heat
 keystone               cs:~openstack-charmers/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 neutron-api            cs:~openstack-charmers/neutron-api
 neutron-gateway        cs:~openstack-charmers/neutron-gateway
 neutron-openvswitch    cs:~openstack-charmers/neutron-openvswitch
@@ -22,3 +22,5 @@
 swift-storage-z1       cs:~openstack-charmers/swift-storage
 swift-storage-z2       cs:~openstack-charmers/swift-storage
 swift-storage-z3       cs:~openstack-charmers/swift-storage
+gnocchi                cs:~openstack-charmers/gnocchi
+memcached              cs:memcached

=== modified file 'helper/collect/collect-stable-ha-trusty'
--- helper/collect/collect-stable-ha-trusty	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-stable-ha-trusty	2018-03-20 11:51:13 +0000
@@ -9,7 +9,7 @@
 hacluster              git://github.com/openstack/charm-hacluster
 heat                   git://github.com/openstack/charm-heat
 keystone               git://github.com/openstack/charm-keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 neutron-api            git://github.com/openstack/charm-neutron-api
 neutron-gateway        git://github.com/openstack/charm-neutron-gateway
 neutron-openvswitch    git://github.com/openstack/charm-neutron-openvswitch
@@ -23,3 +23,5 @@
 swift-storage-z1       git://github.com/openstack/charm-swift-storage
 swift-storage-z2       git://github.com/openstack/charm-swift-storage
 swift-storage-z3       git://github.com/openstack/charm-swift-storage
+gnocchi                git://github.com/openstack/charm-gnocchi
+memcached              cs:memcached

=== modified file 'helper/collect/collect-stable-trusty'
--- helper/collect/collect-stable-trusty	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-stable-trusty	2018-03-20 11:51:13 +0000
@@ -1,14 +1,14 @@
 aodh                   cs:~openstack-charmers/aodh  
 ceilometer-agent       cs:~openstack-charmers/ceilometer-agent
 ceilometer             cs:~openstack-charmers/ceilometer
-ceph                   cs:~openstack-charmers/ceph
+ceph-mon               cs:~openstack-charmers/ceph-mon
 ceph-osd               cs:~openstack-charmers/ceph-osd
 cinder-ceph            cs:~openstack-charmers/cinder-ceph
 cinder                 cs:~openstack-charmers/cinder
 glance                 cs:~openstack-charmers/glance
 heat                   cs:~openstack-charmers/heat
 keystone               cs:~openstack-charmers/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 mysql                  cs:~openstack-charmers/percona-cluster
 neutron-api            cs:~openstack-charmers/neutron-api
 neutron-gateway        cs:~openstack-charmers/neutron-gateway
@@ -22,5 +22,7 @@
 swift-storage-z1       cs:~openstack-charmers/swift-storage
 swift-storage-z2       cs:~openstack-charmers/swift-storage
 swift-storage-z3       cs:~openstack-charmers/swift-storage
+gnocchi                cs:~openstack-charmers/gnocchi
+memcached              cs:memcached
 # Tempest charm is basically never stable
 tempest                cs:~openstack-charmers-next/tempest

=== modified file 'helper/collect/collect-stable-xenial'
--- helper/collect/collect-stable-xenial	2018-01-15 20:46:39 +0000
+++ helper/collect/collect-stable-xenial	2018-03-20 11:51:13 +0000
@@ -1,14 +1,14 @@
 aodh                   cs:~openstack-charmers/aodh  
 ceilometer-agent       cs:~openstack-charmers/ceilometer-agent
 ceilometer             cs:~openstack-charmers/ceilometer
-ceph                   cs:~openstack-charmers/ceph
+ceph-mon               cs:~openstack-charmers/ceph-mon
 ceph-osd               cs:~openstack-charmers/ceph-osd
 cinder-ceph            cs:~openstack-charmers/cinder-ceph
 cinder                 cs:~openstack-charmers/cinder
 glance                 cs:~openstack-charmers/glance
 heat                   cs:~openstack-charmers/heat
 keystone               cs:~openstack-charmers/keystone
-mongodb                git://git.launchpad.net/~thedac/mongodb-charm;revno=zesty
+mongodb                cs:~thedac/mongodb
 mysql                  cs:~openstack-charmers/percona-cluster
 neutron-api            cs:~openstack-charmers/neutron-api
 neutron-gateway        cs:~openstack-charmers/neutron-gateway
@@ -22,5 +22,7 @@
 swift-storage-z1       cs:~openstack-charmers/swift-storage
 swift-storage-z2       cs:~openstack-charmers/swift-storage
 swift-storage-z3       cs:~openstack-charmers/swift-storage
+gnocchi                cs:~openstack-charmers/gnocchi
+memcached              cs:memcached
 # Tempest charm is basically never stable
 tempest                cs:~openstack-charmers-next/tempest

=== modified file 'helper/setup/designate_setup.py'
--- helper/setup/designate_setup.py	2018-01-19 12:15:27 +0000
+++ helper/setup/designate_setup.py	2018-03-20 11:51:13 +0000
@@ -5,6 +5,7 @@
 import utils.mojo_utils as mojo_utils
 import utils.mojo_os_utils as mojo_os_utils
 
+import designateclient
 from designateclient.v1.domains import Domain
 from designateclient.v1.records import Record
 from designateclient.v1.servers import Server
@@ -48,36 +49,55 @@
     keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc,
                                                           scope=scope)
     neutronc = mojo_os_utils.get_neutron_session_client(keystone_session)
-    designatec = mojo_os_utils.get_designate_session_client(keystone_session)
-
-    if not mojo_os_utils.get_designate_server_id(designatec, nameserver):
-        logging.info('Creating server {}'.format(nameserver))
-        server = Server(name=nameserver)
-        server_id = designatec.servers.create(server)
-        assert(server_id is not None)
-    else:
-        logging.info('{} server already exists.'.format(nameserver))
-
-    domain_id = mojo_os_utils.get_designate_domain_id(designatec, domain_name)
-    if not domain_id:
-        logging.info('Creating domain {}'.format(domain_name))
-        domain = Domain(name=domain_name, email=email)
-        domain_id = designatec.domains.create(domain)
-        assert(domain_id is not None)
-    else:
-        logging.info('{} domain already exists.'.format(domain_name))
-
-    if not mojo_os_utils.get_designate_record_id(designatec, domain_id,
-                                                 nameserver):
-        logging.info('Creating NS record {}'.format(nameserver))
-        ns_record = Record(
-            name=nameserver,
-            type="A",
-            data=resolver)
-        record_id = designatec.records.create(domain_id, ns_record)
-        assert(record_id is not None)
-    else:
-        logging.info('{} record already exists.'.format(nameserver))
+
+    if os_version >= 'queens':
+        designatec = mojo_os_utils.get_designate_session_client(
+            keystone_session,
+            client_version='2')
+        zone = mojo_os_utils.create_or_return_zone(
+            designatec,
+            domain_name,
+            email)
+        rs = mojo_os_utils.create_or_return_recordset(
+            designatec,
+            zone['id'],
+            'www',
+            'A',
+            [resolver])
+    else:
+        designatec = mojo_os_utils.get_designate_session_client(
+            keystone_session,
+            client_version='1')
+        if not mojo_os_utils.get_designate_server_id(designatec, nameserver):
+            logging.info('Creating server {}'.format(nameserver))
+            server = Server(name=nameserver)
+            server_id = designatec.servers.create(server)
+            assert(server_id is not None)
+        else:
+            logging.info('{} server already exists.'.format(nameserver))
+
+        domain_id = mojo_os_utils.get_designate_domain_id(
+            designatec,
+            domain_name)
+        if not domain_id:
+            logging.info('Creating domain {}'.format(domain_name))
+            domain = Domain(name=domain_name, email=email)
+            domain_id = designatec.domains.create(domain)
+            assert(domain_id is not None)
+        else:
+            logging.info('{} domain already exists.'.format(domain_name))
+
+        if not mojo_os_utils.get_designate_record_id(designatec, domain_id,
+                                                     nameserver):
+            logging.info('Creating NS record {}'.format(nameserver))
+            ns_record = Record(
+                name=nameserver,
+                type="A",
+                data=resolver)
+            record_id = designatec.records.create(domain_id, ns_record)
+            assert(record_id is not None)
+        else:
+            logging.info('{} record already exists.'.format(nameserver))
 
     logging.info('Update network to use domain {}'.format(domain_name))
     net_uuid = mojo_os_utils.get_net_uuid(neutronc, 'private')

=== modified file 'helper/template/dev/manifest'
--- helper/template/dev/manifest	2018-02-15 15:15:40 +0000
+++ helper/template/dev/manifest	2018-03-20 11:51:13 +0000
@@ -5,4 +5,4 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"

=== modified file 'helper/template/manifest'
--- helper/template/manifest	2015-10-14 17:32:54 +0000
+++ helper/template/manifest	2018-03-20 11:51:13 +0000
@@ -16,5 +16,5 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 3 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"

=== modified file 'helper/tests/expand_and_shrink_bind.py'
--- helper/tests/expand_and_shrink_bind.py	2018-01-22 15:06:04 +0000
+++ helper/tests/expand_and_shrink_bind.py	2018-03-20 11:51:13 +0000
@@ -18,25 +18,42 @@
     keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc,
                                                           scope='PROJECT')
     client = mojo_os_utils.get_designate_session_client(keystone_session)
-
-    # Create test domain and record in test domain
-    domain = mojo_os_utils.create_designate_dns_domain(
-        client,
-        TEST_DOMAIN,
-        TEST_DOMAIN_EMAIL)
-    record = mojo_os_utils.create_designate_dns_record(
-        client,
-        domain.id,
-        TEST_WWW_RECORD,
-        "A",
-        TEST_RECORD[TEST_WWW_RECORD])
+    os_version = mojo_os_utils.get_current_os_versions('keystone')['keystone']
+
+    if os_version >= 'queens':
+        designate_api_version = 2
+        zone = mojo_os_utils.create_or_return_zone(
+            client,
+            TEST_DOMAIN,
+            TEST_DOMAIN_EMAIL)
+        rs = mojo_os_utils.create_or_return_recordset(
+            client,
+            zone['id'],
+            'www',
+            'A',
+            [TEST_RECORD[TEST_WWW_RECORD]])
+    else:
+        designate_api_version = 1
+
+        # Create test domain and record in test domain
+        domain = mojo_os_utils.create_designate_dns_domain(
+            client,
+            TEST_DOMAIN,
+            TEST_DOMAIN_EMAIL)
+        record = mojo_os_utils.create_designate_dns_record(
+            client,
+            domain.id,
+            TEST_WWW_RECORD,
+            "A",
+            TEST_RECORD[TEST_WWW_RECORD])
 
     # Test record is in bind and designate
     mojo_os_utils.check_dns_entry(
         client,
         TEST_RECORD[TEST_WWW_RECORD],
         TEST_DOMAIN,
-        record_name=TEST_WWW_RECORD)
+        record_name=TEST_WWW_RECORD,
+        designate_api=designate_api_version)
 
     mojo_utils.add_unit('designate-bind')
 
@@ -44,7 +61,8 @@
         client,
         TEST_RECORD[TEST_WWW_RECORD],
         TEST_DOMAIN,
-        record_name=TEST_WWW_RECORD)
+        record_name=TEST_WWW_RECORD,
+        designate_api=designate_api_version)
 
     mojo_utils.delete_oldest('designate-bind')
 
@@ -52,7 +70,8 @@
         client,
         TEST_RECORD[TEST_WWW_RECORD],
         TEST_DOMAIN,
-        record_name=TEST_WWW_RECORD)
+        record_name=TEST_WWW_RECORD,
+        designate_api=designate_api_version)
 
 
 if __name__ == "__main__":

=== modified file 'helper/tests/simple_os_checks.py'
--- helper/tests/simple_os_checks.py	2017-10-25 06:10:55 +0000
+++ helper/tests/simple_os_checks.py	2018-03-20 11:51:13 +0000
@@ -13,17 +13,17 @@
     'm1.small': {
         'flavorid': 2,
         'ram': 2048,
-        'disk': 20,
+        'disk': 10,
         'vcpus': 1},
     'm1.medium': {
         'flavorid': 3,
         'ram': 4096,
-        'disk': 40,
+        'disk': 20,
         'vcpus': 2},
     'm1.large': {
         'flavorid': 4,
         'ram': 8192,
-        'disk': 40,
+        'disk': 20,
         'vcpus': 4},
 }
 

=== modified file 'helper/tests/test_vrrp_ha.py'
--- helper/tests/test_vrrp_ha.py	2017-08-30 17:25:03 +0000
+++ helper/tests/test_vrrp_ha.py	2018-03-20 11:51:13 +0000
@@ -6,17 +6,16 @@
 import logging
 
 
-def lookup_cirros_server(cloud_auth):
-    cirros_images = get_cirros_images(cloud_auth)
-    nova_client = mojo_os_utils.get_nova_client(cloud_auth)
-    for server in nova_client.servers.list():
+def lookup_cirros_server(clients):
+    cirros_images = get_cirros_images(clients)
+    for server in clients['nova'].servers.list():
         if server.image['id'] in cirros_images:
             return server
 
 
-def get_cirros_server(cloud_auth, image_password):
+def get_cirros_server(clients, image_password):
     logging.info('Looking for existing cirros server')
-    cirros_server = lookup_cirros_server(cloud_auth)
+    cirros_server = lookup_cirros_server(clients)
     if cirros_server:
         ip = get_server_floating_ip(cirros_server)
         logging.info('Checking connectivity to cirros guest')
@@ -24,25 +23,24 @@
                                       password=image_password):
             raise Exception('Cirros guest inaccessable')
     else:
-        nova_client = mojo_os_utils.get_nova_client(cloud_auth)
         logging.info('Creating new cirros guest')
         mojo_os_utils.boot_and_test(
-            nova_client,
+            clients['nova'],
+            clients['neutron'],
             image_name='cirros',
             flavor_name='m1.small',
             number=1,
             privkey=None,
         )
-        cirros_server = lookup_cirros_server(cloud_auth)
+        cirros_server = lookup_cirros_server(clients)
         ip = get_server_floating_ip(cirros_server)
     return cirros_server, ip
 
 
-def get_cirros_images(cloud_auth):
+def get_cirros_images(clients):
     logging.info('Getting list of cirros images')
-    glance_client = mojo_os_utils.get_glance_client(cloud_auth)
     cirros_images = []
-    for image in glance_client.images.list():
+    for image in clients['glance'].images.list():
         if 'cirros' in image.name:
             cirros_images.append(image.id)
     return cirros_images
@@ -84,16 +82,35 @@
 def main(argv):
     logging.basicConfig(level=logging.INFO)
     logging.getLogger("urllib3").setLevel(logging.WARNING)
+    # Keystone policy.json shipped the charm with liberty requires a domain
+    # scoped token. Bug #1649106
+    os_version = mojo_os_utils.get_current_os_versions('keystone')['keystone']
+    if os_version == 'liberty':
+        scope = 'DOMAIN'
+    else:
+        scope = 'PROJECT'
+    undercloud_novarc = mojo_utils.get_undercloud_auth()
+    keystone_session_uc = mojo_os_utils.get_keystone_session(undercloud_novarc,
+                                                             scope=scope)
+    under_novac = mojo_os_utils.get_nova_session_client(keystone_session_uc)
+
     overcloud_novarc = mojo_utils.get_overcloud_auth()
-    undercloud_novarc = mojo_utils.get_undercloud_auth()
-    under_novac = mojo_os_utils.get_nova_client(undercloud_novarc)
-    over_neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
+    keystone_session_oc = mojo_os_utils.get_keystone_session(overcloud_novarc,
+                                                             scope=scope)
+    clients = {'neutron': mojo_os_utils.get_neutron_session_client(
+                   keystone_session_oc),
+               'nova': mojo_os_utils.get_nova_session_client(
+                   keystone_session_oc),
+               'glance': mojo_os_utils.get_glance_session_client(
+                   keystone_session_oc),
+               }
     image_config = mojo_utils.get_mojo_config('images.yaml')
     image_password = image_config['cirros']['password']
     # Look for existing Cirros guest
-    server, ip = get_cirros_server(overcloud_novarc, image_password)
-    router = over_neutronc.list_routers(name='provider-router')['routers'][0]
-    l3_agents = over_neutronc.list_l3_agent_hosting_routers(
+    server, ip = get_cirros_server(clients, image_password)
+    router = (clients['neutron']
+              .list_routers(name='provider-router')['routers'][0])
+    l3_agents = clients['neutron'].list_l3_agent_hosting_routers(
         router=router['id'])['agents']
     logging.info('Checking there are multiple L3 agents running tenant router')
     if len(l3_agents) != 2:
@@ -121,7 +138,8 @@
         if not check_server_state(under_novac, 'ACTIVE',
                                   server_name=gateway_hostname):
             raise Exception('Server failed to reach SHUTOFF state')
-        if not check_neutron_agent_states(over_neutronc, gateway_hostname):
+        if not check_neutron_agent_states(clients['neutron'],
+                                          gateway_hostname):
             raise Exception('Server agents failed to reach active state')
 
 

=== modified file 'helper/tests/validate_aodh.py'
--- helper/tests/validate_aodh.py	2018-02-10 07:28:22 +0000
+++ helper/tests/validate_aodh.py	2018-03-20 11:51:13 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import logging
 import sys
 import time
@@ -47,12 +47,10 @@
                 alarm_info['alarm_id'])
             if alarm_state == 'alarm':
                 logging.info('Alarm triggered')
-                server.start()
                 break
             else:
                 time.sleep(5)
         else:
-            server.start()
             raise Exception("Alarm failed to trigger")
 
 

=== modified file 'helper/tests/validate_designate.py'
--- helper/tests/validate_designate.py	2018-01-22 09:41:18 +0000
+++ helper/tests/validate_designate.py	2018-03-20 11:51:13 +0000
@@ -36,8 +36,11 @@
                     'hostname': server.name,
                     'zone': nova_domain}
 
+                target_project = overcloud_novarc.get(
+                    'OS_TENANT_NAME',
+                    overcloud_novarc.get('OS_PROJECT_NAME'))
                 for project in keystone_client.projects.list():
-                    if project.name == overcloud_novarc['OS_TENANT_NAME']:
+                    if project.name == target_project:
                         record_ctxt['project_id'] = project.id
                         record_ctxt['tenant_id'] = project.id
 

=== modified file 'helper/utils/juju_wait.py'
--- helper/utils/juju_wait.py	2017-08-30 17:25:03 +0000
+++ helper/utils/juju_wait.py	2018-03-20 11:51:13 +0000
@@ -197,7 +197,7 @@
     # XXX Delta from upstream: default = 2700
     parser.add_argument('-t', '--max_wait', dest='max_wait',
                         help='Maximum time to wait for readiness (seconds)',
-                        action='store', default=2700)
+                        action='store', default=5400)
     parser.add_argument('--version', default=False, action='store_true')
     args = parser.parse_args(args)
 

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2018-02-10 07:28:22 +0000
+++ helper/utils/mojo_os_utils.py	2018-03-20 11:51:13 +0000
@@ -20,7 +20,8 @@
 from novaclient import client as novaclient_client
 from neutronclient.v2_0 import client as neutronclient
 
-import designateclient.v1 as designateclient_v1
+import designateclient
+import designateclient.client as designate_client
 import designateclient.v1.domains as des_domains
 import designateclient.v1.records as des_records
 import designateclient.exceptions as des_exceptions
@@ -193,10 +194,19 @@
     return swiftclient.client.Connection(session=session)
 
 
-def get_designate_session_client(session, all_tenants=True):
-    return designateclient_v1.Client(
-        session=session,
-        all_tenants=all_tenants)
+def get_designate_session_client(session, all_tenants=True,
+                                 client_version=None):
+    client_version = client_version or '2'
+    if client_version == '1':
+        client = designate_client.Client(
+            version=client_version,
+            session=session,
+            all_tenants=all_tenants)
+    else:
+        client = designate_client.Client(
+            version=client_version,
+            session=session)
+    return client
 
 
 def get_glance_session_client(session):
@@ -1018,7 +1028,7 @@
     return record_id
 
 
-def get_designate_domain_object(designate_client, domain_name):
+def get_designate_domain_object_v1(designate_client, domain_name):
     """Get the one and only domain matching the given domain_name, if none are
     found or multiple are found then raise an AssertionError. To access a list
     matching the domain name use get_designate_domain_objects.
@@ -1030,16 +1040,37 @@
     @raises AssertionError: if domain_name not found or multiple domains with
                             the same name.
     """
-    dns_zone_id = get_designate_domain_objects(designate_client,
-                                               domain_name=domain_name)
+    dns_zone_id = get_designate_domain_objects_v1(designate_client,
+                                                  domain_name=domain_name)
     assert len(dns_zone_id) == 1, "Found {} domains for {}".format(
         len(dns_zone_id),
         domain_name)
     return dns_zone_id[0]
 
 
-def get_designate_domain_objects(designate_client, domain_name=None,
-                                 domain_id=None):
+def get_designate_domain_object_v2(designate_client, domain_name):
+    """Get the one and only domain matching the given domain_name, if none are
+    found or multiple are found then raise an AssertionError. To access a list
+    matching the domain name use get_designate_domain_objects.
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_name: str Name of domain to lookup
+    @returns designateclient.v1.domains.Domain
+    @raises AssertionError: if domain_name not found or multiple domains with
+                            the same name.
+    """
+    dns_zone_id = get_designate_zone_objects_v2(designate_client,
+                                                domain_name=domain_name)
+    msg = "Found {} domains for {}".format(
+        len(dns_zone_id),
+        domain_name)
+    assert len(dns_zone_id) == 1, msg
+    return dns_zone_id[0]
+
+
+def get_designate_domain_objects_v1(designate_client, domain_name=None,
+                                    domain_id=None):
     """Get all domains matching a given domain_name or domain_id
 
     @param designate_client: designateclient.v1.Client Client to query
@@ -1054,7 +1085,24 @@
     return a
 
 
-def get_designate_dns_records(designate_client, domain_name, ip):
+def get_designate_zone_objects_v2(designate_client, domain_name=None,
+                                  domain_id=None):
+    """Get all domains matching a given domain_name or domain_id
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_name: str Name of domain to lookup
+    @param domain_id: str UUID of domain to lookup
+    @returns [] List of designateclient.v1.domains.Domain objects matching
+                domain_name or domain_id
+    """
+    all_zones = designate_client.zones.list()
+    a = [z for z in all_zones
+         if z['name'] == domain_name or z['id'] == domain_id]
+    return a
+
+
+def get_designate_dns_records_v1(designate_client, domain_name, ip):
     """Look for records in designate that match the given ip
 
     @param designate_client: designateclient.v1.Client Client to query
@@ -1063,11 +1111,41 @@
     @returns [] List of designateclient.v1.records.Record objects with
                 a matching IP address
     """
-    dns_zone = get_designate_domain_object(designate_client, domain_name)
+    dns_zone = get_designate_domain_object_v1(designate_client, domain_name)
     domain = designate_client.domains.get(dns_zone.id)
     return [r for r in designate_client.records.list(domain) if r.data == ip]
 
 
+def get_designate_dns_records_v2(designate_client, domain_name, ip):
+    """Look for records in designate that match the given ip
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_name: str Name of domain to lookup
+    @returns [] List of designateclient.v1.records.Record objects with
+                a matching IP address
+    """
+    dns_zone = get_designate_domain_object_v2(designate_client, domain_name)
+    return [r for r in designate_client.recordsets.list(dns_zone['id'])
+            if r['records'] == ip]
+
+
+def get_designate_zone(designate_client, zone_name):
+    zone = None
+    zones = [z for z in designate_client.zones.list()
+             if z['name'] == zone_name]
+    assert len(zones) <= 1, "Multiple matching zones found"
+    if zones:
+        zone = zones[0]
+    return zone
+
+
+def create_designate_zone(designate_client, domain_name, email):
+    return designate_client.zones.create(
+        name=domain_name,
+        email=email)
+
+
 def create_designate_dns_domain(designate_client, domain_name, email,
                                 recreate=True):
     """Create the given domain in designate
@@ -1163,7 +1241,8 @@
             assert str(rdata) == expected_ip
 
 
-def check_dns_entry(des_client, ip, domain, record_name, juju_status=None):
+def check_dns_entry(des_client, ip, domain, record_name, juju_status=None,
+                    designate_api='2'):
     """Check that record for ip address is in designate and in bind if bind
        server is available.
 
@@ -1174,12 +1253,16 @@
     """
     if not juju_status:
         juju_status = mojo_utils.get_juju_status()
-    check_dns_entry_in_designate(des_client, ip, domain,
-                                 record_name=record_name)
+    if designate_api == '1':
+        check_dns_entry_in_designate_v1(des_client, ip, domain,
+                                        record_name=record_name)
+    else:
+        check_dns_entry_in_designate_v2(des_client, [ip], domain,
+                                        record_name=record_name)
     check_dns_entry_in_bind(ip, record_name, juju_status=juju_status)
 
 
-def check_dns_entry_in_designate(des_client, ip, domain, record_name=None):
+def check_dns_entry_in_designate_v1(des_client, ip, domain, record_name=None):
     """Look for records in designate that match the given ip in the given
        domain
 
@@ -1191,7 +1274,7 @@
     @raises AssertionError: if no record is found or record_name is set and
                             does not match the name associated with the record
     """
-    records = get_designate_dns_records(des_client, domain, ip)
+    records = get_designate_dns_records_v1(des_client, domain, ip)
     assert records, "Record not found for {} in designate".format(ip)
 
     if record_name:
@@ -1200,6 +1283,27 @@
             record_name)
 
 
+def check_dns_entry_in_designate_v2(des_client, ip, domain, record_name=None):
+    """Look for records in designate that match the given ip in the given
+       domain
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param ip: str IP address to lookup in designate
+    @param domain: str Name of domain to lookup
+    @param record_name: str Retrieved record should have this name
+    @raises AssertionError: if no record is found or record_name is set and
+                            does not match the name associated with the record
+    """
+    records = get_designate_dns_records_v2(des_client, domain, ip)
+    assert records, "Record not found for {} in designate".format(ip)
+
+    if record_name:
+        recs = [r for r in records if r['name'] == record_name]
+        assert recs, "No DNS entry name matches expected name {}".format(
+            record_name)
+
+
 def check_dns_entry_in_bind(ip, record_name, juju_status=None):
     """Check that record for ip address in bind if a bind
        server is available.
@@ -1222,7 +1326,35 @@
             ip,
             unit,
             addr))
-        check_dns_record_exists(addr, record_name, ip, retry_count=2)
+        check_dns_record_exists(addr, record_name, ip, retry_count=6)
+
+
+def create_or_return_zone(client, name, email):
+    try:
+        zone = client.zones.create(
+            name=name,
+            email=email)
+    except designateclient.exceptions.Conflict:
+        logging.info('{} zone already exists.'.format(name))
+        zones = [z for z in client.zones.list() if z['name'] == name]
+        assert len(zones) == 1, "Wrong number of zones found {}".format(zones)
+        zone = zones[0]
+    return zone
+
+
+def create_or_return_recordset(client, zone_id, sub_domain, record_type, data):
+    try:
+        rs = client.recordsets.create(
+            zone_id,
+            sub_domain,
+            record_type,
+            data)
+    except designateclient.exceptions.Conflict:
+        logging.info('{} record already exists.'.format(data))
+        for r in client.recordsets.list(zone_id):
+            if r['name'].split('.')[0] == sub_domain:
+                rs = r
+    return rs
 
 
 # Aodh helpers

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2018-01-19 12:15:27 +0000
+++ helper/utils/mojo_utils.py	2018-03-20 11:51:13 +0000
@@ -9,6 +9,7 @@
 import utils.juju_wait as juju_wait
 from collections import Counter
 
+import mojo_os_utils
 import kiki
 
 
@@ -407,7 +408,15 @@
         port = 5000
     address = get_auth_url()
 
-    if juju_get('keystone', 'preferred-api-version') in [2, None]:
+    os_version = mojo_os_utils.get_current_os_versions('keystone')['keystone']
+
+    api_version = juju_get('keystone', 'preferred-api-version')
+    if os_version >= 'queens':
+        api_version = 3
+    elif api_version is None:
+        api_version = 2
+
+    if api_version == 2:
         # V2 Explicitly, or None when charm does not possess the config key
         logging.info('Using keystone API V2 for overcloud auth')
         auth_settings = {
@@ -418,7 +427,7 @@
             'OS_REGION_NAME': 'RegionOne',
             'API_VERSION': 2,
         }
-    elif juju_get('keystone', 'preferred-api-version') >= 3:
+    else:
         # V3 or later
         logging.info('Using keystone API V3 (or later) for overcloud auth')
         auth_settings = {
@@ -677,7 +686,7 @@
     remote_runs(juju_units)
 
 
-def juju_wait_finished(max_wait=2700):
+def juju_wait_finished(max_wait=5400):
     """Use juju-wait from local utils path to block until all service
     units quiesce and satisfy workload status ready state."""
     log = logging.getLogger()

=== modified file 'specs/deprecated/next_ha_phased/icehouse/manifest'
--- specs/deprecated/next_ha_phased/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/deprecated/next_ha_phased/kilo/manifest'
--- specs/deprecated/next_ha_phased/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/deprecated/next_ha_phased/liberty/manifest'
--- specs/deprecated/next_ha_phased/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -25,8 +25,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/dev/bug1389670/mysql/manifest'
--- specs/dev/bug1389670/mysql/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/bug1389670/mysql/manifest	2018-03-20 11:51:13 +0000
@@ -4,6 +4,6 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/bug1389670/percona_cluster/manifest'
--- specs/dev/bug1389670/percona_cluster/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/bug1389670/percona_cluster/manifest	2018-03-20 11:51:13 +0000
@@ -4,6 +4,6 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/dvr/manifest'
--- specs/dev/dvr/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/dvr/manifest	2018-03-20 11:51:13 +0000
@@ -19,7 +19,7 @@
 # Restarting neutron-plugin-openvswitch-agent to work around Bug #1364215
 script config=bug1364215.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/full_nrpe/manifest'
--- specs/dev/full_nrpe/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/full_nrpe/manifest	2018-03-20 11:51:13 +0000
@@ -16,8 +16,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 3 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 nagios-check
 

=== modified file 'specs/dev/haproxy_always/manifest'
--- specs/dev/haproxy_always/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/haproxy_always/manifest	2018-03-20 11:51:13 +0000
@@ -4,7 +4,7 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 verify config=test_obj_store.py
 
 # Success

=== modified file 'specs/dev/multicast_port_change/manifest'
--- specs/dev/multicast_port_change/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/multicast_port_change/manifest	2018-03-20 11:51:13 +0000
@@ -6,13 +6,13 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 script config=wipe_charm_dir.py
 collect config=collect-mps
 script config=upgrade_services.py SERVICES="glance cinder keystone"
 verify config=check_juju.py
 sleep config=180
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 verify config=check_guest_connectivity.py
 script config=image_setup.py
 script config=keystone_setup.py

=== modified file 'specs/dev/neutron_ha/manifest'
--- specs/dev/neutron_ha/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/neutron_ha/manifest	2018-03-20 11:51:13 +0000
@@ -6,7 +6,7 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 script config=delete_router_home.py ROUTER="provider-router"
 verify config=check_guest_connectivity.py
 

=== modified file 'specs/dev/next_mini/icehouse/manifest'
--- specs/dev/next_mini/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/next_mini/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/next_mini/liberty/manifest'
--- specs/dev/next_mini/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/next_mini/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/novaccalch/manifest'
--- specs/dev/novaccalch/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/novaccalch/manifest	2018-03-20 11:51:13 +0000
@@ -4,6 +4,6 @@
 script config=network_setup.py
 script config=image_setup.py
 script config=keystone_setup.py
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/stable_mini/icehouse/manifest'
--- specs/dev/stable_mini/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/stable_mini/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/stable_mini/liberty/manifest'
--- specs/dev/stable_mini/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/stable_mini/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/dev/vxlan/manifest'
--- specs/dev/vxlan/manifest	2018-02-15 15:15:40 +0000
+++ specs/dev/vxlan/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_charmhelper_sync/icehouse/manifest'
--- specs/full_stack/next_charmhelper_sync/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/kilo/manifest'
--- specs/full_stack/next_charmhelper_sync/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/liberty/manifest'
--- specs/full_stack/next_charmhelper_sync/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/mitaka/manifest'
--- specs/full_stack/next_charmhelper_sync/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/newton/manifest'
--- specs/full_stack/next_charmhelper_sync/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/newton/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/ocata/manifest'
--- specs/full_stack/next_charmhelper_sync/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync/pike/manifest'
--- specs/full_stack/next_charmhelper_sync/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync/pike/manifest	2018-03-20 11:51:13 +0000
@@ -19,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added directory 'specs/full_stack/next_charmhelper_sync/queens'
=== added file 'specs/full_stack/next_charmhelper_sync/queens/SPEC_INFO.txt'
--- specs/full_stack/next_charmhelper_sync/queens/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_charmhelper_sync/queens/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,2 @@
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud

=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/collect-next-bionic'
=== target is u'../../../../helper/collect/collect-next-bionic'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/full.yaml'
=== target is u'../../../../helper/bundles/full-next.yaml'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_charmhelper_sync/queens/manifest'
--- specs/full_stack/next_charmhelper_sync/queens/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_charmhelper_sync/queens/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,28 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer with full.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/sync_charmhelpers.py'
=== target is u'../../../../helper/setup/sync_charmhelpers.py'
=== added symlink 'specs/full_stack/next_charmhelper_sync/queens/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== modified file 'specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -28,8 +28,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync_ha/kilo/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -28,8 +28,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_charmhelper_sync_ha/liberty/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -28,8 +28,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_deploy/icehouse/manifest'
--- specs/full_stack/next_deploy/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/kilo/manifest'
--- specs/full_stack/next_deploy/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/liberty/manifest'
--- specs/full_stack/next_deploy/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/mitaka/manifest'
--- specs/full_stack/next_deploy/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/newton/manifest'
--- specs/full_stack/next_deploy/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/newton/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/ocata/manifest'
--- specs/full_stack/next_deploy/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/pike/manifest'
--- specs/full_stack/next_deploy/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy/pike/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy/queens/manifest'
--- specs/full_stack/next_deploy/queens/manifest	2018-02-16 13:10:44 +0000
+++ specs/full_stack/next_deploy/queens/manifest	2018-03-20 11:51:13 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-queens-proposed
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/icehouse/manifest'
--- specs/full_stack/next_deploy_baremetal/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -23,7 +23,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/kilo/manifest'
--- specs/full_stack/next_deploy_baremetal/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/liberty/manifest'
--- specs/full_stack/next_deploy_baremetal/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/mitaka/manifest'
--- specs/full_stack/next_deploy_baremetal/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/newton/manifest'
--- specs/full_stack/next_deploy_baremetal/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/newton/manifest	2018-03-20 11:51:13 +0000
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/ocata/manifest'
--- specs/full_stack/next_deploy_baremetal/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_baremetal/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== added directory 'specs/full_stack/next_deploy_baremetal/pike'
=== added file 'specs/full_stack/next_deploy_baremetal/pike/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_baremetal/pike/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/pike/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,4 @@
+This MITAKA spec deploys a non-ha 7-machine bundle, intended for bare metal
+with smoosh.  It uses the baremetal7.yaml bundle which aims to exercise a stack
+roughly equivalent to the next/default yamls.  As swift is the object store,
+ceph-radosgw is not exercised.

=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/collect-next-artful'
=== target is u'../../../../helper/collect/collect-next-artful'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_baremetal/pike/manifest'
--- specs/full_stack/next_deploy_baremetal/pike/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/pike/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,28 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Insert new uuid for fsid in bundle
+script config=scripts/fsid_uuid_insert.sh lxc=False
+
+# Optionally inject juju/maas tags into bundle if env var is set
+script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
+
+# Use juju deployer with baremetal7.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-pike
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/scripts'
=== target is u'../../../../helper/scripts/'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/pike/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_baremetal/queens'
=== added file 'specs/full_stack/next_deploy_baremetal/queens/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_baremetal/queens/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/queens/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,4 @@
+This MITAKA spec deploys a non-ha 7-machine bundle, intended for bare metal
+with smoosh.  It uses the baremetal7.yaml bundle which aims to exercise a stack
+roughly equivalent to the next/default yamls.  As swift is the object store,
+ceph-radosgw is not exercised.

=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/collect-next-bionic'
=== target is u'../../../../helper/collect/collect-next-bionic'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_baremetal/queens/manifest'
--- specs/full_stack/next_deploy_baremetal/queens/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/queens/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,28 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Insert new uuid for fsid in bundle
+script config=scripts/fsid_uuid_insert.sh lxc=False
+
+# Optionally inject juju/maas tags into bundle if env var is set
+script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
+
+# Use juju deployer with baremetal7.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-queens
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/scripts'
=== target is u'../../../../helper/scripts/'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/queens/utils'
=== target is u'../../../../helper/utils'
=== modified file 'specs/full_stack/next_deploy_ssl/icehouse/manifest'
--- specs/full_stack/next_deploy_ssl/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/kilo/manifest'
--- specs/full_stack/next_deploy_ssl/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/liberty/manifest'
--- specs/full_stack/next_deploy_ssl/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/mitaka/manifest'
--- specs/full_stack/next_deploy_ssl/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/newton/manifest'
--- specs/full_stack/next_deploy_ssl/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/newton/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/ocata/manifest'
--- specs/full_stack/next_deploy_ssl/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_ssl/pike/manifest'
--- specs/full_stack/next_deploy_ssl/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_deploy_ssl/pike/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Success

=== added directory 'specs/full_stack/next_deploy_ssl/queens'
=== added file 'specs/full_stack/next_deploy_ssl/queens/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_ssl/queens/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/queens/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/next_deploy_ssl/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/collect-next-bionic'
=== target is u'../../../../helper/collect/collect-next-bionic'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/full-ssl.yaml'
=== target is u'../../../../helper/bundles/full-ssl-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_ssl/queens/manifest'
--- specs/full_stack/next_deploy_ssl/queens/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/queens/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,22 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Use juju deployer with full.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy_ssl/queens/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/queens/utils'
=== target is u'../../../../helper/utils'
=== renamed directory 'specs/full_stack/next_deploy_designate' => 'specs/full_stack/next_designate_ha'
=== modified file 'specs/full_stack/next_designate_ha/mitaka/manifest'
--- specs/full_stack/next_deploy_designate/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_designate_ha/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -22,8 +22,8 @@
 # Setup Designate
 script config=designate_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test DNS records
 verify config=validate_designate.py

=== modified file 'specs/full_stack/next_designate_ha/newton/manifest'
--- specs/full_stack/next_deploy_designate/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_designate_ha/newton/manifest	2018-03-20 11:51:13 +0000
@@ -22,8 +22,8 @@
 # Setup Designate
 script config=designate_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test DNS records
 verify config=validate_designate.py

=== modified file 'specs/full_stack/next_designate_ha/ocata/manifest'
--- specs/full_stack/next_deploy_designate/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_designate_ha/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -4,7 +4,7 @@
 # Collect the charm branches from Launchpad
 collect config=collect-next-reactive-${MOJO_SERIES}
 
-# Use juju deployer with reactive-next.yaml bundle
+# Use juju deployer with designate-next-ha.yaml bundle
 deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
@@ -22,8 +22,8 @@
 # Setup Designate
 script config=designate_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test DNS records
 verify config=validate_designate.py

=== modified file 'specs/full_stack/next_designate_ha/pike/manifest'
--- specs/full_stack/next_deploy_designate/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_designate_ha/pike/manifest	2018-03-20 11:51:13 +0000
@@ -22,8 +22,8 @@
 # Setup Designate
 script config=designate_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test DNS records
 verify config=validate_designate.py

=== added directory 'specs/full_stack/next_designate_ha/queens'
=== added file 'specs/full_stack/next_designate_ha/queens/SPEC_INFO.txt'
--- specs/full_stack/next_designate_ha/queens/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_designate_ha/queens/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a deploy using the next charms with designate and neutron integrated
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/next_designate_ha/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/collect-next-reactive-bionic'
=== target is u'../../../../helper/collect/collect-next-reactive-bionic'
=== added symlink 'specs/full_stack/next_designate_ha/queens/collect-next-reactive-xenial'
=== target is u'../../../../helper/collect/collect-next-reactive-xenial'
=== added symlink 'specs/full_stack/next_designate_ha/queens/designate-next-ha.yaml'
=== target is u'../../../../helper/bundles/designate-next-ha.yaml'
=== added symlink 'specs/full_stack/next_designate_ha/queens/designate_setup.py'
=== target is u'../../../../helper/setup/designate_setup.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/expand_and_shrink_bind.py'
=== target is u'../../../../helper/tests/expand_and_shrink_bind.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_designate_ha/queens/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_designate_ha/queens/manifest'
--- specs/full_stack/next_designate_ha/queens/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_designate_ha/queens/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,37 @@
+# Validate env variables
+script config=preflight.py
+
+# Collect the charm branches from Launchpad
+collect config=collect-next-reactive-${MOJO_SERIES}
+
+# Use juju deployer with designate-next-ha.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Setup Designate
+script config=designate_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
+
+# Test DNS records
+verify config=validate_designate.py
+
+# Expand and shrink bind service checking DNS records persist at each stage
+script config=expand_and_shrink_bind.py
+
+# Test AODH Alarms
+verify config=validate_aodh.py
+
+# Success

=== added symlink 'specs/full_stack/next_designate_ha/queens/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_designate_ha/queens/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/next_designate_ha/queens/validate_aodh.py'
=== target is u'../../../../helper/tests/validate_aodh.py'
=== added symlink 'specs/full_stack/next_designate_ha/queens/validate_designate.py'
=== target is u'../../../../helper/tests/validate_designate.py'
=== modified file 'specs/full_stack/next_dvr/kilo/manifest'
--- specs/full_stack/next_dvr/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_dvr/liberty/manifest'
--- specs/full_stack/next_dvr/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_dvr/mitaka/manifest'
--- specs/full_stack/next_dvr/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_dvr/newton/manifest'
--- specs/full_stack/next_dvr/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/newton/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_dvr/ocata/manifest'
--- specs/full_stack/next_dvr/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== modified file 'specs/full_stack/next_dvr/pike/manifest'
--- specs/full_stack/next_dvr/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_dvr/pike/manifest	2018-03-20 11:51:13 +0000
@@ -16,7 +16,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * trusty instance on the overcloud
-verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
 
 # Success

=== added directory 'specs/full_stack/next_dvr/queens'
=== added file 'specs/full_stack/next_dvr/queens/SPEC_INFO.txt'
--- specs/full_stack/next_dvr/queens/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_dvr/queens/SPEC_INFO.txt	2018-03-20 11:51:13 +0000
@@ -0,0 +1,1 @@
+This spec deploys and tests a deployment with neutron DVR enabled

=== added symlink 'specs/full_stack/next_dvr/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_dvr/queens/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_dvr/queens/full-dvr-next.yaml'
=== target is u'../../../../helper/bundles/full-dvr-next.yaml'
=== added symlink 'specs/full_stack/next_dvr/queens/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_dvr/queens/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_dvr/queens/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_dvr/queens/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_dvr/queens/manifest'
--- specs/full_stack/next_dvr/queens/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_dvr/queens/manifest	2018-03-20 11:51:13 +0000
@@ -0,0 +1,22 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Use juju deployer with full.yaml bundle
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-queens
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py NET_TOPOLOGY="dvr"
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="600"
+
+# Success

=== added symlink 'specs/full_stack/next_dvr/queens/network.yaml'
=== target is u'../../../../helper/setup/network_dvr.yaml'
=== added symlink 'specs/full_stack/next_dvr/queens/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_dvr/queens/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_dvr/queens/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/next_ha_oneshot/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest'
--- specs/full_stack/next_ha_oneshot/icehouse/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/icehouse/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest'
--- specs/full_stack/next_ha_oneshot/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest'
--- specs/full_stack/next_ha_oneshot/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
--- specs/full_stack/next_ha_oneshot/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/newton/manifest'
--- specs/full_stack/next_ha_oneshot/newton/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/newton/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
--- specs/full_stack/next_ha_oneshot/ocata/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/pike/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/pike/manifest'
--- specs/full_stack/next_ha_oneshot/pike/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_oneshot/pike/manifest	2018-03-20 11:51:13 +0000
@@ -7,6 +7,9 @@
 # Use juju deployer to create the units for the deployment
 deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
 # Create sdn on overcloud
 script config=network_setup.py
 
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== added symlink 'specs/full_stack/next_ha_oneshot/queens/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== modified file 'specs/full_stack/next_ha_oneshot/queens/manifest'
--- specs/full_stack/next_ha_oneshot/queens/manifest	2018-02-16 13:10:44 +0000
+++ specs/full_stack/next_ha_oneshot/queens/manifest	2018-03-20 11:51:13 +0000
@@ -5,7 +5,10 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-queens-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-queens-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
 
 # Create sdn on overcloud
 script config=network_setup.py
@@ -16,8 +19,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py

=== modified file 'specs/full_stack/next_ha_vrrp/kilo/manifest'
--- specs/full_stack/next_ha_vrrp/kilo/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_vrrp/kilo/manifest	2018-03-20 11:51:13 +0000
@@ -16,8 +16,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test guest connectivity after stopping and starting gateway
 verify config=test_vrrp_ha.py

=== modified file 'specs/full_stack/next_ha_vrrp/liberty/manifest'
--- specs/full_stack/next_ha_vrrp/liberty/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_vrrp/liberty/manifest	2018-03-20 11:51:13 +0000
@@ -16,8 +16,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:2' CLOUDINIT_WAIT="600"
 
 # Test guest connectivity after stopping and starting gateway
 verify config=test_vrrp_ha.py

=== modified file 'specs/full_stack/next_ha_vrrp/mitaka/manifest'
--- specs/full_stack/next_ha_vrrp/mitaka/manifest	2018-02-15 15:15:40 +0000
+++ specs/full_stack/next_ha_vrrp/mitaka/manifest	2018-03-20 11:51:13 +0000
@@ -16,8 +16,8 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
-verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+# Launch instances on the overcloud