Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha into lp:openstack-mojo-specs

[Liam Young]

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

228. By Liam Young on 2015-07-29

Uncomment oneshot deployment tests

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

charm_lint_check #7178 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11959944/
Build: http://10.245.162.77:8080/job/charm_lint_check/7178/

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

charm_lint_check #7179 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11960092/
Build: http://10.245.162.77:8080/job/charm_lint_check/7179/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

229. By Liam Young on 2015-07-29

Fix ha_oneshot

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

charm_lint_check #7180 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11960254/
Build: http://10.245.162.77:8080/job/charm_lint_check/7180/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

230. By Liam Young on 2015-07-30

Disable auto-vip setting as charms ignore this atm

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

charm_lint_check #7263 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11965623/
Build: http://10.245.162.77:8080/job/charm_lint_check/7263/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

231. By Liam Young on 2015-07-30

Ressurect adding additional interfaces to gateways

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

charm_lint_check #7266 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11965849/
Build: http://10.245.162.77:8080/job/charm_lint_check/7266/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

232. By Liam Young on 2015-07-31

Add ha icehouse oneshot target

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

charm_lint_check #7328 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11971508/
Build: http://10.245.162.77:8080/job/charm_lint_check/7328/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

233. By Liam Young on 2015-07-31

Fix typo in yaml

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

charm_lint_check #7329 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11971606/
Build: http://10.245.162.77:8080/job/charm_lint_check/7329/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

234. By Liam Young on 2015-07-31

Add kilo oneshot support

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

charm_lint_check #7330 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11971814/
Build: http://10.245.162.77:8080/job/charm_lint_check/7330/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

235. By Liam Young on 2015-07-31

Fix mongodb location

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

charm_lint_check #7331 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11972032/
Build: http://10.245.162.77:8080/job/charm_lint_check/7331/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

236. By Liam Young on 2015-08-03

Another nosmart casualty

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

charm_lint_check #7454 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11991694/
Build: http://10.245.162.77:8080/job/charm_lint_check/7454/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

237. By Liam Young on 2015-08-03

Another nosmart casualty

238. By Liam Young on 2015-08-03

Another nosmart casualty

239. By Liam Young on 2015-08-03

Added missing lp:charms/trusty/ceph-osd

240. By Liam Young on 2015-08-03

Fix qg name

241. By Liam Young on 2015-08-03

Try another gq fix

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

charm_lint_check #7455 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11991807/
Build: http://10.245.162.77:8080/job/charm_lint_check/7455/

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

charm_lint_check #7459 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11992047/
Build: http://10.245.162.77:8080/job/charm_lint_check/7459/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

242. By Liam Young on 2015-08-03

Add ceph-osd in

243. By Liam Young on 2015-08-03

Merged trunk in

244. By Liam Young on 2015-08-03

Fix precise quantum gw

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

charm_lint_check #7484 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11993645/
Build: http://10.245.162.77:8080/job/charm_lint_check/7484/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

245. By Liam Young on 2015-08-04

Add missing ntp

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

charm_lint_check #7514 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11998175/
Build: http://10.245.162.77:8080/job/charm_lint_check/7514/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

246. By Liam Young on 2015-08-04

Updated ha stable collect

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

charm_lint_check #7516 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11998374/
Build: http://10.245.162.77:8080/job/charm_lint_check/7516/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

247. By Liam Young on 2015-08-04

Restore hacluster location

248. By Liam Young on 2015-08-04

Add ntp

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

charm_lint_check #7517 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11998731/
Build: http://10.245.162.77:8080/job/charm_lint_check/7517/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

249. By Liam Young on 2015-08-04

Add ceph-osd

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

charm_lint_check #7518 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11998841/
Build: http://10.245.162.77:8080/job/charm_lint_check/7518/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

250. By Liam Young on 2015-08-04

Add ntp

251. By Liam Young on 2015-08-04

Add ceph-osd

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

charm_lint_check #7519 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11999466/
Build: http://10.245.162.77:8080/job/charm_lint_check/7519/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

252. By Liam Young on 2015-08-04

Try adding delay to avoid servestack timeouts

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

