Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-spec-tidy-l2pop into lp:openstack-mojo-specs

[Liam Young]

add sepcs for l2pop and openstack upgrades

[lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-spec-tidy-l2pop]

213. By Liam Young on 2015-02-20

Added vrrp_ha spec

214. By Liam Young on 2015-02-20

enable-l3ha on deploy for vrrp_ha spec

215. By Liam Young on 2015-02-24

Add vrrp ha test

216. By Liam Young on 2015-02-24

Remove debug print

217. By Liam Young on 2015-02-24

Update nrpe spec with brads new branches

218. By Liam Young on 2015-02-26

Added full_nrpe_ha spec

219. By Liam Young on 2015-02-26

Fix repo

220. By Liam Young on 2015-02-26

Add missing ceph-osd

221. By Liam Young on 2015-03-03

Added spec for Bug 1427660

222. By Liam Young on 2015-03-24

Add spec for testinmg neutron shuffle branches

223. By Liam Young on 2015-03-27

Add kilo spec

224. By Liam Young on 2015-03-27

Remove ceilometer due to mongodb issues

225. By Liam Young on 2015-03-27

Use percona

226. By Liam Young on 2015-03-27

use mysql kilo branch

227. By Liam Young on 2015-03-27

Fix kilo branch

228. By Liam Young on 2015-03-27

api kilo fix branch

229. By Liam Young on 2015-03-27

ncc kilo fix branch

230. By Liam Young on 2015-03-30

Use Mr Pages ppa for kilo charm testing

231. By Liam Young on 2015-03-30

Restore James' branches

232. By Liam Young on 2015-03-30

Kilo ppa for vivid

233. By Liam Young <email address hidden> on 2015-03-31

Update dvr branches as some have landed

234. By Liam Young <email address hidden> on 2015-03-31

Remove removed relation from deployer yaml

235. By Liam Young on 2015-04-19

Update nrpe spec

236. By Liam Young on 2015-04-19

Merged trunk in

237. By Liam Young on 2015-04-19

Be explicit about nrpe relation

238. By Liam Young on 2015-04-19

Actually include nagios charm

239. By Liam Young on 2015-04-21

Test new neutron-api branch

240. By Liam Young on 2015-04-21

Add missing relation to dvr spec

241. By Liam Young on 2015-05-01

Switch to vivid kilo

242. By Liam Young on 2015-05-01

Merge trunk in

243. By Liam Young on 2015-05-01

Switch to next branches

244. By Liam Young on 2015-05-05

Merged trunk in

245. By Liam Young on 2015-05-05

Back to vivid kilo

246. By Liam Young on 2015-05-05

Switch to percona

247. By Liam Young on 2015-05-05

Switch to trusty

248. By Liam Young on 2015-05-05

Add trusty kilo target

249. By Liam Young on 2015-05-05

Blog spec

250. By Liam Young on 2015-05-05

Fix blog spec to not run vrrp tests immediatly

251. By Liam Young on 2015-05-08

Test vrrp fix branches

252. By Liam Young on 2015-05-08

Restore netconfig

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

charm_lint_check #6898 mojo-openstack-specs for gnuoy mp249489
    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/11933116/
Build: http://10.245.162.77:8080/job/charm_lint_check/6898/

[Ryan Beisner (1chb1n)]

Bwahahaaa. I've unleashed the bot on our mojo specs. ;-)

Take note that my proposed branch is what uosci is running, and it has more lint check logic.
lp:~1chb1n/openstack-mojo-specs/baremetal-bundle-constrainer

Unmerged revisions

252. By Liam Young on 2015-05-08

Restore netconfig

251. By Liam Young on 2015-05-08

Test vrrp fix branches

250. By Liam Young on 2015-05-05

Fix blog spec to not run vrrp tests immediatly

249. By Liam Young on 2015-05-05

Blog spec

248. By Liam Young on 2015-05-05

Add trusty kilo target

247. By Liam Young on 2015-05-05

Switch to trusty

246. By Liam Young on 2015-05-05

Switch to percona

245. By Liam Young on 2015-05-05

Back to vivid kilo

244. By Liam Young on 2015-05-05

Merged trunk in

243. By Liam Young on 2015-05-01

Switch to next branches

=== modified file 'helper/collect/collect-next'
--- helper/collect/collect-next	2015-01-24 13:11:08 +0000
+++ helper/collect/collect-next	2015-05-08 09:54:56 +0000
@@ -8,7 +8,7 @@
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
 openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
 nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
-quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+quantum-gateway        lp:~gnuoy/charms/trusty/quantum-gateway/neutron-contexts
 cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
 swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
 ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
@@ -16,4 +16,4 @@
 mongodb                lp:charms/mongodb
 cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
 heat                   lp:~openstack-charmers/charms/trusty/heat/next
-neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+neutron-openvswitch    lp:~gnuoy/charms/trusty/neutron-openvswitch/neutron-contexts
 
=== modified file 'helper/collect/repo-next'
--- helper/collect/repo-next	2014-12-16 07:59:12 +0000
+++ helper/collect/repo-next	2015-05-08 09:54:56 +0000
@@ -1,4 +1,4 @@
-mysql
+percona-cluster
 rabbitmq-server
 ceph
 keystone
 
