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

[Liam Young]

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

charm_lint_check #13865 mojo-openstack-specs for gnuoy mp277598
    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/13300124/
Build: http://10.245.162.77:8080/job/charm_lint_check/13865/

[David Ames (thedac)]

Lint fixes needed

Also the SPEC_INFO.txt files need to be updated.
+++ specs/full_stack/next_ha_vrrp/liberty/SPEC_INFO.txt 2015-11-16 14:25:09 +0000 [27/9307]
@@ -0,0 +1,1 @@
+This spec deploys and tests a deployment with neutron DVR enabled

review: Needs Fixing

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

240. By Liam Young on 2015-11-18

Mix lint and general tidy

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

charm_lint_check #13985 mojo-openstack-specs for gnuoy mp277598
    LINT OK: passed

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

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

241. By Liam Young on 2015-11-18

Fix spec summary

[David Ames (thedac)]

Looks good.

review: Approve

=== modified file 'SPEC_SUMMARY.txt'
--- SPEC_SUMMARY.txt	2015-10-20 03:23:31 +0000
+++ SPEC_SUMMARY.txt	2015-11-18 15:46:59 +0000
@@ -1,8 +1,262 @@
-./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/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/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 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/kilo/
+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/next_charmhelper_sync_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/next_charmhelper_sync_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/next_charmhelper_sync_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/next_charmhelper_sync_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_ha_vrrp/kilo/
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible
+
+./specs/full_stack/next_ha_vrrp/liberty/
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible
+
+./specs/full_stack/next_openstack_upgrade/juno/
+This spec performs a non-ha deploy using the next charms and then upgrades
+to the next version of openstack
+
+./specs/full_stack/next_openstack_upgrade/icehouse/
+This spec performs a non-ha deploy using the next charms and then upgrades
+to the next version of openstack
+
+./specs/full_stack/next_openstack_upgrade/kilo/
+This spec performs a non-ha deploy using the next charms and then upgrades
+to the next version of openstack
+
+./specs/full_stack/next_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/next_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/next_ha_oneshot/kilo/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/next_ha_oneshot/liberty/
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
+
+./specs/full_stack/next_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/kilo/
+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/stable_deploy_ssl/juno/
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./specs/full_stack/stable_deploy_ssl/icehouse/
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./specs/full_stack/stable_deploy_ssl/kilo/
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./specs/full_stack/stable_deploy_ssl/liberty/
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./specs/full_stack/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/next_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/next_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/next_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/next_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_ha_phased/juno/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./specs/full_stack/next_ha_phased/icehouse/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./specs/full_stack/next_ha_phased/kilo/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./specs/full_stack/next_ha_phased/liberty/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./specs/full_stack/next_charmhelper_sync/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/next_charmhelper_sync/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/next_charmhelper_sync/kilo/
+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/next_charmhelper_sync/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/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/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
+
+./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/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.
@@ -11,295 +265,54 @@
 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/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/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/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/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/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/
-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/
-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/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
-
-./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_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/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/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/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/openstack_upgrade/icehouse/
-This spec performs a non-ha deploy using the next charms and then upgrades
-to the next version of openstack
-
-./specs/full_stack/openstack_upgrade/juno/
-This spec performs a non-ha deploy using the next charms and then upgrades
-to the next version of openstack
-
-./specs/full_stack/openstack_upgrade/kilo/
-This spec performs a non-ha deploy using the next charms and then upgrades
-to the next version of openstack
-
-./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 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_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
-
-./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
-
-./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
-
-./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
-
-./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
-
-./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/stable_deploy_ssl/icehouse/
-This spec performs a non-ha deploy using the stable charms wil ssl enabled
-and then runs tests to validate the deployment
-
-./specs/full_stack/stable_deploy_ssl/juno/
-This spec performs a non-ha deploy using the stable charms wil ssl enabled
-and then runs tests to validate the deployment
-
-./specs/full_stack/stable_deploy_ssl/kilo/
-This spec performs a non-ha deploy using the stable charms wil ssl enabled
-and then runs tests to validate the deployment
-
-./specs/full_stack/stable_deploy_ssl/liberty/
-This spec performs a non-ha deploy using the stable charms wil ssl enabled
-and then runs tests to validate the deployment
-
-./specs/full_stack/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 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/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/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/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/full_vrrpha.yaml'
--- helper/bundles/full_vrrpha.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/full_vrrpha.yaml	2015-11-18 15:46:59 +0000
@@ -0,0 +1,200 @@
+# vim: set ts=2 et:
+openstack-services:
+  services:
+    mysql:
+      charm: percona-cluster
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+    rabbitmq-server:
+      charm: rabbitmq-server
+      constraints: mem=1G
+    keystone:
+      charm: keystone
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      charm: openstack-dashboard
+      constraints: mem=1G
+    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: Quantum
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      charm: neutron-gateway
+      constraints: mem=1G
+      num_units: 2
+      options:
+        instance-mtu: 1300
+    cinder:
+      charm: cinder
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints": mem=1G
+    glance:
+      charm: glance
+      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 ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, cinder ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+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:
+        overlay-network-type: 'vxlan'
+        l2-population: False
+        neutron-security-groups: True
+        enable-dvr: False
+        enable-l3ha: True
+    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-plugin-api" ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+  - [ neutron-openvswitch, nova-cloud-controller ]
+openstack-icehouse-msg-split:
+  inherits: openstack-services
+  services:
+    neutron-api:
+      charm: neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      charm: neutron-openvswitch
+    rabbitmq-server-neutron:
+      charm: 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-updates/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"
+# juno
+trusty-juno:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-updates/juno
+trusty-juno-proposed:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: cloud:trusty-juno/proposed
+    source: cloud:trusty-proposed/juno
+trusty-juno-staging:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/juno-staging
+    source: ppa:ubuntu-cloud-archive/juno-staging
+trusty-kilo:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+utopic-juno-proposed:
+  inherits: utopic-juno
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+vivid-kilo:
+  inherits: openstack-icehouse
+  series: vivid

