Merge lp:~1chb1n/openstack-mojo-specs/baremetal-bundle-constrainer into lp:openstack-mojo-specs

[Ryan Beisner]

* Add stand-alone bundle_constrainer.py tool from uosci and a juju/maas tag injection script; adjust baremetal specs to inject maas tags where applicable.

* Rename quantum-gateway to neutron-gateway in bundles.

* Teach mojo_utils to consume optional network environment variables, as are used by o-c-t and uosci.

* Extend lint and spec sanity checks;

* Enable per-series collect configs in full_stack specs; This is necessary as some charm branches need to be different for some series (ex: percona-cluster != precise).

* Update juju status to force yaml output, in prep for eventual default format change.

* Replace mysql charm branches with percona-cluster.

* Sort collect and repo files for sanity.

* Add stable_deploy_baremetal specs.

* Prep for Wily and Liberty.

* Update spec summaries.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7267 mojo-openstack-specs for 1chb1n mp264558
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7267/

[lp:~1chb1n/openstack-mojo-specs/baremetal-bundle-constrainer]

244. By Ryan Beisner on 2015-07-30

remove duplicate/errant block in bundle_constrainer

245. By Ryan Beisner on 2015-07-30

clean up commented code

246. By Ryan Beisner on 2015-07-30

addl cleanup

[Liam Young (gnuoy)]

LGTM thanks for all the work

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-02-08 18:16:10 +0000
+++ Makefile	2015-07-30 14:52:37 +0000
@@ -3,7 +3,11 @@
 
 lint:
 	@./helper/scripts/check-lint.sh
-	@flake8 helper/collect  helper/setup  helper/tests  helper/utils
+	@echo Checking lint...
+	@flake8 -v helper/collect  helper/setup  helper/tests  helper/utils
 
 gen_spec_summary:
 	@./helper/scripts/gen-spec-summary.sh > SPEC_SUMMARY.txt
+
+list_specs:
+	@./helper/scripts/list-specs.sh

=== modified file 'SPEC_SUMMARY.txt'
--- SPEC_SUMMARY.txt	2015-04-22 19:10:16 +0000
+++ SPEC_SUMMARY.txt	2015-07-30 14:52:37 +0000
@@ -86,6 +86,12 @@
 roughly equivalent to the next/default yamls.  As swift is the object store,
 ceph-radosgw is not exercised.
 
+./specs/full_stack/next_deploy_baremetal/liberty/
+This LIBERTY 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/icehouse/
 This spec performs a non-ha deploy using the next charms and then runs tests
 to validate the deployment
@@ -98,6 +104,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/liberty/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
 ./specs/full_stack/ha_phased/icehouse/
 This spec performs a phased ha deploy then runs tests to validate the
 deployment
@@ -110,6 +120,10 @@
 This spec performs a phased ha deploy then runs tests to validate the
 deployment
 
+./specs/full_stack/ha_phased/liberty/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
 ./specs/full_stack/ha_phased_chaos_pony/icehouse/
 This spec performs a phased ha deploy then runs tests to validate the
 deployment. iThen chaos pony is used to add and remove units.
@@ -122,6 +136,34 @@
 This spec performs a phased ha deploy then runs tests to validate the
 deployment. iThen chaos pony is used to add and remove units.
 
+./specs/full_stack/ha_phased_chaos_pony/liberty/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.
+
+./specs/full_stack/stable_deploy_baremetal/icehouse/
+This ICEHOUSE 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/juno/
+This JUNO 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
+roughly equivalent to the next/default yamls.  As swift is the object store,
+ceph-radosgw is not exercised.
+
+./specs/full_stack/stable_deploy_baremetal/liberty/
+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/next_deploy_ssl/icehouse/
 This spec performs a non-ha deploy using the next charms wil ssl enabled
 and then runs tests to validate the deployment
@@ -134,6 +176,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/liberty/
+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/charmhelper_upgrade/icehouse/
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a non-ha deployment and testing the resulting cloud
@@ -146,6 +192,10 @@
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a non-ha deployment and testing the resulting cloud
 
+./specs/full_stack/charmhelper_upgrade/liberty/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud
+
 ./specs/full_stack/stable_to_next/icehouse/
 This spec performs a non-ha deploy using the stable charms, then upgrades the
 charms to the devel versions and then runs tests to validate the deployment
@@ -158,6 +208,26 @@
 This spec performs a non-ha deploy using the stable charms, then upgrades the
 charms to the devel versions and then runs tests to validate the deployment
 
+./specs/full_stack/stable_to_next/liberty/
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment
+
+./specs/full_stack/stable_deploy/icehouse/
+This spec performs a non-ha deploy using the stable charms and then runs tests
+to validate the deployment
+
+./specs/full_stack/stable_deploy/juno/
+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
+
+./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
+
 ./specs/full_stack/charmhelper_upgrade_ha/icehouse/
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a ha deployment and testing the resulting cloud
@@ -170,6 +240,10 @@
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a ha deployment and testing the resulting cloud
 
+./specs/full_stack/charmhelper_upgrade_ha/liberty/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a ha deployment and testing the resulting cloud
+
 ./specs/full_stack/stable_to_next_ha/icehouse/
 This spec performs a phased ha deploy then runs tests to validate the
 deployment
@@ -182,3 +256,7 @@
 This spec performs a phased ha deploy then runs tests to validate the
 deployment
 
+./specs/full_stack/stable_to_next_ha/liberty/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+

=== modified file 'helper/bundles/baremetal7.yaml'
--- helper/bundles/baremetal7.yaml	2015-03-19 01:21:42 +0000
+++ helper/bundles/baremetal7.yaml	2015-07-30 14:52:37 +0000
@@ -90,7 +90,7 @@
       to:
         - "lxc:swift-storage-z3=0"
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       options:
         ext-port: eth1
         instance-mtu: 1300
@@ -124,7 +124,7 @@
       to:
         - "lxc:swift-storage-z3=0"
     ntp:
-      charm: "cs:trusty/ntp-6"
+      charm: ntp
       num_units: 0
 #    juju-gui:
 #      charm: juju-gui
@@ -311,3 +311,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2015-02-10 07:55:00 +0000
+++ helper/bundles/full.yaml	2015-07-30 14:52:37 +0000
@@ -43,7 +43,7 @@
         network-manager: Quantum
         quantum-security-groups: "yes"
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       options:
         instance-mtu: 1300
@@ -260,3 +260,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/full_ssl.yaml'
--- helper/bundles/full_ssl.yaml	2015-02-10 07:55:00 +0000
+++ helper/bundles/full_ssl.yaml	2015-07-30 14:52:37 +0000
@@ -47,7 +47,7 @@
         network-manager: Quantum
         quantum-security-groups: "yes"
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       options:
         instance-mtu: 1300
@@ -264,4 +264,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/haphase1.yaml'
--- helper/bundles/haphase1.yaml	2015-02-10 07:55:00 +0000
+++ helper/bundles/haphase1.yaml	2015-07-30 14:52:37 +0000
@@ -65,7 +65,7 @@
     ncc-hacluster:
       charm: hacluster
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       num_units: 2
       options:
@@ -184,4 +184,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/haphase2.yaml'
--- helper/bundles/haphase2.yaml	2015-02-10 07:55:00 +0000
+++ helper/bundles/haphase2.yaml	2015-07-30 14:52:37 +0000
@@ -65,7 +65,7 @@
     ncc-hacluster:
       charm: hacluster
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       num_units: 2
       options:
@@ -233,3 +233,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/bundles/minimal.yaml'
--- helper/bundles/minimal.yaml	2015-02-10 07:55:00 +0000
+++ helper/bundles/minimal.yaml	2015-07-30 14:52:37 +0000
@@ -30,7 +30,7 @@
         network-manager: Quantum
         quantum-security-groups: "yes"
     neutron-gateway:
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       options:
         instance-mtu: 1300
@@ -200,3 +200,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  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
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'helper/bundles/next-ha.yaml'
--- helper/bundles/next-ha.yaml	2014-12-18 12:14:28 +0000
+++ helper/bundles/next-ha.yaml	2015-07-30 14:52:37 +0000
@@ -81,7 +81,7 @@
         corosync_key: "xZP7GDWV0e8Qs0GxWThXirNNYlScgi3sRTdZk/IXKDqkNFcwdCWfRQnqrHU/6mb6sz6OIoZzX2MtfMQIDcXuPqQyvKuv7YbRyGHmQwAWDUA4ed759VWAO39kHkfWp9y5RRk/wcHakTcWYMwm70upDGJEP00YT3xem3NQy27AC1w="
     neutron-gateway:
       num_units: 2
-      charm: quantum-gateway
+      charm: neutron-gateway
       constraints: mem=1G
       options:
         instance-mtu: 1300