charm_lint_check #7521 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12000057/
Build: http://10.245.162.77:8080/job/charm_lint_check/7521/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

253. By Liam Young on 2015-08-04

Remove deploy delay

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

charm_lint_check #7547 mojo-openstack-specs for gnuoy mp266239
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12000787/
Build: http://10.245.162.77:8080/job/charm_lint_check/7547/

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-ha]

254. By Liam Young on 2015-08-05

Merged trunk in

255. By Liam Young on 2015-08-05

Lint and spec summary fixes

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

charm_lint_check #7576 mojo-openstack-specs for gnuoy mp266239
    LINT OK: passed

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

[Ryan Beisner (1chb1n)]

Thanks for this work! Let's land this, then I'll rebase the branch that uosci is consuming.

review: Approve

=== modified file 'SPEC_SUMMARY.txt'
--- SPEC_SUMMARY.txt	2015-07-21 04:32:11 +0000
+++ SPEC_SUMMARY.txt	2015-08-05 09:14:07 +0000
@@ -1,105 +1,67 @@
-./specs/dev/vxlan/
-This spec deploys and tests a deployment with neutron DVR enabled
-
-./specs/dev/dvr/
-This spec deploys and tests a deployment with neutron DVR enabled
-
-./specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/
-This spec deploys a swift cluster fronted by multiple swift proxy front ends.
-Swift proxy and swift storage are then simultaniously scaled out and the
-resulting object store retested. WARNING: Scaling swift-proxy and
-swift-storage is simultaiously is currently not supported so this spec is
-known to fail
-
-./specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/
-This spec deploys a swift cluster fronted by multiple swift proxy front ends.
-Swift proxy is then scaled out and once that has completed swift storage is
-scaled out. The resulting object store is then retested.
-
-./specs/object_storage/swift_proxy/ha_serial_scaleout/juno/
-This spec deploys a swift cluster fronted by multiple swift proxy front ends.
-Swift proxy is then scaled out and once that has completed swift storage is
-scaled out. The resulting object store is then retested.
-
-./specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/
-This spec deploys a swift cluster fronted by multiple swift proxy front ends.
-Swift proxy is then scaled out and once that has completed swift storage is
-scaled out. The resulting object store is then retested.
-
-./specs/object_storage/swift_proxy/simple_nonha/icehouse/
-This spec deploys a swift cluster fronted by a single swift proxy. The
-resulting object store is then tested.
-
-./specs/object_storage/swift_proxy/simple_nonha/juno/
-This spec deploys a swift cluster fronted by a single swift proxy. The
-resulting object store is then tested.
-
-./specs/object_storage/swift_proxy/simple_nonha/kilo/
-This spec deploys a swift cluster fronted by a single swift proxy. The
-resulting object store is then tested.
-
-./specs/object_storage/ceph_radosgw/simple_nonha/icehouse/
-This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
-The cluster is then tested with mulitple object store gets and retrivals.
-Glance integeration is also tested.
-
-./specs/object_storage/ceph_radosgw/simple_nonha/juno/
-This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
-The cluster is then tested with mulitple object store gets and retrivals.
-Glance integeration is also tested.
-
-./specs/object_storage/ceph_radosgw/simple_nonha/kilo/
-This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
-The cluster is then tested with mulitple object store gets and retrivals.
-Glance integeration is also tested.
-
-./specs/object_storage/ceph_radosgw/ha/icehouse/
-This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
-The rados gw leader is removed and additional units added. With tests run
-after each change
-
-./specs/object_storage/ceph_radosgw/ha/juno/
-This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
-The rados gw leader is removed and additional units added. With tests run
-after each change
-
-./specs/object_storage/ceph_radosgw/ha/kilo/
-This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
-The rados gw leader is removed and additional units added. With tests run
-after each change
-
-./specs/full_stack/next_deploy_baremetal/icehouse/
+./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/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/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/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/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/next_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/next_deploy_baremetal/kilo/
+./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/next_deploy_baremetal/liberty/
+./specs/full_stack/stable_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/stable_to_next_ha/juno/
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment
+
+./specs/full_stack/stable_to_next_ha/icehouse/
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment
+
+./specs/full_stack/stable_to_next_ha/kilo/
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment
+
+./specs/full_stack/stable_to_next_ha/liberty/
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment
+
+./specs/full_stack/next_deploy/juno/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
 ./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
 