=== added file 'helper/setup/upgrade_openstack.py'
--- helper/setup/upgrade_openstack.py	1970-01-01 00:00:00 +0000
+++ helper/setup/upgrade_openstack.py	2015-05-08 09:54:56 +0000
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+import logging
+import argparse
+
+OS_ORIGINS = {
+    'trusty-juno': {
+        'openstack-origin': 'cloud:trusty-juno',
+        'source': 'cloud:trusty-juno'
+    },
+    'trusty-juno-proposed': {
+        'openstack-origin': 'cloud:trusty-juno/proposed',
+        'source': 'cloud:trusty-proposed/juno'
+    },
+    'trusty-juno-staging': {
+        'openstack-origin': 'ppa:ubuntu-cloud-archive/juno-staging',
+        'source': 'ppa:ubuntu-cloud-archive/juno-staging'
+    },
+    'utopic-juno-proposed': {
+        'openstack-origin': 'distro-proposed',
+        'source': 'proposed'
+    },
+    'trusty-kilo': {
+        'openstack-origin': 'cloud:trusty-kilo',
+        'source': 'cloud:trusty-kilo'
+    },
+    'trusty-kilo-proposed': {
+        'openstack-origin': 'cloud:trusty-kilo/proposed',
+        'source': 'cloud:trusty-proposed/kilo'
+    },
+    'trusty-kilo-staging': {
+        'openstack-origin': 'ppa:ubuntu-cloud-archive/kilo-staging',
+        'source': 'ppa:ubuntu-cloud-archive/kilo-staging'
+    },
+    'vivid-kilo-proposed': {
+        'openstack-origin': 'distro-proposed',
+        'source': 'proposed'
+    },
+}
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("upgrade_to", nargs="?")
+    options = parser.parse_args()
+    release = mojo_utils.parse_mojo_arg(options, 'upgrade_to')
+    juju_status = mojo_utils.get_juju_status()
+    for svc in juju_status['services']:
+        units = mojo_utils.get_juju_units(juju_status=juju_status, service=svc)
+        machine_number = mojo_utils.convert_unit_to_machineno(units[0])
+        series = mojo_utils.get_machine_series(machine_number)
+        key = series + '-' + release
+        svc_options = mojo_utils.juju_get_config_keys(svc)
+        if 'openstack-origin' in svc_options:
+            mojo_utils.juju_set(svc, '%s=%s' % ('openstack-origin', OS_ORIGINS[key]['openstack-origin']), wait=False)
+        elif 'source' in svc_options:
+            mojo_utils.juju_set(svc, '%s=%s' % ('source', OS_ORIGINS[key]['source']), wait=False)
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2015-02-10 07:55:00 +0000
+++ helper/utils/mojo_os_utils.py	2015-05-08 09:54:56 +0000
@@ -518,6 +518,7 @@
 
 def ssh_test(username, ip, vm_name, password=None, privkey=None):
     logging.info('Attempting to ssh to %s(%s)' % (vm_name, ip))
+    logging.getLogger("paramiko").setLevel(logging.WARNING)
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
     if privkey:
 
=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2015-02-10 07:55:00 +0000
+++ helper/utils/mojo_utils.py	2015-05-08 09:54:56 +0000
@@ -6,7 +6,7 @@
 import mojo
 import logging
 import time