=== modified file 'helper/collect/collect-cephradosgw'
--- helper/collect/collect-cephradosgw	2015-01-31 15:25:37 +0000
+++ helper/collect/collect-cephradosgw	2015-07-30 14:52:37 +0000
@@ -1,6 +1,6 @@
-mysql                  lp:charms/mysql
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
 ceph-osd               lp:~openstack-charmers/charms/trusty/ceph-osd/next
-keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 ceph-radosgw           lp:~gnuoy/charms/trusty/ceph-radosgw/next-support-ha
 hacluster              lp:charms/trusty/hacluster
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+mysql                  lp:charms/trusty/percona-cluster

=== modified file 'helper/collect/collect-cephradosgw-ha'
--- helper/collect/collect-cephradosgw-ha	2015-01-31 15:25:37 +0000
+++ helper/collect/collect-cephradosgw-ha	2015-07-30 14:52:37 +0000
@@ -1,6 +1,6 @@
-mysql                  lp:charms/mysql
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
-keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 ceph-radosgw           lp:~gnuoy/charms/trusty/ceph-radosgw/next-support-ha
+hacluster              lp:charms/precise/hacluster
 #hacluster              lp:charms/trusty/hacluster
-hacluster              lp:charms/precise/hacluster
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+mysql                  lp:charms/trusty/percona-cluster

=== modified file 'helper/collect/collect-next'
--- helper/collect/collect-next	2015-04-23 01:49:58 +0000
+++ helper/collect/collect-next	2015-07-30 14:52:37 +0000
@@ -8,14 +8,14 @@
 heat                   lp:~openstack-charmers/charms/trusty/heat/next
 keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 mongodb                lp:charms/trusty/mongodb
-mysql                  lp:charms/trusty/mysql
+mysql                  lp:~openstack-charmers/charms/trusty/percona-cluster/next
 neutron-api            lp:~openstack-charmers/charms/trusty/neutron-api/next
+neutron-gateway        lp:~openstack-charmers/charms/trusty/neutron-gateway/next
 neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
 nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
 nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
 ntp                    lp:charms/trusty/ntp
 openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
 rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
 swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
 swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next

=== modified file 'helper/collect/collect-next-ha'
--- helper/collect/collect-next-ha	2015-04-20 13:40:47 +0000
+++ helper/collect/collect-next-ha	2015-07-30 14:52:37 +0000
@@ -1,20 +1,20 @@
-percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
-hacluster              lp:~gnuoy/charms/trusty/hacluster/charmhelper_sync
-rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
-keystone               lp:~openstack-charmers/charms/trusty/keystone/next
-openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
-nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
 cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
 glance                 lp:~openstack-charmers/charms/trusty/glance/next
-swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
-swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
-ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
-ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+hacluster              lp:~gnuoy/charms/trusty/hacluster/charmhelper_sync
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 mongodb                lp:charms/mongodb
 neutron-api            lp:~openstack-charmers/charms/trusty/neutron-api/next
+neutron-gateway        lp:~openstack-charmers/charms/trusty/neutron-gateway/next
 neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
-heat                   lp:~openstack-charmers/charms/trusty/heat/next
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next

=== added file 'helper/collect/collect-next-precise'
--- helper/collect/collect-next-precise	1970-01-01 00:00:00 +0000
+++ helper/collect/collect-next-precise	2015-07-30 14:52:37 +0000
@@ -0,0 +1,21 @@
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
+ceph-osd               lp:~openstack-charmers/charms/trusty/ceph-osd/next
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
+glance                 lp:~openstack-charmers/charms/trusty/glance/next
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+mongodb                lp:charms/trusty/mongodb
+mysql                  lp:charms/trusty/mysql
+neutron-api            lp:~openstack-charmers/charms/trusty/neutron-api/next
+neutron-gateway        lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+ntp                    lp:charms/trusty/ntp
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next

=== modified file 'helper/collect/collect-stable-ha-precise'
--- helper/collect/collect-stable-ha-precise	2015-04-22 08:20:57 +0000
+++ helper/collect/collect-stable-ha-precise	2015-07-30 14:52:37 +0000
@@ -1,21 +1,21 @@
-#percona-cluster        lp:~openstack-charmers/charms/precise/percona-cluster/trunk
-percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+ceilometer-agent       lp:charms/precise/ceilometer-agent
+ceilometer             lp:charms/precise/ceilometer
+ceph                   lp:charms/precise/ceph
+cinder-ceph            lp:charms/precise/cinder-ceph
+cinder                 lp:charms/precise/cinder
+glance                 lp:charms/precise/glance
 hacluster              lp:charms/precise/hacluster
-rabbitmq-server        lp:charms/precise/rabbitmq-server
-ceph                   lp:charms/precise/ceph
+heat                   lp:charms/precise/heat
 keystone               lp:charms/precise/keystone
+mongodb                lp:charms/mongodb
+neutron-api            lp:charms/precise/neutron-api
+neutron-openvswitch    lp:charms/precise/neutron-openvswitch
+nova-cloud-controller  lp:charms/precise/nova-cloud-controller
+nova-compute           lp:charms/precise/nova-compute
 openstack-dashboard    lp:charms/precise/openstack-dashboard
-nova-compute           lp:charms/precise/nova-compute
-nova-cloud-controller  lp:charms/precise/nova-cloud-controller
+#percona-cluster        lp:~openstack-charmers/charms/precise/percona-cluster/trunk
+percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
 quantum-gateway        lp:charms/precise/quantum-gateway
-cinder                 lp:charms/precise/cinder
-glance                 lp:charms/precise/glance
+rabbitmq-server        lp:charms/precise/rabbitmq-server
 swift-proxy            lp:charms/precise/swift-proxy
 swift-storage          lp:charms/precise/swift-storage
-ceilometer             lp:charms/precise/ceilometer
-ceilometer-agent       lp:charms/precise/ceilometer-agent
-mongodb                lp:charms/mongodb
-neutron-api            lp:charms/precise/neutron-api
-neutron-openvswitch    lp:charms/precise/neutron-openvswitch
-cinder-ceph            lp:charms/precise/cinder-ceph
-heat                   lp:charms/precise/heat

=== modified file 'helper/collect/collect-stable-ha-trusty'
--- helper/collect/collect-stable-ha-trusty	2015-04-20 11:10:36 +0000
+++ helper/collect/collect-stable-ha-trusty	2015-07-30 14:52:37 +0000
@@ -1,21 +1,21 @@
-percona-cluster        lp:charms/trusty/percona-cluster
+# FYI nosmart usages is re: bug 1161018 bzr revno fails on ghost ancestry
+ceilometer-agent       nosmart+lp:charms/trusty/ceilometer-agent
+ceilometer             nosmart+lp:charms/trusty/ceilometer
+ceph                   lp:charms/trusty/ceph
+cinder-ceph            lp:charms/trusty/cinder-ceph
+cinder                 lp:charms/trusty/cinder
+glance                 nosmart+lp:charms/trusty/glance
 hacluster              lp:charms/trusty/hacluster
-rabbitmq-server        lp:charms/trusty/rabbitmq-server
-ceph                   lp:charms/trusty/ceph
+heat                   nosmart+lp:charms/trusty/heat
 keystone               lp:charms/trusty/keystone
-nova-compute           lp:charms/trusty/nova-compute
-cinder                 lp:charms/trusty/cinder
-swift-storage          lp:charms/trusty/swift-storage
 mongodb                lp:charms/mongodb
 neutron-api            lp:charms/trusty/neutron-api
-cinder-ceph            lp:charms/trusty/cinder-ceph
-# Bug 1161018 bzr revno fails on ghost ancestry
+neutron-gateway        nosmart+lp:charms/trusty/quantum-gateway
+neutron-openvswitch    nosmart+lp:charms/trusty/neutron-openvswitch
+nova-cloud-controller  nosmart+lp:charms/trusty/nova-cloud-controller
+nova-compute           lp:charms/trusty/nova-compute
 openstack-dashboard    nosmart+lp:charms/trusty/openstack-dashboard
-ceilometer             nosmart+lp:charms/trusty/ceilometer
-ceilometer-agent       nosmart+lp:charms/trusty/ceilometer-agent
-glance                 nosmart+lp:charms/trusty/glance
-heat                   nosmart+lp:charms/trusty/heat
+percona-cluster        lp:charms/trusty/percona-cluster
+rabbitmq-server        lp:charms/trusty/rabbitmq-server
 swift-proxy            nosmart+lp:charms/trusty/swift-proxy
-quantum-gateway        nosmart+lp:charms/trusty/quantum-gateway
-neutron-openvswitch    nosmart+lp:charms/trusty/neutron-openvswitch
-nova-cloud-controller  nosmart+lp:charms/trusty/nova-cloud-controller
+swift-storage          lp:charms/trusty/swift-storage

