Merge lp:~1chb1n/openstack-mojo-specs/metal-ocata-init into lp:openstack-mojo-specs

[Ryan Beisner]

Add Ocata to the automated specs
- Non-ha metal, ksv3, ssl specs
- Object storage specs
- Clean up identical collect files
- Update spec summaries

Add Ocata to the automated specs
- Non-ha metal, ksv3, ssl specs
- Object storage specs
- Clean up identical collect files
- Update spec summaries

[Dmitrii Shcherbakov (dmitriis)]

LGTM

review: Approve

[David Ames (thedac)]

Two trivial requests:

Around line 440 wily is getting added. Is that necessary or just copy paste?

There is also a couple of extra newlines near 1057

review: Needs Fixing

[lp:~1chb1n/openstack-mojo-specs/metal-ocata-init]

300. By Ryan Beisner on 2017-02-14

Remove EOL Wily and Juno targets, clean up extra newlines

[Ryan Beisner (1chb1n)]

Thanks for the review.

Newlines were existing in all stable_deploy_ssl/*/manifest files, and survived my copy/paste/replace for Ocata. I've removed those. Same for the Wily cruft. :-)

=== modified file 'SPEC_SUMMARY.txt'
--- SPEC_SUMMARY.txt	2016-12-09 03:50:29 +0000
+++ SPEC_SUMMARY.txt	2017-02-14 02:06:30 +0000
@@ -42,6 +42,10 @@
 This spec deploys a swift cluster fronted by a single swift proxy. The
 resulting object store is then tested.
 
+./specs/object_storage/swift_proxy/simple_nonha/ocata/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
 ./specs/object_storage/swift_proxy/simple_nonha/kilo/
 This spec deploys a swift cluster fronted by a single swift proxy. The
 resulting object store is then tested.
@@ -126,6 +130,11 @@
 The cluster is then tested with mulitple object store gets and retrivals.
 Glance integeration is also tested.
 
+./specs/object_storage/ceph_radosgw/simple_nonha/ocata/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
 ./specs/object_storage/ceph_radosgw/simple_nonha/kilo/
 This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
 The cluster is then tested with mulitple object store gets and retrivals.
@@ -151,6 +160,11 @@
 The rados gw leader is removed and additional units added. With tests run
 after each change
 
+./specs/object_storage/ceph_radosgw/ha/ocata/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
 ./specs/object_storage/ceph_radosgw/ha/kilo/
 This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
 The rados gw leader is removed and additional units added. With tests run
@@ -209,6 +223,9 @@
 This spec performs a minimalist OpenStack deploy using the stable charms,
 generally useful for validating MOJO itself, or other tooling.
 
+./specs/dev/magpie_lxc_baremetal/
+Deploys magpie which checks peers are reachable by icmp, and that peer name resolution is sane, forward and reverse.
+
 ./specs/dev/magpie/
 Deploys magpie which checks peers are reachable by icmp, and that peer name resolution is sane, forward and reverse.
 
@@ -245,6 +262,10 @@
 This spec performs a non-ha deploy using the next charms and then runs tests
 to validate the deployment
 
+./specs/full_stack/next_deploy/ocata/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
 ./specs/full_stack/next_deploy/kilo/
 This spec performs a non-ha deploy using the next charms and then runs tests
 to validate the deployment
@@ -264,6 +285,16 @@
 validate the deployment. The assumption is that the version of juju has
 leadership enabled.
 
+./specs/full_stack/next_ha_oneshot/newton/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/next_ha_oneshot/ocata/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
 ./specs/full_stack/next_ha_oneshot/kilo/
 This spec performs a ha deploy in one shot (not phased) then runs tests to
 validate the deployment. The assumption is that the version of juju has
@@ -305,6 +336,10 @@
 This spec performs a non-ha deploy using the next charms wil ssl enabled
 and then runs tests to validate the deployment
 
+./specs/full_stack/next_deploy_ssl/ocata/
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment
+
 ./specs/full_stack/next_deploy_ssl/kilo/
 This spec performs a non-ha deploy using the next charms wil ssl enabled
 and then runs tests to validate the deployment
@@ -359,6 +394,18 @@
 roughly equivalent to the next/default yamls.  As swift is the object store,
 ceph-radosgw is not exercised.
 
+./specs/full_stack/stable_deploy_baremetal/newton/
+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.
+
+./specs/full_stack/stable_deploy_baremetal/ocata/
+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.
+
 ./specs/full_stack/stable_deploy_baremetal/kilo/
 This KILO 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
@@ -399,6 +446,12 @@
 ./specs/full_stack/next_dvr/mitaka/
 This spec deploys and tests a deployment with neutron DVR enabled
 
+./specs/full_stack/next_dvr/newton/
+This spec deploys and tests a deployment with neutron DVR enabled
+
+./specs/full_stack/next_dvr/ocata/
+This spec deploys and tests a deployment with neutron DVR enabled
+
 ./specs/full_stack/next_dvr/kilo/
 This spec deploys and tests a deployment with neutron DVR enabled
 
@@ -426,12 +479,22 @@
 roughly equivalent to the next/default yamls.  As swift is the object store,
 ceph-radosgw is not exercised.
 
+./specs/full_stack/next_deploy_baremetal/ocata/
+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.
+
 ./specs/full_stack/next_deploy_baremetal/kilo/
 This KILO 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.
 
+./specs/full_stack/stable_deploy_tempest/newton/
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment
+
 ./specs/full_stack/stable_deploy/liberty/
 This spec performs a non-ha deploy using the stable charms and then runs tests
 to validate the deployment
@@ -444,6 +507,14 @@
 This spec performs a non-ha deploy using the stable charms and then runs tests
 to validate the deployment
 
+./specs/full_stack/stable_deploy/newton/
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment
+
+./specs/full_stack/stable_deploy/ocata/
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment
+
 ./specs/full_stack/stable_deploy/kilo/
 This spec performs a non-ha deploy using the stable charms and then runs tests
 to validate the deployment
@@ -464,6 +535,10 @@
 This spec performs a non-ha deploy using the stable charms wil ssl enabled
 and then runs tests to validate the deployment
 
+./specs/full_stack/stable_deploy_ssl/ocata/
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment
+
 ./specs/full_stack/stable_deploy_ssl/kilo/
 This spec performs a non-ha deploy using the stable charms wil ssl enabled
 and then runs tests to validate the deployment
@@ -484,6 +559,14 @@
 This spec deploys and tests a deployment with neutron VRRP enabled, it then
 takes down the gateways in turn and checks a guest remains accessible
 
+./specs/full_stack/next_ha_vrrp/newton/
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible
+
+./specs/full_stack/next_ha_vrrp/ocata/
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible
+
 ./specs/full_stack/next_ha_vrrp/kilo/
 This spec deploys and tests a deployment with neutron VRRP enabled, it then
 takes down the gateways in turn and checks a guest remains accessible

=== modified file 'helper/bundles/baremetal7-next.yaml'
--- helper/bundles/baremetal7-next.yaml	2017-02-08 05:07:19 +0000
+++ helper/bundles/baremetal7-next.yaml	2017-02-14 02:06:30 +0000
@@ -355,3 +355,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-proposed/ocata
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'helper/bundles/baremetal7.yaml'
--- helper/bundles/baremetal7.yaml	2017-02-08 05:12:32 +0000
+++ helper/bundles/baremetal7.yaml	2017-02-14 02:06:30 +0000
@@ -355,3 +355,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-proposed/ocata
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/ceph-default.yaml'
--- helper/bundles/ceph-default.yaml	2016-09-27 05:11:38 +0000
+++ helper/bundles/ceph-default.yaml	2017-02-14 02:06:30 +0000
@@ -49,3 +49,13 @@
 yakkety-newton:
   inherits: base
   series: yakkety
+# ocata
+xenial-ocata:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: base
+  series: zesty
+

=== modified file 'helper/bundles/cephradosgw-ha.yaml'
--- helper/bundles/cephradosgw-ha.yaml	2016-09-27 05:11:38 +0000
+++ helper/bundles/cephradosgw-ha.yaml	2017-02-14 02:06:30 +0000
@@ -68,3 +68,16 @@
   series: yakkety
   overrides:
     ha-bindiface: ens2
+xenial-ocata:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    ha-bindiface: ens2
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty
+  overrides:
+    ha-bindiface: ens2
+

=== modified file 'helper/bundles/cephradosgw.yaml'
--- helper/bundles/cephradosgw.yaml	2016-09-22 21:25:04 +0000
+++ helper/bundles/cephradosgw.yaml	2017-02-14 02:06:30 +0000
@@ -83,3 +83,12 @@
 yakkety-newton:
   inherits: openstack-services
   series: yakkety
+xenial-ocata:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty

=== modified file 'helper/bundles/full-dvr-next.yaml'
--- helper/bundles/full-dvr-next.yaml	2017-02-10 11:39:34 +0000
+++ helper/bundles/full-dvr-next.yaml	2017-02-14 02:06:30 +0000
@@ -225,14 +225,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse

=== modified file 'helper/bundles/full-next.yaml'
--- helper/bundles/full-next.yaml	2017-02-10 11:39:34 +0000
+++ helper/bundles/full-next.yaml	2017-02-14 02:06:30 +0000
@@ -211,12 +211,6 @@
     openstack-origin: ppa:openstack-ubuntu-testing/icehouse
     source: ppa:openstack-ubuntu-testing/icehouse
     offline-compression: "no"
-trusty-juno:
-  inherits: openstack-icehouse
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-juno
-    source: cloud:trusty-juno
 # kilo
 trusty-kilo:
   inherits: openstack-icehouse
@@ -251,14 +245,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse

=== modified file 'helper/bundles/full-ssl-next.yaml'
--- helper/bundles/full-ssl-next.yaml	2016-10-05 20:30:40 +0000
+++ helper/bundles/full-ssl-next.yaml	2017-02-14 02:06:30 +0000
@@ -249,14 +249,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse
@@ -307,3 +299,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-proposed/ocata
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/full-ssl.yaml'
--- helper/bundles/full-ssl.yaml	2016-10-07 02:54:09 +0000
+++ helper/bundles/full-ssl.yaml	2017-02-14 02:06:30 +0000
@@ -1,7 +1,4 @@
 # vim: set ts=2 et:
-#
-# Config and topology for STABLE charms
-#
 openstack-services:
   services:
     mysql:
@@ -47,12 +44,13 @@
       charm: nova-cloud-controller
       constraints: mem=1G
       options:
-        network-manager: Quantum
+        network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
       constraints: mem=4G
       options:
         instance-mtu: 1300
+        bridge-mappings: physnet1:br-ex
     cinder:
       charm: cinder
       options:
@@ -142,6 +140,7 @@
       constraints: mem=1G
       options:
         neutron-security-groups: True
+        flat-network-providers: physnet1
     neutron-openvswitch:
       charm: neutron-openvswitch
   relations:
@@ -179,7 +178,7 @@
   - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
 # icehouse
 precise-icehouse:
-  inherits: openstack-singlerabbit
+  inherits: openstack-icehouse
   series: precise
   overrides:
     openstack-origin: cloud:precise-icehouse
@@ -257,9 +256,24 @@
   overrides:
     openstack-origin: cloud:trusty-mitaka
     source: cloud:trusty-mitaka
+trusty-mitaka-proposed:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+trusty-mitaka-staging:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
+    source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
   inherits: openstack-icehouse
   series: xenial
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
 # newton
 xenial-newton:
   inherits: openstack-icehouse
@@ -267,6 +281,46 @@
   overrides:
     openstack-origin: cloud:xenial-newton
     source: cloud:xenial-newton
+xenial-newton-proposed:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: cloud:xenial-newton/proposed
+    source: cloud:xenial-proposed/newton
+xenial-newton-staging:
+  inherits: xenial-newton
+  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
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-proposed/ocata
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2017-02-10 11:39:34 +0000
+++ helper/bundles/full.yaml	2017-02-14 02:06:30 +0000
@@ -252,14 +252,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse

=== modified file 'helper/bundles/haphase1-next.yaml'
--- helper/bundles/haphase1-next.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/haphase1-next.yaml	2017-02-14 02:06:30 +0000
@@ -202,13 +202,3 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits:
-  - openstack-neutron-api
-  - openstack-mysql-database
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed

=== modified file 'helper/bundles/haphase2-next.yaml'
--- helper/bundles/haphase2-next.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/haphase2-next.yaml	2017-02-14 02:06:30 +0000
@@ -256,13 +256,3 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits:
-  - openstack-neutron-api
-  - openstack-mysql-database
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed

=== modified file 'helper/bundles/ksv3-full-next.yaml'
--- helper/bundles/ksv3-full-next.yaml	2016-10-05 17:49:53 +0000
+++ helper/bundles/ksv3-full-next.yaml	2017-02-14 02:06:30 +0000
@@ -262,17 +262,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse

=== modified file 'helper/bundles/ksv3-full.yaml'
--- helper/bundles/ksv3-full.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/ksv3-full.yaml	2017-02-14 02:06:30 +0000
@@ -262,17 +262,6 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
   inherits: openstack-icehouse

=== modified file 'helper/bundles/minimal-next.yaml'
--- helper/bundles/minimal-next.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/minimal-next.yaml	2017-02-14 02:06:30 +0000
@@ -184,12 +184,3 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
-wily-liberty:
-  inherits: openstack-icehouse
-  series: wily
-wily-liberty-proposed:
-  inherits: wily-liberty
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
-

=== modified file 'helper/bundles/ovs-odl.yaml'
--- helper/bundles/ovs-odl.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/ovs-odl.yaml	2017-02-14 02:06:30 +0000
@@ -100,10 +100,6 @@
   inherits: openstack-services
   overrides:
     openstack-origin: cloud:trusty-kilo
-trusty-juno:
-  inherits: openstack-services
-  overrides:
-    openstack-origin: cloud:trusty-juno
 trusty-icehouse:
   inherits: openstack-services
 trusty-icehouse-cisco:

=== modified file 'helper/bundles/swift-proxy.yaml'
--- helper/bundles/swift-proxy.yaml	2016-09-22 21:25:04 +0000
+++ helper/bundles/swift-proxy.yaml	2017-02-14 02:06:30 +0000
@@ -93,3 +93,12 @@
 yakkety-newton:
   inherits: openstack-services
   series: yakkety
+xenial-ocata:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty

=== added symlink 'helper/collect/collect-next-yakkety'
=== target is u'collect-next-xenial'
=== removed file 'helper/collect/collect-next-yakkety'
--- helper/collect/collect-next-yakkety	2017-02-10 22:42:46 +0000
+++ helper/collect/collect-next-yakkety	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-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-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                cs:trusty/mongodb
-mysql                  cs:~openstack-charmers-next/percona-cluster
-neutron-api            cs:~openstack-charmers-next/neutron-api
-neutron-gateway        cs:~openstack-charmers-next/neutron-gateway
-neutron-openvswitch    cs:~openstack-charmers-next/neutron-openvswitch
-nova-cloud-controller  cs:~openstack-charmers-next/nova-cloud-controller
-nova-compute           cs:~openstack-charmers-next/nova-compute
-ntp                    cs:xenial/ntp
-openstack-dashboard    cs:~openstack-charmers-next/openstack-dashboard
-rabbitmq-server        cs:~openstack-charmers-next/rabbitmq-server
-swift-proxy            cs:~openstack-charmers-next/swift-proxy
-swift-storage          cs:~openstack-charmers-next/swift-storage
-tempest                cs:~openstack-charmers-next/tempest

=== added symlink 'helper/collect/collect-next-zesty'
=== target is u'collect-next-xenial'
=== added symlink 'helper/collect/collect-stable-yakkety'
=== target is u'collect-stable-xenial'
=== removed file 'helper/collect/collect-stable-yakkety'
--- helper/collect/collect-stable-yakkety	2017-02-10 22:42:46 +0000
+++ helper/collect/collect-stable-yakkety	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-ceilometer-agent       git://github.com/openstack/charm-ceilometer-agent
-ceilometer             git://github.com/openstack/charm-ceilometer
-ceph                   git://github.com/openstack/charm-ceph
-ceph-osd               git://github.com/openstack/charm-ceph-osd
-cinder-ceph            git://github.com/openstack/charm-cinder-ceph
-cinder                 git://github.com/openstack/charm-cinder
-glance                 git://github.com/openstack/charm-glance
-heat                   git://github.com/openstack/charm-heat
-keystone               git://github.com/openstack/charm-keystone
-mongodb                lp:charms/trusty/mongodb
-mysql                  git://github.com/openstack/charm-percona-cluster
-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
-nova-cloud-controller  git://github.com/openstack/charm-nova-cloud-controller
-nova-compute           git://github.com/openstack/charm-nova-compute
-ntp                    lp:charms/trusty/ntp
-openstack-dashboard    git://github.com/openstack/charm-openstack-dashboard
-rabbitmq-server        git://github.com/openstack/charm-rabbitmq-server
-swift-proxy            git://github.com/openstack/charm-swift-proxy
-swift-storage          git://github.com/openstack/charm-swift-storage
-tempest                cs:~openstack-charmers-next/tempest

=== added symlink 'helper/collect/collect-stable-zesty'
=== target is u'collect-stable-xenial'
=== added directory 'specs/full_stack/next_deploy/ocata'
=== added file 'specs/full_stack/next_deploy/ocata/SPEC_INFO.txt'
--- specs/full_stack/next_deploy/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/next_deploy/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy/ocata/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy/ocata/collect-next-zesty'
=== target is u'../../../../helper/collect/collect-next-zesty'
=== added symlink 'specs/full_stack/next_deploy/ocata/full.yaml'
=== target is u'../../../../helper/bundles/full-next.yaml'
=== added symlink 'specs/full_stack/next_deploy/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy/ocata/manifest'
--- specs/full_stack/next_deploy/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/ocata/manifest	2017-02-14 02:06:30 +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 config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy/ocata/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_baremetal/ocata'
=== added file 'specs/full_stack/next_deploy_baremetal/ocata/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_baremetal/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +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/ocata/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/collect-next-zesty'
=== target is u'../../../../helper/collect/collect-next-zesty'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_baremetal/ocata/manifest'
--- specs/full_stack/next_deploy_baremetal/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/ocata/manifest	2017-02-14 02:06:30 +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 config=baremetal7.yaml delay=0 timeout=4500 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# Create and check instances on the deployed cloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/scripts'
=== target is u'../../../../helper/scripts/'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/ocata/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_ssl/ocata'
=== added file 'specs/full_stack/next_deploy_ssl/ocata/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_ssl/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +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/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-xenial'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/collect-next-zesty'
=== target is u'../../../../helper/collect/collect-next-zesty'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/full-ssl.yaml'
=== target is u'../../../../helper/bundles/full-ssl-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_ssl/ocata/manifest'
--- specs/full_stack/next_deploy_ssl/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/ocata/manifest	2017-02-14 02:06:30 +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 config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/ocata/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy/newton'
=== added file 'specs/full_stack/stable_deploy/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/newton/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/stable_deploy/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy/newton/collect-stable-yakkety'
=== target is u'../../../../helper/collect/collect-stable-yakkety'
=== added symlink 'specs/full_stack/stable_deploy/newton/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/newton/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/newton/manifest'
--- specs/full_stack/stable_deploy/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/newton/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,26 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-newton
+
+# 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
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy/newton/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/newton/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy/ocata'
=== added file 'specs/full_stack/stable_deploy/ocata/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/stable_deploy/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy/ocata/collect-stable-zesty'
=== target is u'../../../../helper/collect/collect-stable-zesty'
=== added symlink 'specs/full_stack/stable_deploy/ocata/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/ocata/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/ocata/manifest'
--- specs/full_stack/stable_deploy/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,26 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/ocata/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal/newton'
=== added file 'specs/full_stack/stable_deploy_baremetal/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/newton/SPEC_INFO.txt	2017-02-14 02:06:30 +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/stable_deploy_baremetal/newton/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/collect-stable-yakkety'
=== target is u'../../../../helper/collect/collect-stable-yakkety'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/newton/manifest'
--- specs/full_stack/stable_deploy_baremetal/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/newton/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,33 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# 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
+# FYI: Env vars are lost if lxc is not False.
+script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
+
+# Use juju deployer with baremetal7.yaml bundle
+deploy config=baremetal7.yaml delay=0 timeout=4500 wait=True target=${MOJO_SERIES}-newton
+
+# 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
+
+# Create and check instances on the deployed cloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/newton/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal/ocata'
=== added file 'specs/full_stack/stable_deploy_baremetal/ocata/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +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/stable_deploy_baremetal/ocata/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/collect-stable-zesty'
=== target is u'../../../../helper/collect/collect-stable-zesty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/ocata/manifest'
--- specs/full_stack/stable_deploy_baremetal/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,33 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# 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
+# FYI: Env vars are lost if lxc is not False.
+script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
+
+# Use juju deployer with baremetal7.yaml bundle
+deploy config=baremetal7.yaml delay=0 timeout=4500 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# Create and check instances on the deployed cloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/ocata/utils'
=== target is u'../../../../helper/utils'
=== modified file 'specs/full_stack/stable_deploy_ssl/icehouse/manifest'
--- specs/full_stack/stable_deploy_ssl/icehouse/manifest	2016-04-12 16:45:46 +0000
+++ specs/full_stack/stable_deploy_ssl/icehouse/manifest	2017-02-14 02:06:30 +0000
@@ -4,7 +4,6 @@
 # Checkout stable
 script config=git_checkout_stable.py
 
-
 # Use juju deployer with full.yaml bundle
 deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
 

=== modified file 'specs/full_stack/stable_deploy_ssl/kilo/manifest'
--- specs/full_stack/stable_deploy_ssl/kilo/manifest	2016-04-12 16:45:46 +0000
+++ specs/full_stack/stable_deploy_ssl/kilo/manifest	2017-02-14 02:06:30 +0000
@@ -4,7 +4,6 @@
 # Checkout stable
 script config=git_checkout_stable.py
 
-
 # Use juju deployer with full.yaml bundle
 deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo
 

=== modified file 'specs/full_stack/stable_deploy_ssl/liberty/manifest'
--- specs/full_stack/stable_deploy_ssl/liberty/manifest	2016-04-12 16:45:46 +0000
+++ specs/full_stack/stable_deploy_ssl/liberty/manifest	2017-02-14 02:06:30 +0000
@@ -4,7 +4,6 @@
 # Checkout stable
 script config=git_checkout_stable.py
 
-
 # Use juju deployer with full.yaml bundle
 deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
 

=== modified file 'specs/full_stack/stable_deploy_ssl/mitaka/manifest'
--- specs/full_stack/stable_deploy_ssl/mitaka/manifest	2016-09-27 18:05:20 +0000
+++ specs/full_stack/stable_deploy_ssl/mitaka/manifest	2017-02-14 02:06:30 +0000
@@ -4,7 +4,6 @@
 # Checkout stable
 script config=git_checkout_stable.py
 
-
 # Use juju deployer with full.yaml bundle
 deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka
 

=== modified file 'specs/full_stack/stable_deploy_ssl/newton/manifest'
--- specs/full_stack/stable_deploy_ssl/newton/manifest	2016-10-05 21:20:34 +0000
+++ specs/full_stack/stable_deploy_ssl/newton/manifest	2017-02-14 02:06:30 +0000
@@ -4,7 +4,6 @@
 # Checkout stable
 script config=git_checkout_stable.py
 
-
 # Use juju deployer with full.yaml bundle
 deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-newton
 

=== added directory 'specs/full_stack/stable_deploy_ssl/ocata'
=== added file 'specs/full_stack/stable_deploy_ssl/ocata/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_ssl/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_ssl/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/collect-stable-zesty'
=== target is u'../../../../helper/collect/collect-stable-zesty'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/full-ssl.yaml'
=== target is u'../../../../helper/bundles/full-ssl.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_ssl/ocata/manifest'
--- specs/full_stack/stable_deploy_ssl/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_ssl/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+# Use juju deployer with full.yaml bundle
+deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# 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
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/ocata/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/ha/ocata'
=== added file 'specs/object_storage/ceph_radosgw/ha/ocata/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/ha/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/ha/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change

=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/add_unit.py'
=== target is u'../../../../../helper/setup/add_unit.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/cephradosgw-ha.yaml'
=== target is u'../../../../../helper/bundles/cephradosgw-ha.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/collect-next-cephradosgw-ha'
=== target is u'../../../../../helper/collect/collect-next-cephradosgw-ha'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/delete_crm_leader.py'
=== target is u'../../../../../helper/setup/delete_crm_leader.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/ceph_radosgw/ha/ocata/manifest'
--- specs/object_storage/ceph_radosgw/ha/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/ha/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,34 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-cephradosgw-ha
+
+# Use juju deployer with cephradosgw-ha.yaml bundle
+deploy config=cephradosgw-ha.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Delete the unit which is currently the leader (according to corosync)
+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add 2 new ceph-radosgw units
+script config=add_unit.py UNITS='ceph-radosgw:2'
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Switch to using the ceph-radosgw embedded webserver
+script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/ocata/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/simple_nonha/ocata'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/simple_nonha/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/cephradosgw.yaml'
=== target is u'../../../../../helper/bundles/cephradosgw.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/collect-next-cephradosgw'
=== target is u'../../../../../helper/collect/collect-next-cephradosgw'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/manifest'
--- specs/object_storage/ceph_radosgw/simple_nonha/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,19 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-cephradosgw
+
+# Use juju deployer with cephradosgw-ha.yaml bundle
+deploy config=cephradosgw.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/ocata/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/simple_nonha/ocata'
=== added file 'specs/object_storage/swift_proxy/simple_nonha/ocata/SPEC_INFO.txt'
--- specs/object_storage/swift_proxy/simple_nonha/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/simple_nonha/ocata/SPEC_INFO.txt	2017-02-14 02:06:30 +0000
@@ -0,0 +1,2 @@
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.

=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/collect-next-swift-proxy'
=== target is u'../../../../../helper/collect/collect-next-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/swift_proxy/simple_nonha/ocata/manifest'
--- specs/object_storage/swift_proxy/simple_nonha/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/simple_nonha/ocata/manifest	2017-02-14 02:06:30 +0000
@@ -0,0 +1,22 @@
+# Collect the charm branches from Launchpad 
+collect config=collect-next-swift-proxy
+
+# Use juju deployer with cephradosgw-ha.yaml bundle
+deploy config=swift-proxy.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/swift-proxy.yaml'
=== target is u'../../../../../helper/bundles/swift-proxy.yaml'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/ocata/utils'
=== target is u'../../../../../helper/utils'