-./specs/full_stack/next_deploy/juno/
-This spec performs a non-ha deploy using the next charms and then runs tests
-to validate the deployment
-
 ./specs/full_stack/next_deploy/kilo/
 This spec performs a non-ha deploy using the next charms and then runs tests
 to validate the deployment
@@ -108,70 +70,30 @@
 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
-
-./specs/full_stack/ha_phased/juno/
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
-
-./specs/full_stack/ha_phased/kilo/
-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.
-
-./specs/full_stack/ha_phased_chaos_pony/juno/
-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/kilo/
-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/charmhelper_upgrade_ha/juno/
+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/icehouse/
+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/kilo/
+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/next_deploy_ssl/juno/
+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/icehouse/
 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/juno/
-This spec performs a non-ha deploy using the next charms wil ssl enabled
-and then runs tests to validate the deployment
-
 ./specs/full_stack/next_deploy_ssl/kilo/
 This spec performs a non-ha deploy using the next charms wil ssl enabled
 and then runs tests to validate the deployment
@@ -180,14 +102,14 @@
 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/juno/
+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/icehouse/
 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/juno/
-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/kilo/
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a non-ha deployment and testing the resulting cloud
@@ -196,14 +118,85 @@
 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/ha_oneshot/juno/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/ha_oneshot/icehouse/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/ha_oneshot/kilo/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/ha_phased_chaos_pony/juno/
+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/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.
+
+./specs/full_stack/ha_phased_chaos_pony/kilo/
+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/next_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/next_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/next_deploy_baremetal/kilo/
+This KILO spec deploys a non-ha 7-machine bundle, intended for bare metal
+with smoosh.  It uses the baremetal7.yaml bundle which aims to exercise a stack
+roughly equivalent to the next/default yamls.  As swift is the object store,
+ceph-radosgw is not exercised.
+
+./specs/full_stack/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/ha_phased/juno/
+This spec performs a phased ha deploy 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
+
+./specs/full_stack/ha_phased/kilo/
+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/stable_to_next/juno/
+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/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
 
-./specs/full_stack/stable_to_next/juno/
-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/kilo/
 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
@@ -212,51 +205,73 @@
 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
-
-./specs/full_stack/charmhelper_upgrade_ha/juno/
-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/kilo/
-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
-
-./specs/full_stack/stable_to_next_ha/juno/
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
-
-./specs/full_stack/stable_to_next_ha/kilo/
-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
+./specs/object_storage/swift_proxy/simple_nonha/juno/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./specs/object_storage/swift_proxy/simple_nonha/icehouse/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./specs/object_storage/swift_proxy/simple_nonha/kilo/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy and swift storage are then simultaniously scaled out and the
+resulting object store retested. WARNING: Scaling swift-proxy and
+swift-storage is simultaiously is currently not supported so this spec is
+known to fail
+
+./specs/object_storage/swift_proxy/ha_serial_scaleout/juno/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./specs/object_storage/ceph_radosgw/simple_nonha/juno/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./specs/object_storage/ceph_radosgw/simple_nonha/icehouse/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./specs/object_storage/ceph_radosgw/simple_nonha/kilo/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./specs/object_storage/ceph_radosgw/ha/juno/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./specs/object_storage/ceph_radosgw/ha/icehouse/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./specs/object_storage/ceph_radosgw/ha/kilo/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./specs/dev/dvr/
+This spec deploys and tests a deployment with neutron DVR enabled
+
+./specs/dev/vxlan/
+This spec deploys and tests a deployment with neutron DVR enabled
 