=== modified file 'helper/collect/collect-stable-precise'
--- helper/collect/collect-stable-precise	2015-01-28 16:19:28 +0000
+++ helper/collect/collect-stable-precise	2015-07-30 14:52:37 +0000
@@ -1,19 +1,22 @@
-nova-cloud-controller  lp:charms/precise/nova-cloud-controller
-neutron-api            lp:charms/precise/neutron-api
-keystone               lp:charms/precise/keystone
-glance                 lp:charms/precise/glance
-swift-proxy            lp:charms/precise/swift-proxy
-mysql                  lp:charms/mysql
-rabbitmq-server        lp:charms/rabbitmq-server
+#
+ceilometer-agent       lp:charms/precise/ceilometer-agent
+ceilometer             lp:charms/precise/ceilometer
 ceph                   lp:charms/precise/ceph
-nova-compute           lp:charms/precise/nova-compute
-quantum-gateway        lp:charms/precise/quantum-gateway
+ceph-osd               lp:charms/precise/ceph-osd
+cinder-ceph            lp:charms/precise/cinder-ceph
 cinder                 lp:charms/precise/cinder
-swift-storage          lp:charms/precise/swift-storage
+glance                 lp:charms/precise/glance
+heat                   lp:charms/precise/heat
+keystone               lp:charms/precise/keystone
 mongodb                lp:charms/mongodb
-cinder-ceph            lp:charms/precise/cinder-ceph
-heat                   lp:charms/precise/heat
+mysql                  lp:charms/mysql
+neutron-api            lp:charms/precise/neutron-api
+neutron-gateway        lp:charms/precise/quantum-gateway
 neutron-openvswitch    lp:charms/precise/neutron-openvswitch
+nova-cloud-controller  lp:charms/precise/nova-cloud-controller
+nova-compute           lp:charms/precise/nova-compute
+ntp                    lp:charms/precise/ntp
 openstack-dashboard    lp:charms/precise/openstack-dashboard
-ceilometer             lp:charms/precise/ceilometer
-ceilometer-agent       lp:charms/precise/ceilometer-agent
+rabbitmq-server        lp:charms/rabbitmq-server
+swift-proxy            lp:charms/precise/swift-proxy
+swift-storage          lp:charms/precise/swift-storage

=== modified file 'helper/collect/collect-stable-trusty'
--- helper/collect/collect-stable-trusty	2015-04-22 17:28:46 +0000
+++ helper/collect/collect-stable-trusty	2015-07-30 14:52:37 +0000
@@ -1,21 +1,22 @@
-neutron-api            lp:charms/trusty/neutron-api
-keystone               lp:charms/trusty/keystone
-mysql                  lp:charms/mysql
-rabbitmq-server        lp:charms/rabbitmq-server
-ceph                   lp:charms/trusty/ceph
-nova-compute           lp:charms/trusty/nova-compute
-cinder                 lp:charms/trusty/cinder
-swift-storage          lp:charms/trusty/swift-storage
-mongodb                lp:charms/mongodb
-cinder-ceph            lp:charms/trusty/cinder-ceph
-ntp                    lp:charms/trusty/ntp
-# Bug 1161018 bzr revno fails on ghost ancestry
-openstack-dashboard    nosmart+lp:charms/trusty/openstack-dashboard
+# FYI, nosmart usage is re: bug 1161018 bzr revno fails on ghost ancestry
+ceilometer-agent       nosmart+lp:charms/trusty/ceilometer-agent
 ceilometer             nosmart+lp:charms/trusty/ceilometer
-ceilometer-agent       nosmart+lp:charms/trusty/ceilometer-agent
+ceph                   nosmart+lp:charms/trusty/ceph
+ceph-osd               nosmart+lp:charms/trusty/ceph-osd
+cinder-ceph            nosmart+lp:charms/trusty/cinder-ceph
+cinder                 nosmart+lp:charms/trusty/cinder
 glance                 nosmart+lp:charms/trusty/glance
 heat                   nosmart+lp:charms/trusty/heat
-swift-proxy            nosmart+lp:charms/trusty/swift-proxy
-quantum-gateway        nosmart+lp:charms/trusty/quantum-gateway
+keystone               nosmart+lp:charms/trusty/keystone
+mongodb                nosmart+lp:charms/trusty/mongodb
+mysql                  nosmart+lp:charms/trusty/percona-cluster
+neutron-api            nosmart+lp:charms/trusty/neutron-api
+neutron-gateway        nosmart+lp:charms/trusty/quantum-gateway
 neutron-openvswitch    nosmart+lp:charms/trusty/neutron-openvswitch
 nova-cloud-controller  nosmart+lp:charms/trusty/nova-cloud-controller
+nova-compute           nosmart+lp:charms/trusty/nova-compute
+ntp                    nosmart+lp:charms/trusty/ntp
+openstack-dashboard    nosmart+lp:charms/trusty/openstack-dashboard
+rabbitmq-server        nosmart+lp:charms/trusty/rabbitmq-server
+swift-proxy            nosmart+lp:charms/trusty/swift-proxy
+swift-storage          nosmart+lp:charms/trusty/swift-storage

=== modified file 'helper/collect/collect-swift-proxy'
--- helper/collect/collect-swift-proxy	2014-12-16 13:12:11 +0000
+++ helper/collect/collect-swift-proxy	2015-07-30 14:52:37 +0000
@@ -1,6 +1,6 @@
-mysql                  lp:charms/mysql
+glance                 lp:~openstack-charmers/charms/trusty/glance/next
+hacluster              lp:~openstack-charmers/charms/trusty/hacluster/next
 keystone               lp:~openstack-charmers/charms/trusty/keystone/next
-glance                 lp:~openstack-charmers/charms/trusty/glance/next
+mysql                  lp:charms/trusty/percona-cluster
 swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
 swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
-hacluster              lp:~openstack-charmers/charms/trusty/hacluster/next

=== modified file 'helper/collect/repo-cephradosgw'
--- helper/collect/repo-cephradosgw	2015-01-31 15:25:37 +0000
+++ helper/collect/repo-cephradosgw	2015-07-30 14:52:37 +0000
@@ -1,6 +1,6 @@
-mysql
 ceph
 ceph-osd
-keystone
 ceph-radosgw
 hacluster
+keystone
+mysql

=== modified file 'helper/collect/repo-cephradosgw-ha'
--- helper/collect/repo-cephradosgw-ha	2015-01-31 15:25:37 +0000
+++ helper/collect/repo-cephradosgw-ha	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
-mysql
 ceph
-keystone
 ceph-radosgw
 hacluster
+keystone
+mysql

=== modified file 'helper/collect/repo-next'
--- helper/collect/repo-next	2015-03-18 18:11:28 +0000
+++ helper/collect/repo-next	2015-07-30 14:52:37 +0000
@@ -1,21 +1,21 @@
-mysql
-rabbitmq-server
+ceilometer
+ceilometer-agent
 ceph
 ceph-osd
-keystone
-openstack-dashboard
-nova-compute
-nova-cloud-controller
-quantum-gateway
 cinder
 cinder-ceph
 glance
-swift-proxy
-swift-storage
-ceilometer
-ceilometer-agent
 heat
+keystone
 mongodb
+mysql
 neutron-api
+neutron-gateway
 neutron-openvswitch
+nova-cloud-controller
+nova-compute
 ntp
+openstack-dashboard
+rabbitmq-server
+swift-proxy
+swift-storage

=== modified file 'helper/collect/repo-next-ha'
--- helper/collect/repo-next-ha	2015-04-20 11:21:51 +0000
+++ helper/collect/repo-next-ha	2015-07-30 14:52:37 +0000
@@ -1,20 +1,20 @@
-percona-cluster
-hacluster
-rabbitmq-server
+ceilometer
+ceilometer-agent
 ceph
-keystone
-nova-compute
 cinder
-swift-storage
-mongodb
-neutron-api
 cinder-ceph
-openstack-dashboard
-ceilometer
-ceilometer-agent
 glance
+hacluster
 heat
-swift-proxy
-quantum-gateway
+keystone
+mongodb
+neutron-api
+neutron-gateway
 neutron-openvswitch
 nova-cloud-controller
+nova-compute
+openstack-dashboard
+percona-cluster
+rabbitmq-server
+swift-proxy
+swift-storage

=== modified file 'helper/collect/repo-swift-proxy'
--- helper/collect/repo-swift-proxy	2014-12-16 13:12:11 +0000
+++ helper/collect/repo-swift-proxy	2015-07-30 14:52:37 +0000
@@ -1,6 +1,6 @@
+glance
+hacluster
+keystone
 mysql
-keystone
-glance
 swift-proxy
 swift-storage
-hacluster

=== added file 'helper/collect/sort-me.sh'
--- helper/collect/sort-me.sh	1970-01-01 00:00:00 +0000
+++ helper/collect/sort-me.sh	2015-07-30 14:52:37 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+# Sort collect and repo files in current directory.
+
+for f in collect* repo*; do
+  echo "$f $f_tmp"
+  f_tmp="$(mktemp)"
+  sort < $f > $f_tmp
+  cat $f_tmp > $f
+  rm -fv $f_tmp
+done