=== modified file 'helper/setup/network.yaml'
--- helper/setup/network.yaml	2014-12-16 07:59:12 +0000
+++ helper/setup/network.yaml	2015-11-18 15:46:59 +0000
@@ -9,3 +9,15 @@
   private_net_cidr: 192.168.21.0/24
   router_name: provider-router
   start_floating_ip: 10.5.150.0
+vrrpha:
+  default_gateway: 10.5.0.1
+  end_floating_ip: 10.5.200.254
+  external_dns: 10.98.191.11
+  external_net_cidr: 10.5.0.0/16
+  external_net_name: ext_net
+  external_subnet_name: ext_net_subnet
+  network_type: vxlan
+  private_net_cidr: 192.168.21.0/24
+  router_name: provider-router
+  start_floating_ip: 10.5.150.0
+  dvr_enabled: False

=== added file 'helper/tests/test_vrrp_ha.py'
--- helper/tests/test_vrrp_ha.py	1970-01-01 00:00:00 +0000
+++ helper/tests/test_vrrp_ha.py	2015-11-18 15:46:59 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/python
+import time
+import sys
+import utils.mojo_utils as mojo_utils
+import utils.mojo_os_utils as mojo_os_utils
+import logging
+
+
+def lookup_cirros_server(cloud_auth):
+    cirros_images = get_cirros_images(cloud_auth)
+    nova_client = mojo_os_utils.get_nova_client(cloud_auth)
+    for server in nova_client.servers.list():
+        if server.image['id'] in cirros_images:
+            return server
+
+
+def get_cirros_server(cloud_auth, image_password):
+    logging.info('Looking for existing cirros server')
+    cirros_server = lookup_cirros_server(cloud_auth)
+    if cirros_server:
+        ip = get_server_floating_ip(cirros_server)
+        logging.info('Checking connectivity to cirros guest')
+        if not mojo_os_utils.ssh_test('cirros', ip, cirros_server.name,
+                                      password=image_password):
+            raise Exception('Cirros guest inaccessable')
+    else:
+        nova_client = mojo_os_utils.get_nova_client(cloud_auth)
+        logging.info('Creating new cirros guest')
+        mojo_os_utils.boot_and_test(
+            nova_client,
+            image_name='cirros',
+            flavor_name='m1.small',
+            number=1,
+            privkey=None,
+        )
+        cirros_server = lookup_cirros_server(cloud_auth)
+        ip = get_server_floating_ip(cirros_server)
+    return cirros_server, ip
+
+
+def get_cirros_images(cloud_auth):
+    logging.info('Getting list of cirros images')
+    glance_client = mojo_os_utils.get_glance_client(cloud_auth)
+    cirros_images = []
+    for image in glance_client.images.list():
+        if 'cirros' in image.name:
+            cirros_images.append(image.id)
+    return cirros_images
+
+
+def check_server_state(nova_client, state, server_id=None, server_name=None,
+                       wait_time=120):
+    sleep_time = 2
+    if server_name:
+        server_id = nova_client.servers.find(name=server_name).id
+    server = nova_client.servers.find(id=server_id)
+    while server.status != state and wait_time > 0:
+        time.sleep(sleep_time)
+        server = nova_client.servers.find(id=server_id)
+        wait_time -= sleep_time
+    return server.status == state
+
+
+def check_neutron_agent_states(neutron_client, host_name, wait_time=120):
+    sleep_time = 2
+    statuses = [False]
+    while False in statuses and wait_time > 0:
+        time.sleep(sleep_time)
+        statuses = []
+        for agent in neutron_client.list_agents()['agents']:
+            if agent['host'] == host_name:
+                statuses.append(agent['admin_state_up'])
+                statuses.append(agent['alive'])
+        wait_time -= sleep_time
+    return False not in statuses
+
+
+def get_server_floating_ip(server):
+    for addr in server.addresses['private']:
+        if addr['OS-EXT-IPS:type'] == 'floating':
+            return addr['addr']
+
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    logging.getLogger("urllib3").setLevel(logging.WARNING)
+    overcloud_novarc = mojo_utils.get_overcloud_auth()
+    undercloud_novarc = mojo_utils.get_undercloud_auth()
+    under_novac = mojo_os_utils.get_nova_client(undercloud_novarc)
+    over_neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
+    image_config = mojo_utils.get_mojo_config('images.yaml')
+    image_password = image_config['cirros']['password']
+    # Look for existing Cirros guest
+    server, ip = get_cirros_server(overcloud_novarc, image_password)
+    router = over_neutronc.list_routers(name='provider-router')['routers'][0]
+    l3_agents = over_neutronc.list_l3_agent_hosting_routers(
+        router=router['id'])['agents']
+    logging.info('Checking there are multiple L3 agents running tenant router')
+    if len(l3_agents) != 2:
+        raise Exception('Unexpected number of l3 agents')
+    for agent in l3_agents:
+        gateway_hostname = agent['host']
+        gateway_server = under_novac.servers.find(name=gateway_hostname)
+        logging.info('Shutting down neutron gateway {} ({})'.format(
+            gateway_hostname,
+            gateway_server.id)
+        )
+        gateway_server.stop()
+        if not check_server_state(under_novac, 'SHUTOFF',
+                                  server_name=gateway_hostname):
+            raise Exception('Server failed to reach SHUTOFF state')
+        logging.info('Neutron gateway %s has shutdown' % (gateway_hostname))
+        logging.info('Checking connectivity to cirros guest')
+        if not mojo_os_utils.wait_for_ping(ip, 90):
+            raise Exception('Cirros guest not responding to ping')
+        if not mojo_os_utils.ssh_test('cirros', ip, server.name,
+                                      password=image_password):
+            raise Exception('Cirros guest issh connection failed')
+        logging.info('Starting neutron gateway: ' + gateway_hostname)
+        gateway_server.start()
+        if not check_server_state(under_novac, 'ACTIVE',
+                                  server_name=gateway_hostname):
+            raise Exception('Server failed to reach SHUTOFF state')
+        if not check_neutron_agent_states(over_neutronc, gateway_hostname):
+            raise Exception('Server agents failed to reach active state')
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== added directory 'specs/full_stack/next_ha_vrrp'
=== added directory 'specs/full_stack/next_ha_vrrp/kilo'
=== added file 'specs/full_stack/next_ha_vrrp/kilo/SPEC_INFO.txt'
--- specs/full_stack/next_ha_vrrp/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_vrrp/kilo/SPEC_INFO.txt	2015-11-18 15:46:59 +0000
@@ -0,0 +1,2 @@
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible

=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/full_vrrpha.yaml'
=== target is u'../../../../helper/bundles/full_vrrpha.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_ha_vrrp/kilo/manifest'
--- specs/full_stack/next_ha_vrrp/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_vrrp/kilo/manifest	2015-11-18 15:46:59 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Use juju deployer with full.yaml bundle
+deploy config=full_vrrpha.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 NET_TOPOLOGY="vrrpha"
+
+# 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 guest connectivity after stopping and starting gateway
+verify config=test_vrrp_ha.py
+
+# Success

=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/test_vrrp_ha.py'
=== target is u'../../../../helper/tests/test_vrrp_ha.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/kilo/utils'
=== target is u'../../../../helper/utils/'
=== added directory 'specs/full_stack/next_ha_vrrp/liberty'
=== added file 'specs/full_stack/next_ha_vrrp/liberty/SPEC_INFO.txt'
--- specs/full_stack/next_ha_vrrp/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_vrrp/liberty/SPEC_INFO.txt	2015-11-18 15:46:59 +0000
@@ -0,0 +1,2 @@
+This spec deploys and tests a deployment with neutron VRRP enabled, it then
+takes down the gateways in turn and checks a guest remains accessible

=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/full_vrrpha.yaml'
=== target is u'../../../../helper/bundles/full_vrrpha.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_ha_vrrp/liberty/manifest'
--- specs/full_stack/next_ha_vrrp/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_vrrp/liberty/manifest	2015-11-18 15:46:59 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Use juju deployer with full.yaml bundle
+deploy config=full_vrrpha.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 NET_TOPOLOGY="vrrpha"
+
+# 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 guest connectivity after stopping and starting gateway
+verify config=test_vrrp_ha.py
+
+# Success

=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/test_vrrp_ha.py'
=== target is u'../../../../helper/tests/test_vrrp_ha.py'
=== added symlink 'specs/full_stack/next_ha_vrrp/liberty/utils'
=== target is u'../../../../helper/utils/'