=== added file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/ha.yaml	2015-08-05 09:14:07 +0000
@@ -0,0 +1,522 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      charm: percona-cluster
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+        sst-password: changeme
+        root-password: changeme
+        vip: 10.5.100.1
+    rabbitmq-server:
+      charm: rabbitmq-server
+      constraints: mem=1G
+    ceph:
+      charm: ceph
+      num_units: 3
+      constraints: mem=1G
+      options:
+        monitor-count: 3
+        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
+        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
+        osd-devices: /dev/vdb
+        osd-reformat: "yes"
+        ephemeral-unmount: /mnt
+    keystone:
+      charm: keystone
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+        vip: 10.5.100.2
+    openstack-dashboard:
+      charm: openstack-dashboard
+      constraints: mem=1G
+      options:
+        vip: 10.5.100.3
+    nova-compute:
+      charm: nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+    nova-cloud-controller:
+      charm: nova-cloud-controller
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+        vip: 10.5.100.4
+    neutron-gateway:
+      charm: neutron-gateway
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      charm: cinder
+      constraints: mem=1G
+      options:
+        block-device: "None"
+        glance-api-version: 2
+        vip: 10.5.100.5
+    cinder-ceph:
+      charm: cinder-ceph
+    glance:
+      charm: glance
+      constraints: mem=1G
+      options:
+        vip: 10.5.100.9
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+        vip: 10.5.100.6
+    swift-storage-z1:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+      options:
+        vip: 10.5.100.7
+    ceilometer-agent:
+      charm: ceilometer-agent
+    heat:
+      charm: heat
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ nova-compute, ceph ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, ceph ]
+    - [ glance, cinder ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, cinder-ceph ]
+    - [ cinder-ceph, ceph ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      charm: neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+        vip: 10.5.100.8
+    neutron-openvswitch:
+      charm: neutron-openvswitch
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+openstack-icehouse-msg-split:
+  inherits: openstack-services
+  services:
+    neutron-api:
+      branch: lp:~le-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+    rabbitmq-server-neutron:
+      branch: lp:charms/trusty/rabbitmq-server
+      constraints: mem=1G
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server-neutron ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server-neutron ]
+  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
+  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
+# icehouse
+precise-icehouse:
+  inherits: openstack-singlerabbit
+  series: precise
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+precise-icehouse-proposed:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: cloud:precise-icehouse/proposed
+    source: cloud:precise-updates/icehouse
+precise-icehouse-staging:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging
+    source: ppa:ubuntu-cloud-archive/icehouse-staging
+precise-icehouse-trunk:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
+    source: ppa:openstack-ubuntu-testing/icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse
+  series: trusty
+trusty-icehouse-msg-split:
+  inherits: openstack-icehouse-msg-split
+  series: trusty
+trusty-icehouse-proposed:
+  inherits: trusty-icehouse
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-icehouse-trunk:
+  inherits: trusty-icehouse
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
+    source: ppa:openstack-ubuntu-testing/icehouse
+    offline-compression: "no"
+trusty-icehouse-ha:
+  inherits: trusty-icehouse
+  services:
+    keystone:
+      num_units: 3
+    keystone-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    cinder:
+      num_units: 3
+    cinder-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    glance:
+      num_units: 3
+    glance-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    rabbitmq-server:
+      num_units: 3
+    mysql:
+      num_units: 3
+    mysql-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    nova-cloud-controller:
+      num_units: 3
+    nova-cc-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    neutron-api:
+      num_units: 3
+    neutron-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    openstack-dashboard:
+      num_units: 3
+    dashboard-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    swift-proxy:
+      num_units: 3
+    swift-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer:
+      num_units: 3
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+  relations:
+    - [ mysql, mysql-hacluster ]
+    - [ keystone, keystone-hacluster ]
+    - [ nova-cloud-controller, nova-cc-hacluster ]
+    - [ cinder, cinder-hacluster ]
+    - [ glance, glance-hacluster ]
+    - [ openstack-dashboard, dashboard-hacluster ]
+    - [ ceilometer, ceilometer-hacluster ]
+    - [ neutron-api, neutron-hacluster ]
+    - [ swift-proxy, swift-hacluster ]
+# juno
+trusty-juno:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+trusty-juno-proposed:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: cloud:trusty-juno/proposed
+    source: cloud:trusty-juno/proposed
+trusty-juno-staging:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/juno-staging
+    source: ppa:ubuntu-cloud-archive/juno-staging
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+utopic-juno-proposed:
+  inherits: utopic-juno
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-juno-ha:
+  inherits: trusty-juno
+  services:
+    keystone:
+      num_units: 3
+    keystone-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    cinder:
+      num_units: 3
+    cinder-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    glance:
+      num_units: 3
+    glance-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    rabbitmq-server:
+      num_units: 3
+    mysql:
+      num_units: 3
+    mysql-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    nova-cloud-controller:
+      num_units: 3
+    nova-cc-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    neutron-api:
+      num_units: 3
+    neutron-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    openstack-dashboard:
+      num_units: 3
+    dashboard-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    swift-proxy:
+      num_units: 3
+    swift-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer:
+      num_units: 3
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+  relations:
+    - [ mysql, mysql-hacluster ]
+    - [ keystone, keystone-hacluster ]
+    - [ nova-cloud-controller, nova-cc-hacluster ]
+    - [ cinder, cinder-hacluster ]
+    - [ glance, glance-hacluster ]
+    - [ openstack-dashboard, dashboard-hacluster ]
+    - [ ceilometer, ceilometer-hacluster ]
+    - [ neutron-api, neutron-hacluster ]
+    - [ swift-proxy, swift-hacluster ]
+# kilo
+trusty-kilo:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+trusty-kilo-staging:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
+    source: ppa:ubuntu-cloud-archive/kilo-staging
+vivid-kilo:
+  inherits: openstack-icehouse
+  series: vivid
+vivid-kilo-proposed:
+  inherits: vivid-kilo
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-kilo-ha:
+  inherits: trusty-kilo
+  services:
+    keystone:
+      num_units: 3
+    keystone-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    cinder:
+      num_units: 3
+    cinder-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    glance:
+      num_units: 3
+    glance-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    rabbitmq-server:
+      num_units: 3
+    mysql:
+      num_units: 3
+    mysql-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    nova-cloud-controller:
+      num_units: 3
+    nova-cc-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    neutron-api:
+      num_units: 3
+    neutron-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    openstack-dashboard:
+      num_units: 3
+    dashboard-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    swift-proxy:
+      num_units: 3
+    swift-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    ceilometer:
+      num_units: 3
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+  relations:
+    - [ mysql, mysql-hacluster ]
+    - [ keystone, keystone-hacluster ]
+    - [ nova-cloud-controller, nova-cc-hacluster ]
+    - [ cinder, cinder-hacluster ]
+    - [ glance, glance-hacluster ]
+    - [ openstack-dashboard, dashboard-hacluster ]
+    - [ ceilometer, ceilometer-hacluster ]
+    - [ neutron-api, neutron-hacluster ]
+    - [ swift-proxy, swift-hacluster ]