=== added file 'helper/scripts/bundle_constrainer.py'
--- helper/scripts/bundle_constrainer.py	1970-01-01 00:00:00 +0000
+++ helper/scripts/bundle_constrainer.py	2015-07-30 14:52:37 +0000
@@ -0,0 +1,215 @@
+#!/usr/bin/env python
+'''
+A tool to add or remove constraints in a Juju bundle YAML file.  Useful to
+inject MAAS tags, mem, arch or other constraints.
+'''
+
+import logging
+import optparse
+import os
+import sys
+import yaml
+
+USAGE = '''Usage: %prog [options]
+
+bundle_constrainer
+==============================================================================
+A tool to add or remove constraints in a Juju bundle YAML file.  Useful to
+inject MAAS tags, mem, arch or other constraints.
+
+Default behavior:
+  The specified constraint key-value pairs override existing pairs
+  when the keys are identical.  If the specified constraints contain
+  keys which do not already exist in the bundle, the new ones are
+  added and the existing constraint key pairs remain.
+
+  Services with placement ("to:") are ignored altogether.
+
+  Will not overwrite an existing file without -y.
+
+Usage examples:
+  Add constraints and overwrite the original file, with debug output:
+    %prog -yd -i my.yaml -o my.yaml --constraints "mem=1G tags=dell,intel"
+
+  Remove existing constraints, add new constraints, and overwrite:
+    %prog -yr -i my.yaml -o my.yaml --constraints "mem=1G tags=dell"
+
+  Remove all constraints and write to a new bundle yaml file:
+    %prog -i old.yaml -o new.yaml --remove-all
+
+  Remove all constraints, excluding the listed services, and overwrite:
+    %prog -yr -i my.yaml -o my.yaml -e "ceilometer-agent,neutron-api"
+'''
+
+CNSTR = 'constraints'
+
+
+def read_yaml(the_file):
+    '''Returns yaml data from provided file name
+
+    :param the_file: yaml file name to read
+    :returns: dictionary of yaml data from file
+    '''
+    if not os.path.exists(the_file):
+        raise ValueError('File not found: {}'.format(the_file))
+    with open(the_file) as yaml_file:
+        logging.debug('Reading file: {}'.format(the_file))
+        data = yaml.safe_load(yaml_file.read())
+    return data
+
+
+def write_yaml(data, the_file):
+    '''Save yaml data dictionary to a yaml file
+
+    :param the_file: yaml file name to write
+    :returns: dictionary of yaml data to write to file
+    '''
+    logging.debug('Writing file: {}'.format(the_file))
+    with open(the_file, 'w') as yaml_file:
+        yaml_file.write(yaml.dump(data, default_flow_style=False))
+
+
+def constraint_str_dict(constraint_string):
+    '''Convert a juju constraint string into a dictionary.'''
+    _constraints = {}
+    for pair in constraint_string.split():
+        key, val = pair.split('=')
+        _constraints[key] = val
+    return _constraints
+
+
+def constraint_dict_str(constraint_dict):
+    '''Convert a dictionary into a juju constraint string.'''
+    _constraint_string = ''
+    for key, val in constraint_dict.items():
+        _constraint_string = '{} {}={}'.format(_constraint_string, key, val)
+    return _constraint_string.strip()
+
+
+def merge_constraints(org_constraints, new_constraints):
+    '''Merge new constraints with original constraints, where new wins.'''
+    _constraints = org_constraints.copy()
+    _constraints.update(new_constraints)
+    return _constraints
+
+
+def update_constraints(bundle_dict, opts):
+    '''Use command line options to mangle the bundle's dictionary data.'''
+    if opts.exclude_services:
+        exclude_services = opts.exclude_services.split(',')
+        logging.info('Excluding services: {}'.format(exclude_services))
+    else:
+        exclude_services = []
+
+    for target, t_v in bundle_dict.items():
+        logging.debug('Target: {}'.format(target))
+        for operation, o_v in t_v.items():
+            logging.debug('Operation: {}'.format(operation))
+            if operation == 'services':
+                # NOTE: operation may commonly be: relation, services,
+                #       overrides or inherits.
+                for service, s_v in o_v.items():
+                    logging.debug('Service: {}'.format(service))
+
+                    if 'to' in s_v.keys():
+                        logging.info('Skipping {} as it uses placement '
+                                     '({}).'.format(service, s_v['to']))
+                        continue
+
+                    if CNSTR in s_v.keys():
+                        org_constraints = \
+                            constraint_str_dict(s_v[CNSTR])
+                        logging.info('{} has existing constraints '
+                                     '({}).'.format(service, org_constraints))
+
+                        if opts.remove_all and service not in exclude_services:
+                            logging.info('Removing existing constraints for '
+                                         '{}'.format(service))
+                            del bundle_dict[target][operation][service][CNSTR]
+                    else:
+                        org_constraints = {}
+
+                    if opts.constraints and service not in exclude_services:
+                        new_constraints = constraint_str_dict(opts.constraints)
+                        merged_constraints = merge_constraints(org_constraints,
+                                                               new_constraints)
+
+                        bundle_dict[target][operation][service][CNSTR] = \
+                            constraint_dict_str(merged_constraints)
+
+    return bundle_dict
+
+
+def main():
+    '''Define and handle command line parameters
+    '''
+    # Define command line options
+    parser = optparse.OptionParser(USAGE)
+    parser.add_option("-d", "--debug",
+                      help="Enable debug logging",
+                      dest="debug", action="store_true", default=False)
+    parser.add_option('-y', '--yes-overwrite',
+                      help='Overwrite the output file',
+                      dest='overwrite', action='store_true', default=False)
+    parser.add_option("-i", "--in-file",
+                      help="YAML input (source) file",
+                      action="store", type="string", dest="in_file")
+    parser.add_option("-o", "--out-file",
+                      help="YAML output (destination) file",
+                      action="store", type="string", dest="out_file")
+    parser.add_option("--constraints",
+                      help="Constraints string to force onto service units.",
+                      action="store", type="string", dest="constraints")
+    parser.add_option("-e", "--exclude-services",
+                      help="Comma-separated list of service names to exclude",
+                      action="store", type="string", dest="exclude_services")
+    parser.add_option("-r", "--remove-all",
+                      help="Remove all constraints.",
+                      dest="remove_all", action="store_true", default=False)
+
+    params = parser.parse_args()
+    (opts, args) = params
+
+    # Handle parameters, inform user
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+        logging.info('Logging level set to DEBUG!')
+        logging.debug('parse opts: \n{}'.format(
+            yaml.dump(vars(opts), default_flow_style=False)))
+        logging.debug('arg count: {}'.format(len(args)))
+        logging.debug('parse args: {}'.format(args))
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    # Validate options
+    if not opts.in_file or not opts.out_file:
+        parser.print_help()
+        sys.exit(1)
+
+    # Validate and process files
+    if os.path.isfile(opts.out_file) and opts.overwrite:
+        logging.warning('Output file exists and will be '
+                        'overwritten: {}'.format(opts.out_file))
+    elif os.path.isfile(opts.out_file) and not opts.overwrite:
+        logging.warning('Output file exists and will NOT '
+                        'be overwritten: {}'.format(opts.out_file))
+        raise ValueError('Output file exists, overwrite option not set.')
+
+    if not os.path.isfile(opts.in_file):
+        raise ValueError('Input file not found.')
+
+    if not opts.constraints and not opts.remove_all:
+        raise ValueError('No action taken.  Specify new constraints '
+                         'and/or existing constraint removal.')
+
+    # Read the infile
+    org_bundle_dict = read_yaml(opts.in_file)
+
+    # Mangle dict data
+    new_bundle_dict = update_constraints(org_bundle_dict, opts)
+
+    # Write the outfile
+    write_yaml(new_bundle_dict, opts.out_file)
+
+if __name__ == '__main__':
+    main()

=== added file 'helper/scripts/bundle_constrainer_inject_tags.sh'
--- helper/scripts/bundle_constrainer_inject_tags.sh	1970-01-01 00:00:00 +0000
+++ helper/scripts/bundle_constrainer_inject_tags.sh	2015-07-30 14:52:37 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+#
+#  Optionally inject juju tags passed by environment variable, such
+#  as architecture or maas tags, excluding the listed subordinate charms.
+
+SUBORDINATES="ceilometer-agent,cinder-ceph,neutron-openvswitch,ntp"
+
+echo " . Env vars of interest:"
+env | egrep 'osci|OSCI|juju|JUJU|mojo|MOJO|amulet|AMULET|proxy|PROXY' | sort
+
+echo " . You are here:"
+pwd && whoami
+
+if [[ -n "$UOSCI_JUJU_TAGS" ]]; then
+  echo " + Bundle constrainer triggered on: ${UOSCI_JUJU_TAGS}"
+  $MOJO_SPEC_DIR/$MOJO_STAGE/scripts/bundle_constrainer.py -yd \
+    -i $MOJO_SPEC_DIR/$MOJO_STAGE/baremetal7.yaml \
+    -o $MOJO_SPEC_DIR/$MOJO_STAGE/baremetal7.yaml \
+    --constraints "$UOSCI_JUJU_TAGS" -e "$SUBORDINATES"
+else
+  echo " - Bundle constrainer not triggered."
+fi