-from collections import Counter
+from collections import Counter, defaultdict
 import shutil
 
 JUJU_STATUSES = {
@@ -33,19 +33,16 @@
 
 
 def get_juju_units(juju_status=None, service=None):
-    if not juju_status:
-        juju_status = get_juju_status()
+    machine_map = get_unit_to_machineno_mapping(juju_status)
     units = []
-    if service:
-        services = [service]
+    if not service:
+        units = machine_map.keys()
     else:
-        services = [svc for svc in juju_status['services']]
-    for svc in services:
-        if 'units' in juju_status['services'][svc]:
-            for unit in juju_status['services'][svc]['units']:
+        for unit in machine_map.keys():
+            if unit.split('/')[0] == service:
                 units.append(unit)
     return units
-
+        
 
 def get_principle_services(juju_status=None):
     if not juju_status:
@@ -57,21 +54,50 @@
     return p_services
 
 
-def convert_unit_to_machineno(unit):
+def get_machine_series(machineno, juju_status=None):
+    if not juju_status:
+        juju_status = get_juju_status()
+    return juju_status['machines'][machineno]['series']
+
+
+def get_machineno_to_unit_mapping(juju_status=None):
+    if not juju_status:
+        juju_status = get_juju_status()
+    machine_map = defaultdict(list)
+    for svc in juju_status['services']:
+        if 'units' in juju_status['services'][svc]:
+            principle_units = juju_status['services'][svc]['units']
+            for unit in principle_units:
+                machine_no = principle_units[unit]['machine']
+                machine_map[machine_no].append(unit)
+                if 'subordinates' in principle_units[unit]:
+                    subordinet_units = principle_units[unit]['subordinates']
+                    machine_map[machine_no].extend(subordinet_units.keys())
+    return dict(machine_map)
+
+
+def get_unit_to_machineno_mapping(juju_status=None):
+    rmap = get_machineno_to_unit_mapping(juju_status)
+    unit_map = {}
+    for machine_no in rmap:
+        for unit in rmap[machine_no]:
+            unit_map[unit] = machine_no
+    return unit_map
+
+
+def convert_unit_to_machineno(unit, juju_status=None):
+    unitmap = get_unit_to_machineno_mapping(juju_status)
+    return unitmap[unit]
+
+
+def convert_unit_to_instanceid(unit):
     juju_status = get_juju_status(unit)
     return juju_status['machines'].itervalues().next()['instance-id']
 
 
 def convert_machineno_to_unit(machineno, juju_status=None):
-    if not juju_status:
-        juju_status = get_juju_status()
-    services = [service for service in juju_status['services']]
-    for svc in services:
-        if 'units' in juju_status['services'][svc]:
-            for unit in juju_status['services'][svc]['units']:
-                unit_info = juju_status['services'][svc]['units'][unit]
-                if unit_info['machine'] == machineno:
-                    return unit
+    machinemap = get_machineno_to_unit_mapping(juju_status)
+    return machinemap[machineno]
 
 
 def remote_shell_check(unit, timeout=None):
@@ -131,7 +157,7 @@
 
 def delete_unit_openstack(unit):
     from novaclient.v1_1 import client as novaclient
-    server_id = convert_unit_to_machineno(unit)
+    server_id = convert_unit_to_instanceid(unit)
     cloud_creds = get_undercload_auth()
     auth = {
         'username': cloud_creds['OS_USERNAME'],
@@ -166,8 +192,9 @@
 
 def delete_machine(machine):
     mach_no = machine.split('-')[-1]
-    unit = convert_machineno_to_unit(mach_no)
-    delete_unit(unit)
+    units = convert_machineno_to_unit(mach_no)
+    for unit in units:
+        delete_unit(unit)
 
 
 def is_crm_clustered(service):
 
=== added directory 'specs/bugs/1427660'
=== added directory 'specs/bugs/1427660/icehouse'
=== added file 'specs/bugs/1427660/icehouse/SPEC_INFO.txt'
--- specs/bugs/1427660/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/bugs/1427660/icehouse/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/bugs/1427660/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added file 'specs/bugs/1427660/icehouse/collect-next'
--- specs/bugs/1427660/icehouse/collect-next	1970-01-01 00:00:00 +0000
+++ specs/bugs/1427660/icehouse/collect-next	2015-05-08 09:54:56 +0000
@@ -0,0 +1,19 @@
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+neutron-api            lp:~openstack-charmers/charms/trusty/neutron-api/next
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+glance                 lp:~openstack-charmers/charms/trusty/glance/next
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+mysql                  lp:charms/mysql
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+nova-compute           lp:~gnuoy/charms/trusty/nova-compute/1427660
+quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+mongodb                lp:charms/mongodb
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
 
=== added symlink 'specs/bugs/1427660/icehouse/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/bugs/1427660/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/bugs/1427660/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/bugs/1427660/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/bugs/1427660/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/bugs/1427660/icehouse/manifest'
--- specs/bugs/1427660/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/bugs/1427660/icehouse/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/bugs/1427660/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/bugs/1427660/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/bugs/1427660/icehouse/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/bugs/1427660/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/bugs/1427660/icehouse/utils'
=== target is u'../../../../helper/utils'
=== modified file 'specs/dev/dvr/collect-next'
--- specs/dev/dvr/collect-next	2015-02-04 16:33:38 +0000
+++ specs/dev/dvr/collect-next	2015-05-08 09:54:56 +0000
@@ -1,5 +1,5 @@
 nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-neutron-api            lp:~gnuoy/charms/trusty/neutron-api/dvr-support
+neutron-api            lp:~gnuoy/charms/trusty/neutron-api/fix-neutron-query
 keystone               lp:~openstack-charmers/charms/trusty/keystone/next
 glance                 lp:~openstack-charmers/charms/trusty/glance/next
 swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
@@ -7,8 +7,8 @@
 rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
 openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-nova-compute           lp:~gnuoy/charms/trusty/nova-compute/dvr-support/
-quantum-gateway        lp:~gnuoy/charms/trusty/quantum-gateway/dvr-support
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
 cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
 swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
 ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
@@ -16,4 +16,4 @@
 mongodb                lp:charms/mongodb
 cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
 heat                   lp:~openstack-charmers/charms/trusty/heat/next
-neutron-openvswitch    lp:~gnuoy/charms/trusty/neutron-openvswitch/dvr-support
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
 
=== modified file 'specs/dev/full_nrpe/collect-next'
--- specs/dev/full_nrpe/collect-next	2015-01-26 08:31:29 +0000
+++ specs/dev/full_nrpe/collect-next	2015-05-08 09:54:56 +0000
@@ -8,13 +8,14 @@
 ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
 openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
 nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
-quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+quantum-gateway        lp:~gnuoy/charms/trusty/quantum-gateway/neutron-contexts
 cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
 swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
 ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
-ceilometer-agent       lp:~gnuoy/charms/trusty/ceilometer-agent/add-nrpe-checks
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
 mongodb                lp:charms/mongodb
 cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
 heat                   lp:~openstack-charmers/charms/trusty/heat/next
-neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-nrpe-external-master   lp:charms/nrpe-external-master
+neutron-openvswitch    lp:~gnuoy/charms/trusty/neutron-openvswitch/neutron-contexts
+nrpe                   lp:~gnuoy/charms/trusty/nrpe/services-rewrite
+nagios                 lp:charms/trusty/nagios
 
=== modified file 'specs/dev/full_nrpe/next.yaml'
--- specs/dev/full_nrpe/next.yaml	2015-01-12 13:53:35 +0000
+++ specs/dev/full_nrpe/next.yaml	2015-05-08 09:54:56 +0000
@@ -92,40 +92,42 @@
     mongodb:
       branch: lp:charms/mongodb
       constraints: mem=1G
+    nagios:
+      charm: nagios
     nrpe-nova-cloud-controller:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-neutron-api:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-keystone:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-glance:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-swift-proxy:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-mysql:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-rabbitmq-server:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-ceph:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-openstack-dashboard:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-nova-compute:
-      charm: nrpe-external-master
+      charm: nrpe
       options:
         procs: "-w200 -C300"
     nrpe-quantum-gateway:
-      charm: nrpe-external-master
+      charm: nrpe
       options:
         procs: "-w200 -C300"
     nrpe-cinder:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-swift-storage:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-ceilometer:
-      charm: nrpe-external-master
+      charm: nrpe
     nrpe-heat:
-      charm: nrpe-external-master
+      charm: nrpe
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -160,19 +162,31 @@
     - [ ceilometer-agent, nova-compute ]
     - [ ceilometer-agent, ceilometer ]
     - [ nrpe-nova-cloud-controller, nova-cloud-controller ]
+    - [ "nrpe-nova-cloud-controller:monitors", "nagios:monitors" ]
     - [ nrpe-neutron-api, neutron-api ]
+    - [ "nrpe-neutron-api:monitors", "nagios:monitors" ]
     - [ nrpe-keystone, keystone ]
+    - [ "nrpe-keystone:monitors", "nagios:monitors" ]
     - [ nrpe-glance, glance ]
+    - [ "nrpe-glance:monitors", "nagios:monitors" ]
     - [ nrpe-swift-proxy, swift-proxy ]
+    - [ "nrpe-swift-proxy:monitors", "nagios:monitors" ]
     - [ nrpe-ceph, ceph ]
+    - [ "nrpe-ceph:monitors", "nagios:monitors" ]
     - [ nrpe-openstack-dashboard, openstack-dashboard ]
+    - [ "nrpe-openstack-dashboard:monitors", "nagios:monitors" ]
     - [ nrpe-nova-compute, nova-compute ]
+    - [ "nrpe-nova-compute:monitors", "nagios:monitors" ]
     - [ nrpe-quantum-gateway, neutron-gateway ]
+    - [ "nrpe-quantum-gateway:monitors", "nagios:monitors" ]
     - [ nrpe-cinder, cinder ]
+    - [ "nrpe-cinder:monitors", "nagios:monitors" ]
     - [ nrpe-swift-storage, swift-storage-z1 ]
     - [ nrpe-swift-storage, swift-storage-z2 ]
     - [ nrpe-swift-storage, swift-storage-z3 ]
+    - [ "nrpe-swift-storage:monitors", "nagios:monitors" ]
     - [ nrpe-ceilometer, ceilometer ]
+    - [ "nrpe-ceilometer:monitors", "nagios:monitors" ]
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
 
=== modified file 'specs/dev/full_nrpe/repo-next'
--- specs/dev/full_nrpe/repo-next	2015-01-12 12:20:56 +0000
+++ specs/dev/full_nrpe/repo-next	2015-05-08 09:54:56 +0000
@@ -17,4 +17,5 @@
 cinder-ceph
 heat
 neutron-openvswitch
-nrpe-external-master
+nrpe
+nagios
 
=== added directory 'specs/dev/full_nrpe_ha'
=== added directory 'specs/dev/full_nrpe_ha/icehouse'
=== added file 'specs/dev/full_nrpe_ha/icehouse/SPEC_INFO.txt'
--- specs/dev/full_nrpe_ha/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
 
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added file 'specs/dev/full_nrpe_ha/icehouse/collect-next-ha'
--- specs/dev/full_nrpe_ha/icehouse/collect-next-ha	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/collect-next-ha	2015-05-08 09:54:56 +0000
@@ -0,0 +1,21 @@
+nrpe-external-master   lp:charms/nrpe-external-master
+percona-cluster        lp:~brad-marshall/charms/trusty/percona-cluster/fix-nagios
+hacluster              lp:~gnuoy/charms/trusty/hacluster/charmhelper_sync
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
+ceph-osd               lp:~brad-marshall/charms/trusty/ceph-osd/nagios-fix-servicegroups
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+quantum-gateway        lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
+glance                 lp:~brad-marshall/charms/trusty/glance/add-haproxy-nrpe-fix-servicegroups
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+mongodb                lp:charms/mongodb
+neutron-api            lp:~openstack-charmers/charms/trusty/neutron-api/next
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
 
=== added file 'specs/dev/full_nrpe_ha/icehouse/haphase1.yaml'
--- specs/dev/full_nrpe_ha/icehouse/haphase1.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/haphase1.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,201 @@
+# vim: set ts=2 et:
+openstack-services:
+  series: trusty
+  services:
+    mysql:
+      charm: percona-cluster
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.10
+        vip_cidr: 16
+        root-password: crapper
+        sst-password: crapper
+    mysql-hacluster:
+      charm: hacluster
+    rabbitmq-server:
+      charm: rabbitmq-server
+      constraints: mem=1G
+      num_units: 2
+    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
+    ceph-osd:
+      charm: ceph-osd
+      num_units: 3
+      constraints: mem=1G
+      options:
+        osd-devices: /dev/vdb
+        osd-reformat: "yes"
+        ephemeral-unmount: /mnt
+    keystone:
+      charm: keystone
+      constraints: mem=1G
+      num_units: 2
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+        vip: 10.5.100.1
+    keystone-hacluster:
+      charm: hacluster
+    openstack-dashboard:
+      charm: openstack-dashboard
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.2
+    dashboard-hacluster:
+      charm: hacluster
+    nova-compute:
+      charm: nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        config-flags: "auto_assign_floating_ip=False"
+        enable-live-migration: False
+        enable-resize: False
+    nova-cloud-controller:
+      charm: nova-cloud-controller
+      constraints: mem=1G
+      num_units: 2
+      options:
+        network-manager: Quantum
+        quantum-security-groups: "yes"
+        vip: 10.5.100.3
+    ncc-hacluster:
+      charm: hacluster
+    neutron-gateway:
+      charm: quantum-gateway
+      constraints: mem=1G
+      num_units: 2
+      options:
+        instance-mtu: 1350
+    cinder:
+      charm: cinder
+      num_units: 2
+      options:
+        block-device: "None"
+        glance-api-version: 2
+        vip: 10.5.100.4
+      constraints": mem=1G
+    cinder-hacluster:
+      charm: hacluster
+    cinder-ceph:
+      charm: cinder-ceph
+    glance:
+      charm: glance
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.5
+    glance-hacluster:
+      charm: hacluster
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      num_units: 2
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+        vip: 10.5.100.6
+    swift-proxy-hacluster:
+      charm: hacluster
+    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"
+    nrpe-glance:
+      charm: nrpe-external-master
+    nrpe-percona:
+      charm: nrpe-external-master
+    nrpe-cephosd:
+      charm: nrpe-external-master
+openstack-singlerabbit:
+  inherits: openstack-services
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      num_units: 2
+      charm: neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+        vip: 10.5.108.1
+    neutron-api-hacluster:
+      charm: hacluster
+      options:
+        corosync_mcastaddr: 226.94.1.8
+        corosync_key: "JFgMRJhNfKnmBRGm+rbAwpZmd/1FX08SCzOzDg/teaVtfGf60QYBCrpRYQzjzM2f+iNpGFuYEW8fXd+Dvquns6E1v7JbSt7oPRi2DYfdXXHc3EYkhimPG7h/VvnhaabLQ5z8CuQzaVJL1Fp25n4Rs5V4d71sgE5IR0skkWC6YO8="
+    neutron-openvswitch:
+      charm: neutron-openvswitch
+precise-icehouse:
+  inherits: openstack-singlerabbit
+  series: precise
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse
+  series: trusty
+trusty-juno:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+# 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-proposed/kilo
+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
+
 
=== added file 'specs/dev/full_nrpe_ha/icehouse/haphase2.yaml'
--- specs/dev/full_nrpe_ha/icehouse/haphase2.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/haphase2.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,253 @@
+# vim: set ts=2 et:
+openstack-services:
+  series: trusty
+  services:
+    mysql:
+      charm: percona-cluster
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.10
+        vip_cidr: 16
+        root-password: crapper
+        sst-password: crapper
+    mysql-hacluster:
+      charm: hacluster
+    rabbitmq-server:
+      charm: rabbitmq-server
+      constraints: mem=1G
+      num_units: 2
+    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
+    ceph-osd:
+      charm: ceph-osd
+      num_units: 3
+      constraints: mem=1G
+      options:
+        osd-devices: /dev/vdb
+        osd-reformat: "yes"
+        ephemeral-unmount: /mnt
+    keystone:
+      charm: keystone
+      constraints: mem=1G
+      num_units: 2
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+        vip: 10.5.100.1
+    keystone-hacluster:
+      charm: hacluster
+    openstack-dashboard:
+      charm: openstack-dashboard
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.2
+    dashboard-hacluster:
+      charm: hacluster
+    nova-compute:
+      charm: nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        config-flags: "auto_assign_floating_ip=False"
+        enable-live-migration: False
+        enable-resize: False
+    nova-cloud-controller:
+      charm: nova-cloud-controller
+      constraints: mem=1G
+      num_units: 2
+      options:
+        network-manager: Quantum
+        quantum-security-groups: "yes"
+        vip: 10.5.100.3
+    ncc-hacluster:
+      charm: hacluster
+    neutron-gateway:
+      charm: quantum-gateway
+      constraints: mem=1G
+      num_units: 2
+      options:
+        instance-mtu: 1350
+    cinder:
+      charm: cinder
+      num_units: 2
+      options:
+        block-device: "None"
+        glance-api-version: 2
+        vip: 10.5.100.4
+      constraints": mem=1G
+    cinder-hacluster:
+      charm: hacluster
+    cinder-ceph:
+      charm: cinder-ceph
+    glance:
+      charm: glance
+      constraints: mem=1G
+      num_units: 2
+      options:
+        vip: 10.5.100.5
+    glance-hacluster:
+      charm: hacluster
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      num_units: 2
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+        vip: 10.5.100.6
+    swift-proxy-hacluster:
+      charm: hacluster
+    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"
+    nrpe-glance:
+      charm: nrpe-external-master
+    nrpe-percona:
+      charm: nrpe-external-master
+    nrpe-cephosd:
+      charm: nrpe-external-master
+  relations:
+    - [ mysql, mysql-hacluster ]
+    - [ keystone, mysql ]
+    - [ keystone, keystone-hacluster ]
+    - [ nova-cloud-controller, ncc-hacluster ]
+    - [ 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, glance-hacluster ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, ceph ]
+    - [ glance, cinder ]
+    - [ glance, rabbitmq-server ]
+    - [ cinder, cinder-hacluster ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, cinder-ceph ]
+    - [ cinder-ceph, ceph ]
+    - [ ceph, ceph-osd ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ openstack-dashboard, dashboard-hacluster ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-proxy-hacluster ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - [ nrpe-cephosd, ceph-osd ]
+    - [ nrpe-percona, mysql ]
+    - [ nrpe-glance, glance ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      num_units: 2
+      charm: neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+        vip: 10.5.108.1
+    neutron-api-hacluster:
+      charm: hacluster
+      options:
+        corosync_mcastaddr: 226.94.1.8
+        corosync_key: "JFgMRJhNfKnmBRGm+rbAwpZmd/1FX08SCzOzDg/teaVtfGf60QYBCrpRYQzjzM2f+iNpGFuYEW8fXd+Dvquns6E1v7JbSt7oPRi2DYfdXXHc3EYkhimPG7h/VvnhaabLQ5z8CuQzaVJL1Fp25n4Rs5V4d71sgE5IR0skkWC6YO8="
+    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-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+  #hacluster relation
+  - [ neutron-api, neutron-api-hacluster ]
+precise-icehouse:
+  inherits: openstack-singlerabbit
+  series: precise
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse
+  series: trusty
+trusty-juno:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+# 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-proposed/kilo
+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
 
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/full_nrpe_ha/icehouse/manifest'
--- specs/dev/full_nrpe_ha/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,35 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
 
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added file 'specs/dev/full_nrpe_ha/icehouse/repo-next-ha'
--- specs/dev/full_nrpe_ha/icehouse/repo-next-ha	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/icehouse/repo-next-ha	2015-05-08 09:54:56 +0000
@@ -0,0 +1,21 @@
+nrpe-external-master
+percona-cluster
+hacluster
+rabbitmq-server
+ceph
+ceph-osd
+keystone
+openstack-dashboard
+nova-compute
+nova-cloud-controller
+quantum-gateway
+cinder
+glance
+swift-proxy
+swift-storage
+ceilometer
+ceilometer-agent
+mongodb
+neutron-api
+neutron-openvswitch
+cinder-ceph
 
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/dev/full_nrpe_ha/icehouse/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/full_nrpe_ha/juno'
=== added file 'specs/dev/full_nrpe_ha/juno/SPEC_INFO.txt'
--- specs/dev/full_nrpe_ha/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/juno/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
 
=== added symlink 'specs/dev/full_nrpe_ha/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/dev/full_nrpe_ha/juno/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/juno/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/full_nrpe_ha/juno/manifest'
--- specs/dev/full_nrpe_ha/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/juno/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,35 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
 
=== added symlink 'specs/dev/full_nrpe_ha/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/dev/full_nrpe_ha/juno/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/dev/full_nrpe_ha/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/full_nrpe_ha/kilo'
=== added file 'specs/dev/full_nrpe_ha/kilo/SPEC_INFO.txt'
--- specs/dev/full_nrpe_ha/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/kilo/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
 
=== added symlink 'specs/dev/full_nrpe_ha/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/full_nrpe_ha/kilo/manifest'
--- specs/dev/full_nrpe_ha/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/full_nrpe_ha/kilo/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,35 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services
+script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
 
=== added symlink 'specs/dev/full_nrpe_ha/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/dev/full_nrpe_ha/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/kilo'
=== added file 'specs/dev/kilo/SPEC_INFO.txt'
--- specs/dev/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/kilo/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/dev/kilo/check_juju.py'
=== target is u'../../../helper/tests/check_juju.py'
=== added file 'specs/dev/kilo/collect-next'
--- specs/dev/kilo/collect-next	1970-01-01 00:00:00 +0000
+++ specs/dev/kilo/collect-next	2015-05-08 09:54:56 +0000
@@ -0,0 +1,19 @@
+keystone               lp:~james-page/charms/trusty/keystone/kilo/
+neutron-api            lp:~james-page/charms/trusty/neutron-api/kilo/
+glance                 lp:~james-page/charms/trusty/glance/kilo
+neutron-openvswitch    lp:~james-page/charms/trusty/neutron-openvswitch/kilo
+quantum-gateway        lp:~james-page/charms/trusty/quantum-gateway/kilo
+nova-cloud-controller  lp:~james-page/charms/trusty/nova-cloud-controller/kilo
+nova-compute           lp:~james-page/charms/trusty/nova-compute/kilo
+cinder                 lp:~james-page/charms/trusty/cinder/kilo
+swift-proxy            lp:~james-page/charms/trusty/swift-proxy/kilo
+ceph                   lp:~james-page/charms/trusty/ceph/kilo-support
+mysql                  lp:~gnuoy/charms/trusty/mysql/sync-ch
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+mongodb                lp:charms/mongodb
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
 
=== added file 'specs/dev/kilo/full.yaml'
--- specs/dev/kilo/full.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/kilo/full.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,252 @@
+# vim: set ts=2 et:
+openstack-services:
+  services:
+    mysql:
+      charm: mysql
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+    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
+    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: quantum-gateway
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      charm: cinder
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints": mem=1G
+    glance:
+      charm: glance
+      constraints: mem=1G
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    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"
+  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, 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 ]
+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
+    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-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+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
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+utopic-juno-proposed:
+  inherits: utopic-juno
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# kilo
+trusty-kilo:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: ppa:james-page/kilo
+    source: ppa:james-page/kilo
+trusty-kilo-proposed:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-proposed/kilo
+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
+  overrides:
+    openstack-origin: ppa:james-page/kilo
+    source: ppa:james-page/kilo
+vivid-kilo-proposed:
+  inherits: vivid-kilo
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
 
=== added symlink 'specs/dev/kilo/image_setup.py'
=== target is u'../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/kilo/images.yaml'
=== target is u'../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/kilo/keystone_setup.py'
=== target is u'../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/kilo/keystone_users.yaml'
=== target is u'../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/kilo/manifest'
--- specs/dev/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/kilo/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/dev/kilo/network.yaml'
=== target is u'../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/kilo/network_setup.py'
=== target is u'../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/kilo/repo-next'
=== target is u'../../../helper/collect/repo-next'
=== added symlink 'specs/dev/kilo/simple_os_checks.py'
=== target is u'../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/kilo/utils'
=== target is u'../../../helper/utils'
=== added directory 'specs/dev/neutronshuffle'
=== added file 'specs/dev/neutronshuffle/SPEC_INFO.txt'
--- specs/dev/neutronshuffle/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/neutronshuffle/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/dev/neutronshuffle/check_juju.py'
=== target is u'../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/neutronshuffle/collect-next'
=== target is u'../../../helper/collect/collect-next'
=== added symlink 'specs/dev/neutronshuffle/full.yaml'
=== target is u'../../../helper/bundles/full.yaml'
=== added symlink 'specs/dev/neutronshuffle/image_setup.py'
=== target is u'../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/neutronshuffle/images.yaml'
=== target is u'../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/neutronshuffle/keystone_setup.py'
=== target is u'../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/neutronshuffle/keystone_users.yaml'
=== target is u'../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/neutronshuffle/manifest'
--- specs/dev/neutronshuffle/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/neutronshuffle/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/dev/neutronshuffle/network.yaml'
=== target is u'../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/neutronshuffle/network_setup.py'
=== target is u'../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/neutronshuffle/repo-next'
=== target is u'../../../helper/collect/repo-next'
=== added symlink 'specs/dev/neutronshuffle/simple_os_checks.py'
=== target is u'../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/neutronshuffle/utils'
=== target is u'../../../helper/utils'
=== added directory 'specs/dev/next_l2pop'
=== added directory 'specs/dev/next_l2pop/icehouse'
=== added file 'specs/dev/next_l2pop/icehouse/SPEC_INFO.txt'
--- specs/dev/next_l2pop/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/icehouse/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/dev/next_l2pop/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/next_l2pop/icehouse/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added file 'specs/dev/next_l2pop/icehouse/full.yaml'
--- specs/dev/next_l2pop/icehouse/full.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/icehouse/full.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,263 @@
+# vim: set ts=2 et:
+openstack-services:
+  services:
+    mysql:
+      charm: mysql
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+    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
+    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: quantum-gateway
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      charm: cinder
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints": mem=1G
+    glance:
+      charm: glance
+      constraints: mem=1G
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    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
+    ceilometer-agent:
+      charm: ceilometer-agent
+    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, 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:identity-service", keystone ]
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+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:
+        l2-population: True
+        neutron-security-groups: 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-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+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
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+utopic-juno-proposed:
+  inherits: utopic-juno
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# 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-proposed/kilo
+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
 
=== added symlink 'specs/dev/next_l2pop/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/next_l2pop/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/next_l2pop/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/next_l2pop/icehouse/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/next_l2pop/icehouse/manifest'
--- specs/dev/next_l2pop/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/icehouse/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/dev/next_l2pop/icehouse/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/next_l2pop/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/next_l2pop/icehouse/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/dev/next_l2pop/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/next_l2pop/icehouse/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/next_l2pop/juno'
=== added file 'specs/dev/next_l2pop/juno/SPEC_INFO.txt'
--- specs/dev/next_l2pop/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/juno/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/dev/next_l2pop/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/next_l2pop/juno/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/dev/next_l2pop/juno/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/dev/next_l2pop/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/next_l2pop/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/next_l2pop/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/next_l2pop/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/next_l2pop/juno/manifest'
--- specs/dev/next_l2pop/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/juno/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/dev/next_l2pop/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/next_l2pop/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/next_l2pop/juno/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/dev/next_l2pop/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/next_l2pop/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/next_l2pop/kilo'
=== added file 'specs/dev/next_l2pop/kilo/SPEC_INFO.txt'
--- specs/dev/next_l2pop/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/kilo/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
 
=== added symlink 'specs/dev/next_l2pop/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/dev/next_l2pop/kilo/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/dev/next_l2pop/kilo/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/dev/next_l2pop/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/next_l2pop/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/next_l2pop/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/next_l2pop/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/next_l2pop/kilo/manifest'
--- specs/dev/next_l2pop/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/next_l2pop/kilo/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,23 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
=== added symlink 'specs/dev/next_l2pop/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/dev/next_l2pop/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/next_l2pop/kilo/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/dev/next_l2pop/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/dev/next_l2pop/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/dev/vrrp_blog'
=== added file 'specs/dev/vrrp_blog/SPEC_INFO.txt'
--- specs/dev/vrrp_blog/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,1 @@
+This spec deploys and tests a deployment with neutron DVR enabled
 
=== added file 'specs/dev/vrrp_blog/bug1364215.py'
--- specs/dev/vrrp_blog/bug1364215.py	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/bug1364215.py	2015-05-08 09:54:56 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+
+
+def main(argv):
+    for unit in mojo_utils.get_juju_units(service='neutron-gateway'):
+        cmd='sudo service neutron-plugin-openvswitch-agent restart'
+        mojo_utils.remote_run(unit, remote_cmd=cmd)
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== added symlink 'specs/dev/vrrp_blog/check_juju.py'
=== target is u'../../../helper/tests/check_juju.py'
=== added file 'specs/dev/vrrp_blog/collect-next'
--- specs/dev/vrrp_blog/collect-next	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/collect-next	2015-05-08 09:54:56 +0000
@@ -0,0 +1,19 @@
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+neutron-api            lp:~gnuoy/charms/trusty/neutron-api/order-overlay-type
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+glance                 lp:~openstack-charmers/charms/trusty/glance/next
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+quantum-gateway        lp:~gnuoy/charms/trusty/quantum-gateway/conntrack
+cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+mongodb                lp:charms/mongodb
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
 
=== added file 'specs/dev/vrrp_blog/full_vrrpha.yaml'
--- specs/dev/vrrp_blog/full_vrrpha.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/full_vrrpha.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,194 @@
+# 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: quantum-gateway
+      constraints: mem=1G
+      num_units: 3
+      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: False
+    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
+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
 
=== added symlink 'specs/dev/vrrp_blog/image_setup.py'
=== target is u'../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/vrrp_blog/images.yaml'
=== target is u'../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/vrrp_blog/keystone_setup.py'
=== target is u'../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/vrrp_blog/keystone_users.yaml'
=== target is u'../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/vrrp_blog/manifest'
--- specs/dev/vrrp_blog/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,29 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full_vrrpha.yaml delay=0 target=trusty-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="vxlan"
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Restarting neutron-plugin-openvswitch-agent to work around Bug #1364215
+#script config=bug1364215.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Test guest connectivity after stopping and starting gateway
+#verify config=test_vrrp_ha.py
 
=== added file 'specs/dev/vrrp_blog/network.yaml'
--- specs/dev/vrrp_blog/network.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/network.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,48 @@
+gre:
+  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: gre
+  private_net_cidr: 192.168.21.0/24
+  router_name: provider-router
+  start_floating_ip: 10.5.150.0
+  dvr_enabled: False
+vxlan:
+  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
+dvr:
+  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: True
+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 symlink 'specs/dev/vrrp_blog/network_setup.py'
=== target is u'../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/vrrp_blog/repo-next'
=== target is u'../../../helper/collect/repo-next'
=== added symlink 'specs/dev/vrrp_blog/simple_os_checks.py'
=== target is u'../../../helper/tests/simple_os_checks.py'
=== added file 'specs/dev/vrrp_blog/test_vrrp_ha.py'
--- specs/dev/vrrp_blog/test_vrrp_ha.py	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_blog/test_vrrp_ha.py	2015-05-08 09:54:56 +0000
@@ -0,0 +1,93 @@
+#!/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
+import argparse
+
+def get_cirros_server(cloud_auth):
+    logging.info('Looking for existing cirros server')
+    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_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 not False 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_undercload_auth()
+    under_novac = mojo_os_utils.get_nova_client(undercloud_novarc)
+    over_neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
+    server = get_cirros_server(overcloud_novarc)
+    ip = get_server_floating_ip(server)
+    logging.info('Checking connectivity to cirros guest')
+    if not mojo_os_utils.ssh_test('cirros', ip, server.name, password='cubswin:)'):
+        raise Exception('Cirros guest inaccessable')
+    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:
+        neutron_gateway = under_novac.servers.find(name=agent['host'])
+        logging.info('Shutting down neutron gateway: ' + neutron_gateway.id)
+        neutron_gateway.stop()
+        if not check_server_state(under_novac, 'SHUTOFF', server_name=agent['host']):
+            raise Exception('Server failed to reach SHUTOFF state')
+        logging.info('Neutron gateway %s has shutdown' % (neutron_gateway.id))
+        logging.info('Checking connectivity to cirros guest')
+        if not mojo_os_utils.wait_for_ping(ip, 90):
+            raise Exception('Cirros guest inaccessable')
+        if not mojo_os_utils.ssh_test('cirros', ip, server.name, password='cubswin:)'):
+            raise Exception('Cirros guest inaccessable')
+        logging.info('Starting neutron gateway: ' + neutron_gateway.id)
+        neutron_gateway.start()
+        if not check_server_state(under_novac, 'ACTIVE', server_name=agent['host']):
+            raise Exception('Server failed to reach SHUTOFF state')
+        if not check_neutron_agent_states(over_neutronc, agent['host']):
+            raise Exception('Server agents failed to reach active state')
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== added symlink 'specs/dev/vrrp_blog/utils'
=== target is u'../../../helper/utils'
=== added directory 'specs/dev/vrrp_ha'
=== added file 'specs/dev/vrrp_ha/SPEC_INFO.txt'
--- specs/dev/vrrp_ha/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/SPEC_INFO.txt	2015-05-08 09:54:56 +0000
@@ -0,0 +1,1 @@
+This spec deploys and tests a deployment with neutron DVR enabled
 
=== added file 'specs/dev/vrrp_ha/bug1364215.py'
--- specs/dev/vrrp_ha/bug1364215.py	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/bug1364215.py	2015-05-08 09:54:56 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+
+
+def main(argv):
+    for unit in mojo_utils.get_juju_units(service='neutron-gateway'):
+        cmd='sudo service neutron-plugin-openvswitch-agent restart'
+        mojo_utils.remote_run(unit, remote_cmd=cmd)
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== added symlink 'specs/dev/vrrp_ha/check_juju.py'
=== target is u'../../../helper/tests/check_juju.py'
=== added file 'specs/dev/vrrp_ha/collect-next'
--- specs/dev/vrrp_ha/collect-next	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/collect-next	2015-05-08 09:54:56 +0000
@@ -0,0 +1,19 @@
+nova-cloud-controller  lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+neutron-api            lp:~james-page/charms/trusty/neutron-api/kilo-dvr
+keystone               lp:~openstack-charmers/charms/trusty/keystone/next
+glance                 lp:~openstack-charmers/charms/trusty/glance/next
+swift-proxy            lp:~openstack-charmers/charms/trusty/swift-proxy/next
+percona-cluster        lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+rabbitmq-server        lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ceph                   lp:~openstack-charmers/charms/trusty/ceph/next
+openstack-dashboard    lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+nova-compute           lp:~openstack-charmers/charms/trusty/nova-compute/next
+quantum-gateway        lp:~gnuoy/charms/trusty/quantum-gateway/conntrack
+cinder                 lp:~openstack-charmers/charms/trusty/cinder/next
+swift-storage          lp:~openstack-charmers/charms/trusty/swift-storage/next
+ceilometer             lp:~openstack-charmers/charms/trusty/ceilometer/next
+ceilometer-agent       lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+mongodb                lp:charms/mongodb
+cinder-ceph            lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+heat                   lp:~openstack-charmers/charms/trusty/heat/next
+neutron-openvswitch    lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
 
=== added file 'specs/dev/vrrp_ha/full_vrrpha.yaml'
--- specs/dev/vrrp_ha/full_vrrpha.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/full_vrrpha.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,194 @@
+# 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: quantum-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
+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
 
=== added symlink 'specs/dev/vrrp_ha/image_setup.py'
=== target is u'../../../helper/setup/image_setup.py'
=== added symlink 'specs/dev/vrrp_ha/images.yaml'
=== target is u'../../../helper/setup/images.yaml'
=== added symlink 'specs/dev/vrrp_ha/keystone_setup.py'
=== target is u'../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/dev/vrrp_ha/keystone_users.yaml'
=== target is u'../../../helper/setup/keystone_users.yaml'
=== added file 'specs/dev/vrrp_ha/manifest'
--- specs/dev/vrrp_ha/manifest	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/manifest	2015-05-08 09:54:56 +0000
@@ -0,0 +1,29 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next
+
+# Copy the branches to the deployment directory
+repo config=repo-next
+
+# Use juju deployer with full.yaml bundle
+deploy config=full_vrrpha.yaml delay=0 target=trusty-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
+
+# Restarting neutron-plugin-openvswitch-agent to work around Bug #1364215
+#script config=bug1364215.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Test guest connectivity after stopping and starting gateway
+verify config=test_vrrp_ha.py
 
=== added file 'specs/dev/vrrp_ha/network.yaml'
--- specs/dev/vrrp_ha/network.yaml	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/network.yaml	2015-05-08 09:54:56 +0000
@@ -0,0 +1,36 @@
+gre:
+  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: gre
+  private_net_cidr: 192.168.21.0/24
+  router_name: provider-router
+  start_floating_ip: 10.5.150.0
+  dvr_enabled: False
+dvr:
+  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: True
+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 symlink 'specs/dev/vrrp_ha/network_setup.py'
=== target is u'../../../helper/setup/network_setup.py'
=== added symlink 'specs/dev/vrrp_ha/repo-next'
=== target is u'../../../helper/collect/repo-next'
=== added symlink 'specs/dev/vrrp_ha/simple_os_checks.py'
=== target is u'../../../helper/tests/simple_os_checks.py'
=== added file 'specs/dev/vrrp_ha/test_vrrp_ha.py'
--- specs/dev/vrrp_ha/test_vrrp_ha.py	1970-01-01 00:00:00 +0000
+++ specs/dev/vrrp_ha/test_vrrp_ha.py	2015-05-08 09:54:56 +0000
@@ -0,0 +1,93 @@
+#!/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
+import argparse
+
+def get_cirros_server(cloud_auth):
+    logging.info('Looking for existing cirros server')
+    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_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 not False 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_undercload_auth()
+    under_novac = mojo_os_utils.get_nova_client(undercloud_novarc)
+    over_neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
+    server = get_cirros_server(overcloud_novarc)
+    ip = get_server_floating_ip(server)
+    logging.info('Checking connectivity to cirros guest')
+    if not mojo_os_utils.ssh_test('cirros', ip, server.name, password='cubswin:)'):
+        raise Exception('Cirros guest inaccessable')
+    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:
+        neutron_gateway = under_novac.servers.find(name=agent['host'])
+        logging.info('Shutting down neutron gateway: ' + neutron_gateway.id)
+        neutron_gateway.stop()
+        if not check_server_state(under_novac, 'SHUTOFF', server_name=agent['host']):
+            raise Exception('Server failed to reach SHUTOFF state')
+        logging.info('Neutron gateway %s has shutdown' % (neutron_gateway.id))
+        logging.info('Checking connectivity to cirros guest')
+        if not mojo_os_utils.wait_for_ping(ip, 90):
+            raise Exception('Cirros guest inaccessable')
+        if not mojo_os_utils.ssh_test('cirros', ip, server.name, password='cubswin:)'):
+            raise Exception('Cirros guest inaccessable')
+        logging.info('Starting neutron gateway: ' + neutron_gateway.id)
+        neutron_gateway.start()
+        if not check_server_state(under_novac, 'ACTIVE', server_name=agent['host']):
+            raise Exception('Server failed to reach SHUTOFF state')
+        if not check_neutron_agent_states(over_neutronc, agent['host']):
+            raise Exception('Server agents failed to reach active state')
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== added symlink 'specs/dev/vrrp_ha/utils'
=== target is u'../../../helper/utils'