=== modified file 'helper/collect/collect-next-ha'
--- helper/collect/collect-next-ha	2015-07-15 15:47:19 +0000
+++ helper/collect/collect-next-ha	2015-08-05 09:14:07 +0000
@@ -1,10 +1,11 @@
 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
-hacluster              lp:~gnuoy/charms/trusty/hacluster/charmhelper_sync
+hacluster              lp:~openstack-charmers/charms/trusty/hacluster/next
 heat                   lp:~openstack-charmers/charms/trusty/heat/next
 keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 mongodb                lp:charms/mongodb
@@ -13,8 +14,9 @@
 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
-percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/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-trusty'
--- helper/collect/collect-stable-ha-trusty	2015-07-15 20:41:16 +0000
+++ helper/collect/collect-stable-ha-trusty	2015-08-05 09:14:07 +0000
@@ -1,19 +1,21 @@
 # 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
+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
 hacluster              lp:charms/trusty/hacluster
 heat                   nosmart+lp:charms/trusty/heat
-keystone               lp:charms/trusty/keystone
+keystone               nosmart+lp:charms/trusty/keystone
 mongodb                lp:charms/mongodb
 neutron-api            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           lp:charms/trusty/nova-compute
+nova-compute           nosmart+lp:charms/trusty/nova-compute
+ntp                    lp:charms/trusty/ntp
 openstack-dashboard    nosmart+lp:charms/trusty/openstack-dashboard
 percona-cluster        lp:charms/trusty/percona-cluster
 rabbitmq-server        lp:charms/trusty/rabbitmq-server