=== modified file 'helper/scripts/check-lint.sh'
--- helper/scripts/check-lint.sh	2015-02-08 18:16:10 +0000
+++ helper/scripts/check-lint.sh	2015-07-30 14:52:37 +0000
@@ -1,12 +1,22 @@
 #!/bin/bash
 
-find specs/{object_storage,full_stack} -name manifest | \
-while read spec; do
+echo "Checking specs..."
+for spec in $(find specs/{object_storage,full_stack} -name manifest); do
     spec_dir=$(dirname $spec)
     MSGS=$(./helper/scripts/mojo-spec-check.py $spec_dir 2>&1)
-    if [[ ! -z $MSGS ]]; then
-        echo $spec_dir
-	echo "$MSGS"
-        echo ""
+    if [[ "$MSGS" == *WARNING* ]] || [[ "$MSGS" == *ERROR* ]]; then
+        result="(!)"
+        failed=1
+    else
+        result="OK"
     fi
+    echo -e "${result}\t${spec_dir}"
+    [[ -n "$MSGS" ]] && echo -e "$MSGS\n"
 done
+
+if [[ -n "$failed" ]]; then
+    echo "One or more specs failed a sanity check."
+    exit 1
+else
+    echo "All spec sanity checks passed."
+fi

=== added file 'helper/scripts/list-specs.sh'
--- helper/scripts/list-specs.sh	1970-01-01 00:00:00 +0000
+++ helper/scripts/list-specs.sh	2015-07-30 14:52:37 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+find specs/{full_stack,object_storage,dev} -name manifest | \
+while read spec; do
+    dirname $spec
+done

=== modified file 'helper/scripts/mojo-spec-check.py'
--- helper/scripts/mojo-spec-check.py	2015-03-18 15:34:58 +0000
+++ helper/scripts/mojo-spec-check.py	2015-07-30 14:52:37 +0000
@@ -1,19 +1,46 @@
 #!/usr/bin/python
+import logging
+import os
 import string
-import os
-import logging
 import sys
 import yaml
 
-WHITELIST=['manifest', 'helper', 'utils', 'SPEC_INFO.txt']
-YAML_MAP={
+#LOGLEVEL = logging.DEBUG
+#LOGLEVEL = logging.INFO
+LOGLEVEL = logging.WARN
+
+WHITELIST = ['manifest', 'helper', 'utils', 'scripts', 'SPEC_INFO.txt']
+
+YAML_MAP = {
     'images.yaml': 'image_setup.py',
     'keystone_users.yaml': 'keystone_setup.py',
     'network.yaml': 'network_setup.py',
 }
-UBUNTU_RELEASES=['precise', 'trusty', 'utopic', 'vivid']
+
+
+# OpenStack-to-Ubuntu Release Map
+UBUNTU_RELEASES = {}
+OPENSTACK_RELEASES = {
+    'icehouse': ['precise', 'trusty'],
+    'juno': ['trusty', 'utopic'],
+    'kilo': ['trusty', 'vivid'],
+    'liberty': ['trusty', 'wily']
+}
+
 
 # Helpers
+def invert_dict_of_lists(d):
+    """Inverts a dictionary of lists."""
+    _inverted = {}
+    for k, v in d.iteritems():
+        for item in v:
+            if item in _inverted.keys():
+                _inverted[item].append(k)
+            else:
+                _inverted[item] = [k]
+    return _inverted
+
+
 def get_directive_opt(line, opt):
     """Return value for kv pair in manifest line"""
     for word in line:
@@ -24,7 +51,7 @@
 def get_manifest_ubuntu_release():
     """Return Ubuntu release referenced in deploy manifest directive"""
     releases = []
-    with open('manifest', 'r') as f: 
+    with open('manifest', 'r') as f:
         for line in f.readlines():
             words = line.split()
             if words and words[0] == "deploy":
@@ -33,54 +60,84 @@
                     releases.append(target_arg)
                 else:
                     logging.warn('No target is set for juju deployer, this '
-                                 'spec will not support multiple ubuntu '
-                                 'releases, specify a target with ${MOJO_SERIES}')
+                                 'spec will not support multiple Ubuntu '
+                                 'releases, specify a target with '
+                                 '${MOJO_SERIES}')
+    logging.debug('Releases: {}'.format(releases))
     return releases
 
 
-def get_manifest_referenced():
+def get_manifest_referenced(openstack_release):
     """Return all files referenced in the manifest"""
-    config_files=[]
-    with open('manifest', 'r') as f: 
+    config_files = []
+    with open('manifest', 'r') as f:
         for line in f.readlines():
             for word in line.split():
                 if 'config=' in word:
-                    config_files.extend(resolve_file(word.split('=')[1]))
+                    config_files.extend(resolve_file(word.split('=')[1],
+                                                     openstack_release))
+    logging.debug('Expected files: {}'.format(config_files))
     return config_files
 
 
-def resolve_file(rfile):
-    """Substitute runtime env variables into string and return list of possabilities"""
+def resolve_file(rfile, openstack_release):
+    """Substitute vars into string and return list of possibilities"""
     check_files = []
     if 'MOJO_SERIES' in rfile:
-        for series in ['trusty', 'precise']:
-            bob = {}
-            bob['MOJO_SERIES'] = series
-            check_files.append(string.Template(rfile).substitute(bob))
+        # Add expected Ubuntu series based on OpenStack release
+        if openstack_release:
+            logging.debug('Expecting {} x {}'.format(
+                rfile, OPENSTACK_RELEASES[openstack_release]))
+            for series in OPENSTACK_RELEASES[openstack_release]:
+                template_data = {'MOJO_SERIES': series}
+                check_files.append(
+                    string.Template(rfile).substitute(template_data))
+        else:
+            logging.warn('Skipping {}'.format(rfile))
     else:
         check_files.append(rfile)
     return check_files
 
+
+def get_openstack_release_name():
+    """Return OpenStack release name based on the current directory."""
+    openstack_release = os.getcwd().split('/')[-1]
+    logging.debug('OpenStack release: {}'.format(openstack_release))
+    if openstack_release not in OPENSTACK_RELEASES.keys():
+        logging.error('Unable to determine OpenStack release name '
+                      'from spec directory')
+        return None
+    else:
+        return openstack_release
+
+
 # Checks
 def check_manifest_ubuntu_release():
     """Check Ubuntu release is not hardcoded in manifest"""
+    logging.info('Checking that Ubuntu release is not '
+                 'hard-coded in manifest...')
     for target_arg in get_manifest_ubuntu_release():
-        if len([rel for rel in UBUNTU_RELEASES if rel in target_arg]) > 0:
-            logging.warn('juju deployer target contains a hardcoded '
-                         'Ubuntu release. Consider using ${MOJO_SERIES}')
-
-def check4spec(dir_list):
+        for rel in UBUNTU_RELEASES.keys():
+            if rel in target_arg:
+                logging.warn('Manifest deploy target contains a hard-coded '
+                             'Ubuntu release. Consider using ${MOJO_SERIES}')
+
+
+def check_spec_info(dir_list):
     """Check spec has a SPEC_INFO.txt file describing the spec"""
     if 'SPEC_INFO.txt' not in dir_list:
-       logging.warn('No spec description file SPEC_INFO.txt')
-
-
-def check_files_are_in_manifest(dir_list):
+        logging.warn('No spec description file SPEC_INFO.txt')
+
+
+def check_files_are_in_manifest(dir_list, openstack_release):
     """Check that all files are referenced in the manifest"""
+    logging.info('Checking that all files are referenced in the manifest...')
+    _referenced = get_manifest_referenced(openstack_release)
 
     def _manifest_check(fname):
-        if not fname in get_manifest_referenced():
-            logging.warn('%s not referenced in manifest. Can this file be removed?' % fname)
+        if not fname in _referenced:
+            logging.warn('%s is not referenced by the manifest. '
+                         'Can this file be removed?' % fname)
 
     for f in dir_list:
         if f in WHITELIST:
@@ -91,26 +148,40 @@
             _manifest_check(f)
 
 
-def check_files_from_manifest(dir_list):
+def check_files_from_manifest(dir_list, openstack_release):
     """Check that all files referenced in the manifest are present"""