=== modified file 'helper/collect/collect-stable-precise'
--- helper/collect/collect-stable-precise	2015-07-21 12:47:17 +0000
+++ helper/collect/collect-stable-precise	2015-08-05 09:14:07 +0000
@@ -1,4 +1,3 @@
-#
 ceilometer-agent       lp:charms/precise/ceilometer-agent
 ceilometer             lp:charms/precise/ceilometer
 ceph                   lp:charms/precise/ceph

=== modified file 'helper/collect/repo-next-ha'
--- helper/collect/repo-next-ha	2015-07-15 15:47:19 +0000
+++ helper/collect/repo-next-ha	2015-08-05 09:14:07 +0000
@@ -1,6 +1,7 @@
 ceilometer
 ceilometer-agent
 ceph
+ceph-osd
 cinder
 cinder-ceph
 glance
@@ -11,6 +12,7 @@
 neutron-api
 neutron-gateway
 neutron-openvswitch
+ntp
 nova-cloud-controller
 nova-compute
 openstack-dashboard

=== added file 'helper/setup/leader_chaos.py'
--- helper/setup/leader_chaos.py	1970-01-01 00:00:00 +0000
+++ helper/setup/leader_chaos.py	2015-08-05 09:14:07 +0000
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+import utils.mojo_os_utils as mojo_os_utils
+import logging
+import argparse
+import xml.dom.minidom
+import re
+import ast
+
+
+def rabbit_unit_status(unit):
+    cmd = 'rabbitmqctl -q cluster_status'
+    output = mojo_utils.remote_run(unit, remote_cmd=cmd)[0]
+    output = output.replace('\n', '')
+    matchObj = re.search(r'running_nodes,(.*)}, {partitions', output)
+    machine_numbers = []
+    for machine in ast.literal_eval(matchObj.group(1)):
+        machine_numbers.append(int(machine.split('-')[-1]))
+    return machine_numbers
+
+
+def rabbit_status():
+    juju_units = mojo_utils.get_juju_units(service='rabbitmq-server')
+    machine_numbers = get_machine_numbers('rabbitmq-server')
+    for unit in juju_units:
+        units = rabbit_unit_status(unit)
+        units.sort()
+        if machine_numbers == units:
+            logging.info('Rabbit status on %s look good' % (unit))
+        else:
+            msg = 'Mismatch on rabbit status for on unit {}'.format(unit)
+            raise Exception(msg)
+
+
+def unit_crm_online(unit):
+    output = mojo_utils.remote_run(unit, remote_cmd='crm_mon -X')
+    xml_out = output[0]
+    tree = xml.dom.minidom.parseString(xml_out)
+    itemlist = tree.getElementsByTagName('node')
+    online_units = []
+    for s in itemlist:
+        if 'online' in s.attributes.keys() \
+                and s.attributes['online'].value == 'true':
+            online_units.append(int(s.attributes['name'].value.split('-')[-1]))
+    online_units.sort()
+    return online_units
+
+
+def get_machine_numbers(service):
+    juju_units = mojo_utils.get_juju_units(service=service)
+    machine_numbers = []
+    for unit in juju_units:
+        machine_numbers.append(mojo_utils.convert_unit_to_machinename(unit))
+    machine_numbers.sort()
+    return machine_numbers
+
+
+def check_crm_status(service):
+    juju_units = mojo_utils.get_juju_units(service=service)
+    if not juju_units:
+        return
+    cmd = 'which crm_mon || echo "Not Found"'
+    output = mojo_utils.remote_run(juju_units[0], remote_cmd=cmd)
+    if output[0].rstrip() == "Not Found":
+        return
+    for unit in juju_units:
+        mach_nums = get_machine_numbers(service)
+        crm_online = unit_crm_online(unit)
+        if mach_nums == crm_online:
+            logging.info('Service %s status on %s look good' % (service, unit))
+        else:
+            logging.info('%s != %s' % (str(mach_nums), str(crm_online)))
+            msg = ('Mismatch on crm status for service {} '
+                   'on unit {}'.format(service, unit))
+            raise Exception(msg)
+
+
+def check_cluster_status(service):
+    if service == 'rabbitmq-service':
+        rabbit_status()
+    else:
+        check_crm_status(service)
+
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("term_method", default='juju', nargs='?')
+    #options = parser.parse_args()
+    #term_method = mojo_utils.parse_mojo_arg(options, 'term_method')
+    skip_services = ['neutron-gateway', 'mongodb', 'heat', 'rabbitmq-server']
+    princ_services = mojo_utils.get_principle_services()
+    services = [item for item in princ_services if item not in skip_services]
+    for svc in services:
+        doomed_service = services.pop(0)
+        mojo_os_utils.delete_juju_leader(doomed_service)
+        mojo_utils.juju_check_hooks_complete()
+        mojo_utils.juju_status_check_and_wait()
+        check_cluster_status(doomed_service)
+        mojo_utils.add_unit(doomed_service, unit_num=1)
+        mojo_utils.juju_status_check_and_wait()
+        mojo_utils.juju_check_hooks_complete()
+        check_crm_status(doomed_service)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== modified file 'helper/setup/upgrade_all_services.py'
--- helper/setup/upgrade_all_services.py	2015-01-26 20:14:02 +0000
+++ helper/setup/upgrade_all_services.py	2015-08-05 09:14:07 +0000
@@ -2,11 +2,16 @@
 import sys
 import utils.mojo_utils as mojo_utils
 import logging
+import os
 
 
 def main(argv):
     logging.basicConfig(level=logging.INFO)
-    mojo_utils.upgrade_all_services()
+    switch_map = {
+        'neutron-gateway': 'local:{}/{}'.format(os.environ['MOJO_SERIES'],
+                                                'neutron-gateway')
+    }
+    mojo_utils.upgrade_all_services(switch=switch_map)
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv))

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2015-07-31 01:16:19 +0000
+++ helper/utils/mojo_os_utils.py	2015-08-05 09:14:07 +0000
@@ -61,6 +61,7 @@
 def get_neutron_client(novarc_creds, insecure=True):
     neutron_creds = get_ks_creds(novarc_creds)
     neutron_creds['insecure'] = insecure
+    print neutron_creds
     return neutronclient.Client(**neutron_creds)
 
 
@@ -580,6 +581,19 @@
 
 # Hacluster helper
 
+def get_juju_leader(service):
+    # XXX Juju status should report the leader but doesn't at the moment.
+    # So, until it does run leader on the units
+    for unit in mojo_utils.get_juju_units(service=service):
+        leader_out = mojo_utils.remote_run(unit, 'is-leader')[0].strip()
+        if leader_out == 'True':
+            return unit
+
+
+def delete_juju_leader(service, resource=None, method='juju'):
+    mojo_utils.delete_unit(get_juju_leader(service), method=method)
+
+
 def get_crm_leader(service, resource=None):
     if not resource:
         resource = 'res_.*_vip'

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2015-07-31 01:16:19 +0000
+++ helper/utils/mojo_utils.py	2015-08-05 09:14:07 +0000
@@ -12,7 +12,8 @@
 JUJU_STATUSES = {
     'good': ['ACTIVE', 'started'],
     'bad': ['error'],
-    'transitional': ['pending', 'pending', 'down', 'installed', 'stopped'],
+    'transitional': ['pending', 'pending', 'down', 'installed', 'stopped',
+                     'allocating'],
 }
 
 
@@ -62,6 +63,12 @@
     return juju_status['machines'].itervalues().next()['instance-id']
 
 
+def convert_unit_to_machinename(unit):
+    juju_status = get_juju_status(unit)
+    service = unit.split('/')[0]
+    return int(juju_status['services'][service]['units'][unit]['machine'])
+
+
 def convert_machineno_to_unit(machineno, juju_status=None):
     if not juju_status:
         juju_status = get_juju_status()
@@ -326,18 +333,21 @@
             sync_charmhelpers(charm_dir)
 
 
-def upgrade_service(svc):
+def upgrade_service(svc, switch=None):
     repo_dir = os.environ['MOJO_REPO_DIR']
     logging.info('Upgrading ' + svc)