-    for f in get_manifest_referenced():
-        if f not in dir_list:
-            logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
+    logging.info('Checking that all files referenced in the '
+                 'manifest are present...')
+
+    for f in get_manifest_referenced(openstack_release):
+        # Use actual file check to address file within symlinked directories
+        if f not in dir_list and not os.path.exists(f):
+            logging.error('%s not found.  It is referenced by the '
+                          'manifest, or expected based on Ubuntu-'
+                          'OpenStack version table.  Mojo spec '
+                          'will fail.' % f)
+            logging.debug('{} not in {}'.format(f, dir_list))
         for yamlfile in YAML_MAP.keys():
             if f == YAML_MAP[yamlfile]:
                 if not yamlfile in dir_list:
-                    logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
+                    logging.error('%s not found.  It is referenced by the '
+                                  'manifest, or expected based on Ubuntu-'
+                                  'OpenStack version table.  Mojo spec '
+                                  'will fail.' % f)
 
 
 def check_local_changes(dir_list):
     """Check for local changes"""
+    logging.info('Checking for local files...')
     for f in dir_list:
         if not os.path.islink(f) and f not in WHITELIST:
-            logging.warn('Spec file %s is a local copy, can this be replaced with a link to a helper copy?' % f)
+            logging.warn('Spec file %s is a local copy. Can this be replaced '
+                         'with a link to a helper copy?' % f)
 
 
 def check_dead_symlinks(dir_list):
     """Check for dead symlink"""
+    logging.info('Checking for dead symlinks...')
     for f in dir_list:
         if os.path.islink(f) and not os.path.exists(os.readlink(f)):
             logging.error('%s is a dead symlink' % f)
@@ -118,34 +189,51 @@
 
 def check_yaml_syntax(dir_list):
     """Check yamls are valid"""
+    logging.info('Checking syntax of yaml files...')
     for f in dir_list:
         if f.endswith('.yaml'):
             stream = open(f, 'r')
             try:
                 yaml.load(stream)
             except yaml.scanner.ScannerError:
-                logging.error('%s contains errors, mojo spec will fail' % f)
-
-
-def check_dirname():
+                logging.error('%s contains yaml errors, '
+                              'mojo spec will fail.' % f)
+
+
+def check_dirname(openstack_release):
     """Check tip dirname matches Openstack release referenced in manifest"""
+    logging.info('Checking dir name matches OpenStack release in manifest...')
     for target in get_manifest_ubuntu_release():
-        if target.split('-')[1] != os.getcwd().split('/')[-1]:
-            logging.warn('Openstack series referenced in manifest does not match dir')
+        if target.split('-')[1] != openstack_release:
+            logging.warn('OpenStack series referenced in manifest'
+                         'does not match directory name')
 
 
 def main(argv):
-    logging.basicConfig(level=logging.INFO)
-    os.chdir(sys.argv[1])
+    logging.basicConfig(level=LOGLEVEL)
+
+    # Ubuntu-to-OpenStack Release Map
+    global UBUNTU_RELEASES
+    UBUNTU_RELEASES = invert_dict_of_lists(OPENSTACK_RELEASES)
+
+    spec = sys.argv[1]
+    os.chdir(spec)
     dir_list = os.listdir('.')
-    check4spec(dir_list)
-    check_files_are_in_manifest(dir_list)
-    check_files_from_manifest(dir_list)
+    openstack_release = get_openstack_release_name()
+
+    logging.info('Spec: {}'.format(spec))
+    logging.debug('Ubuntu release map:  {}'.format(UBUNTU_RELEASES))
+    logging.debug('OpenStack release map:  {}'.format(OPENSTACK_RELEASES))
+    logging.debug('Current dir: {}'.format(os.getcwd()))
+    logging.debug('dir_list: {}'.format(dir_list))
+    check_spec_info(dir_list)
+    check_files_are_in_manifest(dir_list, openstack_release)
+    check_files_from_manifest(dir_list, openstack_release)
     check_local_changes(dir_list)
     check_dead_symlinks(dir_list)
     check_manifest_ubuntu_release()
     check_yaml_syntax(dir_list)
-    check_dirname()
+    check_dirname(openstack_release)
 
 
 if __name__ == "__main__":

=== modified file 'helper/setup/network_setup.py'
--- helper/setup/network_setup.py	2015-03-18 16:27:17 +0000
+++ helper/setup/network_setup.py	2015-07-30 14:52:37 +0000
@@ -1,17 +1,26 @@
 #!/usr/bin/python
+import argparse
+import logging
 import sys
 import utils.mojo_utils as mojo_utils
 import utils.mojo_os_utils as mojo_os_utils
-import logging
-import argparse
-
-
-def setup_sdn(net_topology):
+
+
+def setup_sdn(net_topology, ignore_env_vars):
     overcloud_novarc = mojo_utils.get_overcloud_auth()
     # Get os clients
     keystonec = mojo_os_utils.get_keystone_client(overcloud_novarc)
     neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
     net_info = mojo_utils.get_mojo_config('network.yaml')[net_topology]
+
+    # Override network.yaml values with env var values if they exist
+    if not ignore_env_vars:
+        logging.info('Consuming network environment variables as overrides.')
+        net_env_vars = mojo_utils.get_network_env_vars()
+        net_info.update(net_env_vars)
+
+    logging.info('Network info: {}'.format(mojo_utils.dict_to_yaml(net_info)))
+
     # Resolve the tenant name from the overcloud novarc into a tenant id
     tenant_id = mojo_os_utils.get_tenant_id(keystonec,
                                             overcloud_novarc['OS_TENANT_NAME'])
@@ -59,9 +68,16 @@
 def main(argv):
     logging.basicConfig(level=logging.INFO)
     parser = argparse.ArgumentParser()
-    parser.add_argument("net_topology", default='gre', nargs='?')
+    parser.add_argument('net_topology',
+                        help='network topology type, default is GRE',
+                        default='gre', nargs='?')
+    parser.add_argument('--ignore_env_vars', '-i',
+                        help='do not override using environment variables',
+                        action='store_true',
+                        default=False)
     options = parser.parse_args()
     net_topology = mojo_utils.parse_mojo_arg(options, 'net_topology')
+    ignore_env_vars = mojo_utils.parse_mojo_arg(options, 'ignore_env_vars')
     logging.info('Setting up %s network' % (net_topology))
 
     # Handle network for Openstack-on-Openstack scenarios
@@ -78,7 +94,7 @@
             neutronc,
             dvr_mode=net_info.get('dvr_enabled', False))
 
-    setup_sdn(net_topology)
+    setup_sdn(net_topology, ignore_env_vars)
 
 
 if __name__ == "__main__":

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2015-03-18 15:51:50 +0000
+++ helper/utils/mojo_utils.py	2015-07-30 14:52:37 +0000
@@ -1,13 +1,13 @@
 #!/usr/bin/python
 
+import logging
+import mojo
+import os
+import shutil
 import subprocess
+import time
 import yaml
-import os
-import mojo
-import logging
-import time
 from collections import Counter
-import shutil
 
 JUJU_STATUSES = {
     'good': ['ACTIVE', 'started'],
@@ -17,7 +17,7 @@
 
 
 def get_juju_status(service=None, unit=None):
-    cmd = ['juju', 'status']
+    cmd = ['juju', 'status', '--format=yaml']
     if service:
         cmd.append(service)
     if unit:
@@ -466,3 +466,67 @@
     juju_check_hooks_complete()
     # Check nothing has subsequently gone bad
     juju_status_check_and_wait()
+
+
+def dict_to_yaml(dict_data):
+    return yaml.dump(dict_data, default_flow_style=False)
+
+
+def get_network_env_vars():
+    """Get environment variables with names which are consistent with
+    network.yaml keys;  Also get network environment variables as commonly
+    used by openstack-charm-testing and ubuntu-openstack-ci automation.
+    Return a dictionary compatible with mojo-openstack-specs network.yaml
+    key structure."""
+
+    # Example o-c-t & uosci environment variables:
+    #   NET_ID="a705dd0f-5571-4818-8c30-4132cc494668"
+    #   GATEWAY="172.17.107.1"
+    #   CIDR_EXT="172.17.107.0/24"
+    #   CIDR_PRIV="192.168.121.0/24"
+    #   NAMESERVER="10.5.0.2"
+    #   FIP_RANGE="172.17.107.200:172.17.107.249"
+    #   AMULET_OS_VIP00="172.17.107.250"
+    #   AMULET_OS_VIP01="172.17.107.251"
+    #   AMULET_OS_VIP02="172.17.107.252"
+    #   AMULET_OS_VIP03="172.17.107.253"
+    _vars = {}
+    _vars['net_id'] = os.environ.get('NET_ID')
+    _vars['external_dns'] = os.environ.get('NAMESERVER')
+    _vars['default_gateway'] = os.environ.get('GATEWAY')
+    _vars['external_net_cidr'] = os.environ.get('CIDR_EXT')
+    _vars['private_net_cidr'] = os.environ.get('CIDR_PRIV')
+
+    _fip_range = os.environ.get('FIP_RANGE')
+    if _fip_range and ':' in _fip_range:
+        _vars['start_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[0]
+        _vars['end_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[1]
+
+    _vips = [os.environ.get('AMULET_OS_VIP00'),
+             os.environ.get('AMULET_OS_VIP01'),
+             os.environ.get('AMULET_OS_VIP02'),
+             os.environ.get('AMULET_OS_VIP03')]
+
+    # Env var naming consistent with network.yaml takes priority
+    _keys = ['default_gateway'
+             'start_floating_ip',
+             'end_floating_ip',
+             'external_dns',
+             'external_net_cidr',
+             'external_net_name',
+             'external_subnet_name',
+             'network_type',
+             'private_net_cidr',
+             'router_name']
+    for _key in _keys:
+        _val = os.environ.get(_key)
+        if _val:
+            _vars[_key] = _val
+
+    # Remove keys and items with a None value
+    _vars['vips'] = filter(None, _vips)
+    for k, v in _vars.items():
+        if not v:
+            del _vars[k]
+
+    return _vars

=== modified file 'specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py'
--- specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2015-03-18 15:51:50 +0000
+++ specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2015-07-30 14:52:37 +0000
@@ -16,7 +16,7 @@
 }
 
 def get_juju_status(service=None):
-    cmd = ['juju', 'status']
+    cmd = ['juju', 'status', '--format=yaml']
     if service:
         cmd.append(service)
     status_file = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout

=== removed symlink 'specs/full_stack/charmhelper_upgrade/icehouse/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/icehouse/collect-next-precise'
=== target is u'../../../../helper/collect/collect-next-precise'
=== added symlink 'specs/full_stack/charmhelper_upgrade/icehouse/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/charmhelper_upgrade/icehouse/manifest'
--- specs/full_stack/charmhelper_upgrade/icehouse/manifest	2015-02-08 08:31:58 +0000
+++ specs/full_stack/charmhelper_upgrade/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/charmhelper_upgrade/juno/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/collect-next-utopic'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/charmhelper_upgrade/juno/manifest'
--- specs/full_stack/charmhelper_upgrade/juno/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/charmhelper_upgrade/juno/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/charmhelper_upgrade/kilo/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/collect-next-vivid'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/charmhelper_upgrade/kilo/manifest'
--- specs/full_stack/charmhelper_upgrade/kilo/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/charmhelper_upgrade/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== added directory 'specs/full_stack/charmhelper_upgrade/liberty'
=== added file 'specs/full_stack/charmhelper_upgrade/liberty/SPEC_INFO.txt'
--- specs/full_stack/charmhelper_upgrade/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +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/charmhelper_upgrade/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade/liberty/manifest'
--- specs/full_stack/charmhelper_upgrade/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,29 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/sync_charmhelpers.py'
=== target is u'../../../../helper/setup/sync_charmhelpers.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/liberty/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/charmhelper_upgrade_ha/liberty'
=== added file 'specs/full_stack/charmhelper_upgrade_ha/liberty/SPEC_INFO.txt'
--- specs/full_stack/charmhelper_upgrade_ha/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade_ha/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,2 @@
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a ha deployment and testing the resulting cloud

=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade_ha/liberty/manifest'
--- specs/full_stack/charmhelper_upgrade_ha/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade_ha/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/sync_charmhelpers.py'
=== target is u'../../../../helper/setup/sync_charmhelpers.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/liberty/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/ha_phased/liberty'
=== added file 'specs/full_stack/ha_phased/liberty/SPEC_INFO.txt'
--- specs/full_stack/ha_phased/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment

=== added symlink 'specs/full_stack/ha_phased/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased/liberty/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased/liberty/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased/liberty/manifest'
--- specs/full_stack/ha_phased/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,35 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/ha_phased/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_phased/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_phased/liberty/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_phased/liberty/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_phased_chaos_pony/liberty'
=== added file 'specs/full_stack/ha_phased_chaos_pony/liberty/SPEC_INFO.txt'
--- specs/full_stack/ha_phased_chaos_pony/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased_chaos_pony/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.

=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/chaos_pony.py'
=== target is u'../../../../helper/setup/chaos_pony.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased_chaos_pony/liberty/manifest'
--- specs/full_stack/ha_phased_chaos_pony/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased_chaos_pony/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 --target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 --target=${MOJO_SERIES}-liberty
+
+# 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:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Run chaos pony to destroy and add services
+script config=chaos_pony.py

=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/liberty/utils'
=== target is u'../../../../helper/utils'
=== removed symlink 'specs/full_stack/next_deploy/icehouse/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/icehouse/collect-next-precise'
=== target is u'../../../../helper/collect/collect-next-precise'
=== added symlink 'specs/full_stack/next_deploy/icehouse/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy/icehouse/manifest'
--- specs/full_stack/next_deploy/icehouse/manifest	2015-02-08 08:31:58 +0000
+++ specs/full_stack/next_deploy/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/next_deploy/juno/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/juno/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/juno/collect-next-utopic'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy/juno/manifest'
--- specs/full_stack/next_deploy/juno/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/next_deploy/juno/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/next_deploy/kilo/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/kilo/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/kilo/collect-next-vivid'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy/kilo/manifest'
--- specs/full_stack/next_deploy/kilo/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/next_deploy/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== added directory 'specs/full_stack/next_deploy/liberty'
=== added file 'specs/full_stack/next_deploy/liberty/SPEC_INFO.txt'
--- specs/full_stack/next_deploy/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +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/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/liberty/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/next_deploy/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy/liberty/manifest'
--- specs/full_stack/next_deploy/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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"

=== added symlink 'specs/full_stack/next_deploy/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy/liberty/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy/liberty/utils'
=== target is u'../../../../helper/utils'
=== removed symlink 'specs/full_stack/next_deploy_baremetal/icehouse/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/icehouse/collect-next-precise'
=== target is u'../../../../helper/collect/collect-next-precise'
=== added symlink 'specs/full_stack/next_deploy_baremetal/icehouse/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_baremetal/icehouse/manifest'
--- specs/full_stack/next_deploy_baremetal/icehouse/manifest	2015-04-22 18:46:43 +0000
+++ specs/full_stack/next_deploy_baremetal/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -1,9 +1,13 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next
 
+# 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 target=${MOJO_SERIES}-icehouse
 

=== added symlink 'specs/full_stack/next_deploy_baremetal/icehouse/scripts'
=== target is u'../../../../helper/scripts'
=== removed symlink 'specs/full_stack/next_deploy_baremetal/juno/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/juno/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/juno/collect-next-utopic'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_baremetal/juno/manifest'
--- specs/full_stack/next_deploy_baremetal/juno/manifest	2015-03-26 17:15:16 +0000
+++ specs/full_stack/next_deploy_baremetal/juno/manifest	2015-07-30 14:52:37 +0000
@@ -1,9 +1,12 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next
 
+# 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 target=${MOJO_SERIES}-juno
 

=== added symlink 'specs/full_stack/next_deploy_baremetal/juno/scripts'
=== target is u'../../../../helper/scripts/'
=== removed symlink 'specs/full_stack/next_deploy_baremetal/kilo/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/kilo/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/kilo/collect-next-vivid'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_baremetal/kilo/manifest'
--- specs/full_stack/next_deploy_baremetal/kilo/manifest	2015-03-26 17:15:16 +0000
+++ specs/full_stack/next_deploy_baremetal/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -1,9 +1,12 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next
 
+# 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 target=${MOJO_SERIES}-kilo
 

=== added symlink 'specs/full_stack/next_deploy_baremetal/kilo/scripts'
=== target is u'../../../../helper/scripts/'
=== added directory 'specs/full_stack/next_deploy_baremetal/liberty'
=== added file 'specs/full_stack/next_deploy_baremetal/liberty/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_baremetal/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,4 @@
+This LIBERTY 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/liberty/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_baremetal/liberty/manifest'
--- specs/full_stack/next_deploy_baremetal/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_baremetal/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,26 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# 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 target=${MOJO_SERIES}-liberty
+
+# 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"

=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/scripts'
=== target is u'../../../../helper/scripts/'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_baremetal/liberty/utils'
=== target is u'../../../../helper/utils'
=== removed symlink 'specs/full_stack/next_deploy_ssl/icehouse/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/icehouse/collect-next-precise'
=== target is u'../../../../helper/collect/collect-next-precise'
=== added symlink 'specs/full_stack/next_deploy_ssl/icehouse/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_ssl/icehouse/manifest'
--- specs/full_stack/next_deploy_ssl/icehouse/manifest	2015-02-08 08:31:58 +0000
+++ specs/full_stack/next_deploy_ssl/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/next_deploy_ssl/juno/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/collect-next-utopic'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_ssl/juno/manifest'
--- specs/full_stack/next_deploy_ssl/juno/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/next_deploy_ssl/juno/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/next_deploy_ssl/kilo/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/collect-next-vivid'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/next_deploy_ssl/kilo/manifest'
--- specs/full_stack/next_deploy_ssl/kilo/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/next_deploy_ssl/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -1,5 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== added directory 'specs/full_stack/next_deploy_ssl/liberty'
=== added file 'specs/full_stack/next_deploy_ssl/liberty/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_ssl/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +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/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/full_ssl.yaml'
=== target is u'../../../../helper/bundles/full_ssl.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_ssl/liberty/manifest'
--- specs/full_stack/next_deploy_ssl/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full_ssl.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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"

=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/liberty/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy'
=== added directory 'specs/full_stack/stable_deploy/icehouse'
=== added file 'specs/full_stack/stable_deploy/icehouse/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/icehouse/SPEC_INFO.txt	2015-07-30 14:52:37 +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/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/collect-stable-precise'
=== target is u'../../../../helper/collect/collect-stable-precise'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/icehouse/manifest'
--- specs/full_stack/stable_deploy/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/icehouse/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy/juno'
=== added file 'specs/full_stack/stable_deploy/juno/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/juno/SPEC_INFO.txt	2015-07-30 14:52:37 +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/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/juno/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/juno/collect-stable-utopic'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/juno/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/juno/manifest'
--- specs/full_stack/stable_deploy/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/juno/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/juno/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy/kilo'
=== added file 'specs/full_stack/stable_deploy/kilo/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/kilo/SPEC_INFO.txt	2015-07-30 14:52:37 +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/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/kilo/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/kilo/collect-stable-vivid'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/kilo/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/kilo/manifest'
--- specs/full_stack/stable_deploy/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/kilo/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy/liberty'
=== added file 'specs/full_stack/stable_deploy/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +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/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy/liberty/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/liberty/collect-stable-wily'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy/liberty/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_deploy/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy/liberty/manifest'
--- specs/full_stack/stable_deploy/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy/liberty/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy/liberty/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal'
=== added directory 'specs/full_stack/stable_deploy_baremetal/icehouse'
=== added file 'specs/full_stack/stable_deploy_baremetal/icehouse/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/icehouse/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,4 @@
+This ICEHOUSE 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/icehouse/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/collect-stable-precise'
=== target is u'../../../../helper/collect/collect-stable-precise'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/icehouse/manifest'
--- specs/full_stack/stable_deploy_baremetal/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,27 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# 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 target=${MOJO_SERIES}-icehouse
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/icehouse/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal/juno'
=== added file 'specs/full_stack/stable_deploy_baremetal/juno/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/juno/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,4 @@
+This JUNO 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/juno/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/collect-stable-utopic'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/juno/manifest'
--- specs/full_stack/stable_deploy_baremetal/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/juno/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,27 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# 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 target=${MOJO_SERIES}-juno
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal/kilo'
=== added file 'specs/full_stack/stable_deploy_baremetal/kilo/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/kilo/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,4 @@
+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.

=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/collect-stable-vivid'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/kilo/manifest'
--- specs/full_stack/stable_deploy_baremetal/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,27 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# 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 target=${MOJO_SERIES}-kilo
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_deploy_baremetal/liberty'
=== added file 'specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,4 @@
+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.

=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/baremetal7.yaml'
=== target is u'../../../../helper/bundles/baremetal7.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/collect-stable-wily'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_baremetal/liberty/manifest'
--- specs/full_stack/stable_deploy_baremetal/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_baremetal/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,27 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-stable
+
+# 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 target=${MOJO_SERIES}-liberty
+
+# 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"

=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/network.yaml'
=== target is u'../../../../helper/setup/network-dellstack.yaml'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/repo-stable'
=== target is u'../../../../helper/collect/repo-stable'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/scripts'
=== target is u'../../../../helper/scripts'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_baremetal/liberty/utils'
=== target is u'../../../../helper/utils'
=== removed symlink 'specs/full_stack/stable_to_next/icehouse/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/icehouse/collect-next-precise'
=== target is u'../../../../helper/collect/collect-next-precise'
=== added symlink 'specs/full_stack/stable_to_next/icehouse/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== modified file 'specs/full_stack/stable_to_next/icehouse/manifest'
--- specs/full_stack/stable_to_next/icehouse/manifest	2015-02-08 08:31:58 +0000
+++ specs/full_stack/stable_to_next/icehouse/manifest	2015-07-30 14:52:37 +0000
@@ -26,7 +26,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/stable_to_next/juno/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/juno/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/juno/collect-next-utopic'
=== target is u'../../../../helper/collect/collect-next'
=== removed symlink 'specs/full_stack/stable_to_next/juno/collect-stable-precise'
=== target was u'../../../../helper/collect/collect-stable-precise'
=== added symlink 'specs/full_stack/stable_to_next/juno/collect-stable-utopic'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== modified file 'specs/full_stack/stable_to_next/juno/manifest'
--- specs/full_stack/stable_to_next/juno/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/stable_to_next/juno/manifest	2015-07-30 14:52:37 +0000
@@ -26,7 +26,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== removed symlink 'specs/full_stack/stable_to_next/kilo/collect-next'
=== target was u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/kilo/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/kilo/collect-next-vivid'
=== target is u'../../../../helper/collect/collect-next'
=== removed symlink 'specs/full_stack/stable_to_next/kilo/collect-stable-precise'
=== target was u'../../../../helper/collect/collect-stable-precise'
=== added symlink 'specs/full_stack/stable_to_next/kilo/collect-stable-vivid'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== modified file 'specs/full_stack/stable_to_next/kilo/manifest'
--- specs/full_stack/stable_to_next/kilo/manifest	2015-02-08 08:49:02 +0000
+++ specs/full_stack/stable_to_next/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -26,7 +26,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next
+collect config=collect-next-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next

=== added directory 'specs/full_stack/stable_to_next/liberty'
=== added file 'specs/full_stack/stable_to_next/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/stable_to_next/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/stable_to_next/liberty/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_to_next/liberty/collect-stable-wily'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_to_next/liberty/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/stable_to_next/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next/liberty/manifest'
--- specs/full_stack/stable_to_next/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,41 @@
+# Collect the stable charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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.small:1' CLOUDINIT_WAIT="300"
+
+# Remove charms directories
+script config=wipe_charm_dir.py
+
+# Collect the next (devel) charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Run upgrade-charm on all services
+script config=upgrade_all_services.py
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.small:1 precise:m1.small:1' CLOUDINIT_WAIT="300"

=== added symlink 'specs/full_stack/stable_to_next/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/stable_to_next/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next/liberty/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next/liberty/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'
=== removed symlink 'specs/full_stack/stable_to_next_ha/juno/collect-next-ha'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/juno/collect-next-ha-trusty'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/juno/collect-next-ha-utopic'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/juno/collect-stable-ha-precise'
=== target was u'../../../../helper/collect/collect-stable-ha-precise'
=== added symlink 'specs/full_stack/stable_to_next_ha/juno/collect-stable-ha-utopic'
=== target is u'../../../../helper/collect/collect-stable-ha-trusty'
=== modified file 'specs/full_stack/stable_to_next_ha/juno/manifest'
--- specs/full_stack/stable_to_next_ha/juno/manifest	2015-04-20 09:35:09 +0000
+++ specs/full_stack/stable_to_next_ha/juno/manifest	2015-07-30 14:52:37 +0000
@@ -38,7 +38,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next-ha
+collect config=collect-next-ha-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next-ha

=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-next-ha'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-next-ha-trusty'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-next-ha-vivid'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-stable-ha-precise'
=== target was u'../../../../helper/collect/collect-stable-ha-precise'
=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-stable-ha-vivid'
=== target is u'../../../../helper/collect/collect-stable-ha-trusty'
=== modified file 'specs/full_stack/stable_to_next_ha/kilo/manifest'
--- specs/full_stack/stable_to_next_ha/kilo/manifest	2015-04-20 09:35:09 +0000
+++ specs/full_stack/stable_to_next_ha/kilo/manifest	2015-07-30 14:52:37 +0000
@@ -38,7 +38,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next-ha
+collect config=collect-next-ha-${MOJO_SERIES}
 
 # Copy the branches to the deployment directory
 repo config=repo-next-ha

=== added directory 'specs/full_stack/stable_to_next_ha/liberty'
=== added file 'specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt	2015-07-30 14:52:37 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment

=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha-trusty'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha-wily'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha-trusty'
=== target is u'../../../../helper/collect/collect-stable-ha-trusty'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha-wily'
=== target is u'../../../../helper/collect/collect-stable-ha-trusty'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/liberty/manifest'
--- specs/full_stack/stable_to_next_ha/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/manifest	2015-07-30 14:52:37 +0000
@@ -0,0 +1,56 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-ha-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-liberty
+
+# 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:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Remove charms directories
+script config=wipe_charm_dir.py
+
+# Collect the next (devel) charm branches from Launchpad
+collect config=collect-next-ha-${MOJO_SERIES}
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Run upgrade-charm on all services
+script config=upgrade_all_services.py
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.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"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'