-    cmd = ['juju', 'upgrade-charm', '--repository', repo_dir, svc]
+    cmd = ['juju', 'upgrade-charm']
+    if switch and switch.get(svc):
+        cmd.extend(['--switch', switch[svc]])
+    cmd.extend(['--repository', repo_dir, svc])
     subprocess.check_call(cmd)
 
 
-def upgrade_all_services(juju_status=None):
+def upgrade_all_services(juju_status=None, switch=None):
     if not juju_status:
         juju_status = get_juju_status()
     for svc in juju_status['services']:
-        upgrade_service(svc)
+        upgrade_service(svc, switch=switch)
 
 
 def parse_mojo_arg(options, mojoarg, multiargs=False):

=== added directory 'specs/full_stack/ha_oneshot'
=== added directory 'specs/full_stack/ha_oneshot/icehouse'
=== added file 'specs/full_stack/ha_oneshot/icehouse/SPEC_INFO.txt'
--- specs/full_stack/ha_oneshot/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/icehouse/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -0,0 +1,3 @@
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.

=== added symlink 'specs/full_stack/ha_oneshot/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_oneshot/icehouse/manifest'
--- specs/full_stack/ha_oneshot/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/icehouse/manifest	2015-08-05 09:14:07 +0000
@@ -0,0 +1,32 @@
+# 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=ha.yaml delay=0 target=${MOJO_SERIES}-icehouse-ha
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services need updates to support this
+#script config=set_vips.py
+
+# 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"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/ha_oneshot/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_oneshot/icehouse/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_oneshot/juno'
=== added file 'specs/full_stack/ha_oneshot/juno/SPEC_INFO.txt'
--- specs/full_stack/ha_oneshot/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/juno/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -0,0 +1,3 @@
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.

=== added symlink 'specs/full_stack/ha_oneshot/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/juno/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_oneshot/juno/manifest'
--- specs/full_stack/ha_oneshot/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/juno/manifest	2015-08-05 09:14:07 +0000
@@ -0,0 +1,32 @@
+# 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=ha.yaml delay=0 target=${MOJO_SERIES}-juno-ha
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services need updates to support this
+#script config=set_vips.py
+
+# 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"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/ha_oneshot/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/juno/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_oneshot/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_oneshot/kilo'
=== added file 'specs/full_stack/ha_oneshot/kilo/SPEC_INFO.txt'
--- specs/full_stack/ha_oneshot/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/kilo/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -0,0 +1,3 @@
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.

=== added symlink 'specs/full_stack/ha_oneshot/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_oneshot/kilo/manifest'
--- specs/full_stack/ha_oneshot/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_oneshot/kilo/manifest	2015-08-05 09:14:07 +0000
@@ -0,0 +1,32 @@
+# 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=ha.yaml delay=0 target=${MOJO_SERIES}-kilo-ha
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services need updates to support this
+#script config=set_vips.py
+
+# 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"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/ha_oneshot/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_oneshot/kilo/utils'
=== target is u'../../../../helper/utils'
=== modified file 'specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt	2015-07-15 19:21:30 +0000
+++ specs/full_stack/stable_deploy_baremetal/liberty/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -1,4 +1,4 @@
-This KILO spec deploys a non-ha 7-machine bundle, intended for bare metal
+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.

=== modified file 'specs/full_stack/stable_to_next_ha/icehouse/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/icehouse/SPEC_INFO.txt	2015-04-20 09:35:09 +0000
+++ specs/full_stack/stable_to_next_ha/icehouse/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -1,2 +1,2 @@
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment

=== modified file 'specs/full_stack/stable_to_next_ha/juno/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/juno/SPEC_INFO.txt	2015-04-20 09:35:09 +0000
+++ specs/full_stack/stable_to_next_ha/juno/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -1,2 +1,2 @@
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment

=== modified file 'specs/full_stack/stable_to_next_ha/kilo/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/kilo/SPEC_INFO.txt	2015-04-20 09:35:09 +0000
+++ specs/full_stack/stable_to_next_ha/kilo/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -1,2 +1,2 @@
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment

=== modified file 'specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt	2015-07-15 19:21:30 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/SPEC_INFO.txt	2015-08-05 09:14:07 +0000
@@ -1,2 +1,2 @@
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment