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

[Liam Young]

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

209. By Liam Young on 2015-02-10

Add kilo support to bundles and fix lint

[Edward Hope-Morley (hopem)]

Looks great to me +1

review: Approve

[Ryan Beisner (1chb1n)]

I'm really liking the re-org and subfolders. This will make it easier for osci to consume, as it is highly "parameterized."

=== modified file 'Makefile'
--- Makefile	2015-01-28 16:19:28 +0000
+++ Makefile	2015-02-10 07:55:13 +0000
@@ -2,7 +2,8 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@./scripts/check-lint.sh
+	@./helper/scripts/check-lint.sh
+	@flake8 helper/collect  helper/setup  helper/tests  helper/utils
 
 gen_spec_summary:
-	@./scripts/gen-spec-summary.sh > SPEC_SUMMARY.txt
+	@./helper/scripts/gen-spec-summary.sh > SPEC_SUMMARY.txt

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2015-02-10 07:55:13 +0000
@@ -0,0 +1,162 @@
+General
+=======
+
+These are the Mojo specs for running deployments of Openstack. For more
+information on installing and running Mojo see lp:mojo
+
+Directoy Layouts
+================
+
+Top Level
+---------
+
+This branch contains the following top level assets:
+
+* *specs* directory contains the specs themselves.
+* *SPEC\_SUMMARY.txt* contains descriptions of each spec
+* *Makefile* has targets for checking lint and generating SPEC\_SUMMARY.txt
+* *helper* directory contains scripts and libraries used by the specs
+
+spec directory
+--------------
+
+The specs fall into the following catagories:
+
+* *dev*: Specs which are still under development (these are not lint checked)
+* *full\_stack*: These perform a full openstack deployment
+* *bugs*: Specs that reproduce a bug. These are useful for verifying a bugs
+  existence and then once the fix has landed they can be used to verify a
+  regression has not occured.
+* *features*: These do a minimal deployment to demonstrate a new feature.
+* *object\_storage*: Specs for deploying a standalone object storage environment
+
+Tip directory
+-------------
+
+The tip directory should be used to differentiate between Openstack versions.
+
+Example
+-------
+
+*specs/full_stack/charmhelper_upgrade/juno/*
+
+This spec is used to do a deployment of a full Juno Openstack environment and
+to test an upgrade of charmhelpers
+
+helper directory
+----------------
+
+The helper directory contains the following:
+
+* *bundles*: Juju deployer bundles
+* *collect*: Mojo collect and repo files, used to collect branches prior to
+           running Juju Deployer
+* *scripts*: Scripts for running lint checks etc
+* *setup*: Manipulate the overcloud or provider
+* *template*: An example spec
+* *tests*: Tests to run against the deployment
+* *utils*: Core set of utilities used by tests and setup
+
+Spec Bulding Blocks
+===================
+
+Phase 1: Collection
+-------------------
+
+Directives: collect and repo
+
+These specs collect the charm branches as a seperate step from deploying the
+charms. Although Juju deployer can do the branch collection, having this done
+as a seperate phase has a few advantages. It allows for the branches to be
+manipulated prior to deployment, the charmhelper upgrade spec does exactly this
+to check that a charmhelper sync will not break a deployment. It also allows
+for an alternative branch location for a given charm to be clearly specified,
+this is particulalry useful when an unmerged branch needs testing.
+
+Phase 2: Deployment
+-------------------
+
+Directives: deploy
+
+Mojo uses juju deployer to do the charm deployment. When specifying the target
+to use in the bundle the ${MOJO\_SERIES} environment variable should be used in
+place of the Ubuntu release version. This allows the same spec to be used for
+deployments on different Ubuntu release.
+
+deploy config=haphase1.yaml delay=0 target=${MOJO\_SERIES}-juno
+
+Phase 3: Cloud Setup
+--------------------
+
+Directives: script
+
+There are a number of helper scripts used to setup the cloud once it has been
+deployed. In general they consist of the script to do the setup and a YAML file
+of options.
+
+* *image\_setup.py*: This script downloads guest images and uploads them to
+                  Glance. *images.yaml* lists the images to be downloaded and
+		  information about those images.
+* *keystone\_setup.py*: Setup keystone users and roles. *keystone_users.yaml*
+                     lists the users to be created and what roles they should
+		     be given
+* *network\_setup.py*: This sets up the SDN on the cloud. *network.yaml* describes
+                    the SDN topology
+
+Phase 4: Test
+-------------
+
+Directives: verify
+
+There are a number of tests to choose from, some are specific to particular
+bugs or features. However, the main tests used to verify the cloud are:
+
+* *simple\_os\_checks.py*: This script creates guests on the cloud, associates
+                           floating ips and then uses ssh to connect to the
+			   cloud and verifies its hostname. This ensure that
+			   the guest got a network and metadata on boot.
+* *test\_obj\_store.py*: This script fires two streams of objects and the
+                         object store and retireves them
+* *tempest.py*: This doesn't actually exist in any real sense but will do rsn!
+
+Phase 5: Manipulate the cloud
+-----------------------------
+
+Directives: script
+
+There are scripts for manipulating the cloud, usually at the Juju level. These
+include:
+
+* *add_unit.py*: Use juju to add a unit to a given service
+* *chaos_pony.py*: Kill, test and add units to all services
+* *delete_crm_leader.py*: Delete the unit Corosync reports is the leader for a
+                          given service
+* *delete_router_home.py*: Delete the unit housing a particular Neutron router
+* *delete_unit.py*: Delete a given unit
+* *juju_set.py*: Juju set a kv pair for a given service
+* *upgrade_all_services.py*: Perform a Juju charm upgrade on all services
+* *upgrade_services.py*: Perform a Juju charm upgrade on a given service
+
+Helper Libraries
+================
+
+There are two helper libraries in *helper/utils/*.
+
+* *mojo_os_utils.py*: Functions for manipulating the deployed Openstack cloud.
+* *mojo_utils.py*: Functions for manipulating the providor environment. Juju
+                   add/remove unit etc
+
+Using mojo
+==========
+
+Install mojo (Stolen from https://launchpad.net/mojo)
+sudo add-apt-repository ppa:mojo-maintainers/ppa
+sudo apt-get update
+sudo apt-get install mojo
+
+sudo mojo project-new --series trusty mojo-openstack-specs
+sudo adduser ubuntu mojo
+sudo chmod 755 /var/lib/lxc/mojo-openstack-specs.trusty && sudo chmod 755 /var/lib/lxc
+
+mojo workspace-new --project mojo-openstack-specs --series trusty --stage full_stack/next_deploy lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs run1
+mojo run --project mojo-openstack-specs --series trusty --stage full_stack/next_deploy lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs run1

=== removed file 'README.txt'
--- README.txt	2015-01-16 14:11:51 +0000
+++ README.txt	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Using mojo:
-
-Install mojo (Stolen from https://launchpad.net/mojo)
-sudo add-apt-repository ppa:mojo-maintainers/ppa
-sudo apt-get update
-sudo apt-get install mojo
-
-sudo mojo project-new --series trusty mojo-openstack-specs
-sudo adduser ubuntu mojo
-sudo chmod 755 /var/lib/lxc/mojo-openstack-specs.trusty && sudo chmod 755 /var/lib/lxc
-
-mojo workspace-new --project mojo-openstack-specs --series trusty --stage full_stack/next_deploy lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs run1
-mojo run --project mojo-openstack-specs --series trusty --stage full_stack/next_deploy lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs run1

=== modified file 'SPEC_SUMMARY.txt'
--- SPEC_SUMMARY.txt	2015-01-28 14:24:05 +0000
+++ SPEC_SUMMARY.txt	2015-02-10 07:55:13 +0000
@@ -1,62 +1,154 @@
-./object_storage_specs/swift_proxy/ha_parallel_scaleout/
+./object_storage_specs/swift_proxy/ha_parallel_scaleout/icehouse/
 This spec deploys a swift cluster fronted by multiple swift proxy front ends.
 Swift proxy and swift storage are then simultaniously scaled out and the
 resulting object store retested. WARNING: Scaling swift-proxy and
 swift-storage is simultaiously is currently not supported so this spec is
 known to fail
 
-./object_storage_specs/swift_proxy/ha_serial_scaleout/
-This spec deploys a swift cluster fronted by multiple swift proxy front ends.
-Swift proxy is then scaled out and once that has completed swift storage is
-scaled out. The resulting object store is then retested.
-
-./object_storage_specs/swift_proxy/simple_nonha/
-This spec deploys a swift cluster fronted by a single swift proxy. The
-resulting object store is then tested.
-
-./object_storage_specs/ceph_radosgw/simple_nonha/
-This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
-The cluster is then tested with mulitple object store gets and retrivals.
-Glance integeration is also tested.
-
-./object_storage_specs/ceph_radosgw/ha/
-This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
-The rados gw leader is removed and additional units added. With tests run
-after each change
-
-./full_stack/next_deploy/
-This spec performs a non-ha deploy using the next charms and then runs tests
-to validate the deployment
-
-./full_stack/ha_phased/
-This spec performs a phased ha deploy then runs tests to validate the
-deployment
-
-./full_stack/juno/next_deploy/
-This spec performs a non-ha deploy of juno using the next charms and then
-runs tests to validate the deployment
-
-./full_stack/juno/ha_phased/
-This spec performs a phased ha deploy of juno and then runs tests to validate
-the deployment
-
-./full_stack/ha_phased_chaos_pony/
-This spec performs a phased ha deploy then runs tests to validate the
-deployment. iThen chaos pony is used to add and remove units.
-
-./full_stack/next_deploy_ssl/
-This spec performs a non-ha deploy using the next charms wil ssl enabled
-and then runs tests to validate the deployment
-
-./full_stack/charmhelper_upgrade/
-This spec collects the charms and then upgrades charmhelpers in each charm
-before running a non-ha deployment and testing the resulting cloud
-
-./full_stack/stable_to_next/
-This spec performs a non-ha deploy using the stable charms, then upgrades the
-charms to the devel versions and then runs tests to validate the deployment
-
-./full_stack/charmhelper_upgrade_ha/
+./object_storage_specs/swift_proxy/ha_serial_scaleout/icehouse/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./object_storage_specs/swift_proxy/ha_serial_scaleout/juno/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./object_storage_specs/swift_proxy/ha_serial_scaleout/kilo/
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
+
+./object_storage_specs/swift_proxy/simple_nonha/icehouse/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./object_storage_specs/swift_proxy/simple_nonha/juno/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./object_storage_specs/swift_proxy/simple_nonha/kilo/
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.
+
+./object_storage_specs/ceph_radosgw/simple_nonha/icehouse/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./object_storage_specs/ceph_radosgw/simple_nonha/juno/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./object_storage_specs/ceph_radosgw/simple_nonha/kilo/
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.
+
+./object_storage_specs/ceph_radosgw/ha/icehouse/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./object_storage_specs/ceph_radosgw/ha/juno/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./object_storage_specs/ceph_radosgw/ha/kilo/
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change
+
+./dev/vxlan/
+This spec deploys and tests a deployment with neutron DVR enabled
+
+./dev/dvr/
+This spec deploys and tests a deployment with neutron DVR enabled
+
+./full_stack/next_deploy/icehouse/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
+./full_stack/next_deploy/juno/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
+./full_stack/next_deploy/kilo/
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment
+
+./full_stack/ha_phased/icehouse/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./full_stack/ha_phased/juno/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./full_stack/ha_phased/kilo/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment
+
+./full_stack/ha_phased_chaos_pony/icehouse/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.
+
+./full_stack/ha_phased_chaos_pony/juno/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.
+
+./full_stack/ha_phased_chaos_pony/kilo/
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.
+
+./full_stack/next_deploy_ssl/icehouse/
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./full_stack/next_deploy_ssl/juno/
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./full_stack/next_deploy_ssl/kilo/
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment
+
+./full_stack/charmhelper_upgrade/icehouse/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud
+
+./full_stack/charmhelper_upgrade/juno/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud
+
+./full_stack/charmhelper_upgrade/kilo/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud
+
+./full_stack/stable_to_next/icehouse/
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment
+
+./full_stack/stable_to_next/juno/
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment
+
+./full_stack/stable_to_next/kilo/
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment
+
+./full_stack/charmhelper_upgrade_ha/icehouse/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a ha deployment and testing the resulting cloud
+
+./full_stack/charmhelper_upgrade_ha/juno/
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a ha deployment and testing the resulting cloud
+
+./full_stack/charmhelper_upgrade_ha/kilo/
 This spec collects the charms and then upgrades charmhelpers in each charm
 before running a ha deployment and testing the resulting cloud
 

=== removed directory 'full_stack/juno'
=== removed directory 'full_stack/juno/ha_phased'
=== removed file 'full_stack/juno/ha_phased/SPEC_INFO.txt'
--- full_stack/juno/ha_phased/SPEC_INFO.txt	2015-01-28 14:24:05 +0000
+++ full_stack/juno/ha_phased/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-This spec performs a phased ha deploy of juno and then runs tests to validate
-the deployment

=== removed symlink 'full_stack/juno/ha_phased/check_juju.py'
=== target was u'../../../helper/tests/check_juju.py'
=== removed symlink 'full_stack/juno/ha_phased/collect-next-ha'
=== target was u'../../../helper/collect/collect-next-ha'
=== removed symlink 'full_stack/juno/ha_phased/haphase1.yaml'
=== target was u'../../../helper/bundles/haphase1.yaml'
=== removed symlink 'full_stack/juno/ha_phased/haphase2.yaml'
=== target was u'../../../helper/bundles/haphase2.yaml'
=== removed symlink 'full_stack/juno/ha_phased/image_setup.py'
=== target was u'../../../helper/setup/image_setup.py'
=== removed symlink 'full_stack/juno/ha_phased/images.yaml'
=== target was u'../../../helper/setup/images.yaml'
=== removed symlink 'full_stack/juno/ha_phased/keystone_setup.py'
=== target was u'../../../helper/setup/keystone_setup.py'
=== removed symlink 'full_stack/juno/ha_phased/keystone_users.yaml'
=== target was u'../../../helper/setup/keystone_users.yaml'
=== removed file 'full_stack/juno/ha_phased/manifest'
--- full_stack/juno/ha_phased/manifest	2015-01-29 12:03:17 +0000
+++ full_stack/juno/ha_phased/manifest	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-# 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

=== removed symlink 'full_stack/juno/ha_phased/network.yaml'
=== target was u'../../../helper/setup/network.yaml'
=== removed symlink 'full_stack/juno/ha_phased/network_setup.py'
=== target was u'../../../helper/setup/network_setup.py'
=== removed symlink 'full_stack/juno/ha_phased/repo-next-ha'
=== target was u'../../../helper/collect/repo-next-ha'
=== removed symlink 'full_stack/juno/ha_phased/set_vips.py'
=== target was u'../../../helper/setup/set_vips.py'
=== removed symlink 'full_stack/juno/ha_phased/simple_os_checks.py'
=== target was u'../../../helper/tests/simple_os_checks.py'
=== removed symlink 'full_stack/juno/ha_phased/test_obj_store.py'
=== target was u'../../../helper/tests/test_obj_store.py'
=== removed symlink 'full_stack/juno/ha_phased/utils'
=== target was u'../../../helper/utils'
=== removed directory 'full_stack/juno/next_deploy'
=== removed file 'full_stack/juno/next_deploy/SPEC_INFO.txt'
--- full_stack/juno/next_deploy/SPEC_INFO.txt	2015-01-28 11:31:11 +0000
+++ full_stack/juno/next_deploy/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-This spec performs a non-ha deploy of juno using the next charms and then
-runs tests to validate the deployment

=== removed symlink 'full_stack/juno/next_deploy/check_juju.py'
=== target was u'../../../helper/tests/check_juju.py'
=== removed symlink 'full_stack/juno/next_deploy/collect-next'
=== target was u'../../../helper/collect/collect-next'
=== removed symlink 'full_stack/juno/next_deploy/full.yaml'
=== target was u'../../../helper/bundles/full.yaml'
=== removed symlink 'full_stack/juno/next_deploy/image_setup.py'
=== target was u'../../../helper/setup/image_setup.py'
=== removed symlink 'full_stack/juno/next_deploy/images.yaml'
=== target was u'../../../helper/setup/images.yaml'
=== removed symlink 'full_stack/juno/next_deploy/keystone_setup.py'
=== target was u'../../../helper/setup/keystone_setup.py'
=== removed symlink 'full_stack/juno/next_deploy/keystone_users.yaml'
=== target was u'../../../helper/setup/keystone_users.yaml'
=== removed file 'full_stack/juno/next_deploy/manifest'
--- full_stack/juno/next_deploy/manifest	2015-01-31 15:25:37 +0000
+++ full_stack/juno/next_deploy/manifest	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# 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"

=== removed symlink 'full_stack/juno/next_deploy/network.yaml'
=== target was u'../../../helper/setup/network.yaml'
=== removed symlink 'full_stack/juno/next_deploy/network_setup.py'
=== target was u'../../../helper/setup/network_setup.py'
=== removed symlink 'full_stack/juno/next_deploy/repo-next'
=== target was u'../../../helper/collect/repo-next'
=== removed symlink 'full_stack/juno/next_deploy/simple_os_checks.py'
=== target was u'../../../helper/tests/simple_os_checks.py'
=== removed symlink 'full_stack/juno/next_deploy/utils'
=== target was u'../../../helper/utils'
=== removed file 'helper/Makefile'
--- helper/Makefile	2014-12-16 07:59:12 +0000
+++ helper/Makefile	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/usr/bin/make
-PYTHON := /usr/bin/env python
-
-lint:
-	@flake8 collect  setup  tests  utils

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2015-01-21 10:48:57 +0000
+++ helper/bundles/full.yaml	2015-02-10 07:55:13 +0000
@@ -235,3 +235,28 @@
   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

=== modified file 'helper/bundles/full_ssl.yaml'
--- helper/bundles/full_ssl.yaml	2015-01-28 16:19:28 +0000
+++ helper/bundles/full_ssl.yaml	2015-02-10 07:55:13 +0000
@@ -239,3 +239,29 @@
   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
+

=== modified file 'helper/bundles/haphase1.yaml'
--- helper/bundles/haphase1.yaml	2015-01-31 15:25:37 +0000
+++ helper/bundles/haphase1.yaml	2015-02-10 07:55:13 +0000
@@ -159,3 +159,29 @@
 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
+

=== modified file 'helper/bundles/haphase2.yaml'
--- helper/bundles/haphase2.yaml	2015-01-31 15:25:37 +0000
+++ helper/bundles/haphase2.yaml	2015-02-10 07:55:13 +0000
@@ -208,3 +208,28 @@
 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

=== modified file 'helper/bundles/minimal.yaml'
--- helper/bundles/minimal.yaml	2014-12-16 07:59:12 +0000
+++ helper/bundles/minimal.yaml	2015-02-10 07:55:13 +0000
@@ -175,3 +175,28 @@
   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

=== removed file 'helper/collect/collect-stable'
--- helper/collect/collect-stable	2015-01-21 11:20:22 +0000
+++ helper/collect/collect-stable	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-nova-cloud-controller  lp:charms/trusty/nova-cloud-controller
-neutron-api            lp:charms/trusty/neutron-api
-keystone               lp:charms/trusty/keystone
-glance                 lp:charms/trusty/glance
-swift-proxy            lp:charms/trusty/swift-proxy
-mysql                  lp:charms/mysql
-rabbitmq-server        lp:charms/rabbitmq-server
-ceph                   lp:charms/trusty/ceph
-nova-compute           lp:charms/trusty/nova-compute
-quantum-gateway        lp:charms/trusty/quantum-gateway
-cinder                 lp:charms/trusty/cinder
-swift-storage          lp:charms/trusty/swift-storage
-mongodb                lp:charms/mongodb
-cinder-ceph            lp:charms/trusty/cinder-ceph
-heat                   lp:charms/trusty/heat
-neutron-openvswitch    lp:charms/trusty/neutron-openvswitch
-# Bug 1161018 bzr revno fails on ghost ancestry
-openstack-dashboard    nosmart+lp:charms/trusty/openstack-dashboard
-ceilometer             nosmart+lp:charms/trusty/ceilometer
-ceilometer-agent       nosmart+lp:charms/trusty/ceilometer-agent

=== renamed directory 'scripts' => 'helper/scripts'
=== modified file 'helper/scripts/check-lint.sh'
--- scripts/check-lint.sh	2015-01-28 16:19:28 +0000
+++ helper/scripts/check-lint.sh	2015-02-10 07:55:13 +0000
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-find {object_storage_specs,full_stack} -name manifest | \
+find specs/{object_storage,full_stack} -name manifest | \
 while read spec; do
     spec_dir=$(dirname $spec)
-    echo $spec_dir
-    ./scripts/mojo-spec-check.py $spec_dir
-    echo ""
+    MSGS=$(./helper/scripts/mojo-spec-check.py $spec_dir 2>&1)
+    if [[ ! -z $MSGS ]]; then
+        echo $spec_dir
+	echo "$MSGS"
+        echo ""
+    fi
 done

=== modified file 'helper/scripts/mojo-spec-check.py'
--- scripts/mojo-spec-check.py	2015-02-05 12:04:22 +0000
+++ helper/scripts/mojo-spec-check.py	2015-02-10 07:55:13 +0000
@@ -13,27 +13,33 @@
 }
 UBUNTU_RELEASES=['precise', 'trusty', 'utopic', 'vivid']
 
-def get_direc_option(line, opt):
+# Helpers
+def get_directive_opt(line, opt):
+    """Return value for kv pair in manifest line"""
     for word in line:
         if opt in word:
             return word.split('=')[1]
 
-def check_manifest_ubuntu_release():
+
+def get_manifest_ubuntu_release():
+    """Return Ubuntu release referenced in deploy manifest directive"""
+    releases = []
     with open('manifest', 'r') as f: 
         for line in f.readlines():
             words = line.split()
             if words and words[0] == "deploy":
-                target_arg = get_direc_option(words, 'target')
+                target_arg = get_directive_opt(words, 'target')
                 if target_arg:
-                    if len([rel for rel in UBUNTU_RELEASES if rel in target_arg]) > 0:
-                        logging.warn('juju deployer target contains a hardcoded '
-                                     'Ubuntu release. Consider using ${MOJO_SERIES}')
+                    releases.append(target_arg)
                 else:
                     logging.warn('No target is set for juju deployer, this '
                                  'spec will not support multiple ubuntu '
                                  'releases, specify a target with ${MOJO_SERIES}')
+    return releases
+
 
 def get_manifest_referenced():
+    """Return all files refernced in the manifest"""
     config_files=[]
     with open('manifest', 'r') as f: 
         for line in f.readlines():
@@ -42,7 +48,9 @@
                     config_files.extend(resolve_file(word.split('=')[1]))
     return config_files
 
+
 def resolve_file(rfile):
+    """Substitute runtime env variables into string and return list of possabilities"""
     check_files = []
     if 'MOJO_SERIES' in rfile:
         for series in ['trusty', 'precise']:
@@ -53,52 +61,92 @@
         check_files.append(rfile)
     return check_files
 
-def manifest_check(fname):
-    if not fname in get_manifest_referenced():
-        logging.warn('%s not referenced in manifest. Can this file be removed?' % fname)
-
-logging.basicConfig(level=logging.INFO)
-# Check that all files are referenced in the manifest otherwise why are they
-# here?
-os.chdir(sys.argv[1])
-dir_list = os.listdir('.')
-if 'SPEC_INFO.txt' not in dir_list:
-   logging.warn('No spec description file SPEC_INFO.txt')
-
-for f in dir_list:
-    if f in WHITELIST:
-        continue
-    if f in YAML_MAP.keys():
-        manifest_check(YAML_MAP[f])
-    else:
-        manifest_check(f)
-
-# Check that all files referenced in the manifest are present
-for f in get_manifest_referenced():
-    if f not in dir_list:
-        logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
-    for yamlfile in YAML_MAP.keys():
-        if f == YAML_MAP[yamlfile]:
-            if not yamlfile in dir_list:
-                logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
-
-# look for local changes
-for f in dir_list:
-    if not os.path.islink(f) and f not in WHITELIST:
-        logging.warn('Spec file %s is a local copy, can this be replaced with a link to a helper copy?' % f)
-
-# look for dead symlink
-for f in dir_list:
-    if os.path.islink(f) and not os.path.exists(os.readlink(f)):
-        logging.error('%s is a dead symlink' % f)
-
-# Check yamls are valid
-for f in dir_list:
-    if f.endswith('.yaml'):
-        stream = open(f, 'r')
-        try:
-            yaml.load(stream)
-        except yaml.scanner.ScannerError:
-            logging.error('%s contains errors, mojo spec will fail' % f)
-
-check_manifest_ubuntu_release()
+# Checks
+def check_manifest_ubuntu_release():
+    """Check Ubuntu release is not hardcoded in manifest"""
+    for target_arg in get_manifest_ubuntu_release():
+        if len([rel for rel in UBUNTU_RELEASES if rel in target_arg]) > 0:
+            logging.warn('juju deployer target contains a hardcoded '
+                         'Ubuntu release. Consider using ${MOJO_SERIES}')
+
+def check4spec(dir_list):
+    """Check spec has a SPEC_INFO.txt file describing the spec"""
+    if 'SPEC_INFO.txt' not in dir_list:
+       logging.warn('No spec description file SPEC_INFO.txt')
+
+
+def check_files_are_in_manifest(dir_list):
+    """Check that all files are referenced in the manifest"""
+
+    def _manifest_check(fname):
+        if not fname in get_manifest_referenced():
+            logging.warn('%s not referenced in manifest. Can this file be removed?' % fname)
+
+    for f in dir_list:
+        if f in WHITELIST:
+            continue
+        if f in YAML_MAP.keys():
+            _manifest_check(YAML_MAP[f])
+        else:
+            _manifest_check(f)
+
+
+def check_files_from_manifest(dir_list):
+    """Check that all files referenced in the manifest are present"""
+    for f in get_manifest_referenced():
+        if f not in dir_list:
+            logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
+        for yamlfile in YAML_MAP.keys():
+            if f == YAML_MAP[yamlfile]:
+                if not yamlfile in dir_list:
+                    logging.error('%s referenced in manifest but not present, mojo spec will fail' % f)
+
+
+def check_local_changes(dir_list):
+    """Check for local changes"""
+    for f in dir_list:
+        if not os.path.islink(f) and f not in WHITELIST:
+            logging.warn('Spec file %s is a local copy, can this be replaced with a link to a helper copy?' % f)
+
+
+def check_dead_symlinks(dir_list):
+    """Check for dead symlink"""
+    for f in dir_list:
+        if os.path.islink(f) and not os.path.exists(os.readlink(f)):
+            logging.error('%s is a dead symlink' % f)
+
+
+def check_yaml_syntax(dir_list):
+    """Check yamls are valid"""
+    for f in dir_list:
+        if f.endswith('.yaml'):
+            stream = open(f, 'r')
+            try:
+                yaml.load(stream)
+            except yaml.scanner.ScannerError:
+                logging.error('%s contains errors, mojo spec will fail' % f)
+
+
+def check_dirname():
+    """Check tip dirname matches Openstack release refernced in manifest"""
+    for target in get_manifest_ubuntu_release():
+        if target.split('-')[1] != os.getcwd().split('/')[-1]:
+            logging.warn('Openstack series referneced in manifest does not match dir')
+
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    os.chdir(sys.argv[1])
+    dir_list = os.listdir('.')
+    check4spec(dir_list)
+    check_files_are_in_manifest(dir_list)
+    check_files_from_manifest(dir_list)
+    check_local_changes(dir_list)
+    check_dead_symlinks(dir_list)
+    check_manifest_ubuntu_release()
+    check_yaml_syntax(dir_list)
+    check_dirname()
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== modified file 'helper/setup/image_setup.py'
--- helper/setup/image_setup.py	2015-02-03 10:25:37 +0000
+++ helper/setup/image_setup.py	2015-02-10 07:55:13 +0000
@@ -5,6 +5,7 @@
 import logging
 import os
 
+
 def main(argv):
     logging.basicConfig(level=logging.INFO)
     overcloud_novarc = mojo_utils.get_overcloud_auth()
@@ -21,8 +22,8 @@
         if os.path.exists(cache_dir + '/' + image_name):
             local_file = cache_dir + '/' + image_name
         else:
-            local_file = mojo_os_utils.download_image(image_config[image]['url'])
-        print local_file
+            local_file = mojo_os_utils.download_image(
+                image_config[image]['url'])
         mojo_os_utils.upload_image(
             glance_client,
             local_file,

=== modified file 'helper/setup/network_setup.py'
--- helper/setup/network_setup.py	2015-02-05 14:46:47 +0000
+++ helper/setup/network_setup.py	2015-02-10 07:55:13 +0000
@@ -4,7 +4,6 @@
 import utils.mojo_os_utils as mojo_os_utils
 import logging
 import argparse
-import os
 
 
 def setup_sdn(net_topology):
@@ -70,7 +69,10 @@
     # Add an interface to the neutron-gateway units and tell juju to us it
     # as the external port
     net_info = mojo_utils.get_mojo_config('network.yaml')[net_topology]
-    mojo_os_utils.configure_gateway_ext_port(novac, neutronc, dvr_mode=net_info.get('dvr_enabled', False))
+    mojo_os_utils.configure_gateway_ext_port(
+        novac,
+        neutronc,
+        dvr_mode=net_info.get('dvr_enabled', False))
     setup_sdn(net_topology)
 
 

=== renamed directory 'template' => 'helper/template'
=== modified symlink 'helper/template/dev/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'helper/template/dev/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../helper/collect/collect-next'
=== modified symlink 'helper/template/dev/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../helper/bundles/full.yaml'
=== modified symlink 'helper/template/dev/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'helper/template/dev/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'helper/template/dev/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'helper/template/dev/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'helper/template/dev/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'helper/template/dev/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'helper/template/dev/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../helper/collect/repo-next'
=== modified symlink 'helper/template/dev/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'helper/template/dev/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified file 'helper/tests/checksum_keystone_certs.py'
--- helper/tests/checksum_keystone_certs.py	2015-02-03 13:07:31 +0000
+++ helper/tests/checksum_keystone_certs.py	2015-02-10 07:55:13 +0000
@@ -13,6 +13,7 @@
          '/usr/local/share/ca-certificates',
          '/etc/apache2/ssl/keystone']
 
+
 def update_hash_from_path(hash, path, recurse_depth=10):
     """Recurse through path and update the provided hash for every file found.
     """
@@ -39,8 +40,8 @@
 # Check CA
 with tempfile.NamedTemporaryFile(delete=False) as tmpfile:
     name = tmpfile.name
-    for path in ['/var/lib/keystone/juju_ssl/ubuntu_cloud_intermediate_ca/cacert.pem',
-                 '/var/lib/keystone/juju_ssl/ubuntu_cloud_root_ca/cacert.pem']:
+    for path in [root + '/ubuntu_cloud_intermediate_ca/cacert.pem',
+                 root + '/ubuntu_cloud_root_ca/cacert.pem']:
         if not os.path.exists(path):
             print "WARNING: %s does not exist" % (path)
             continue
@@ -59,4 +60,3 @@
 
 print "TOTAL: %s" % sha.hexdigest()
 sys.exit(0)
-

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2015-02-02 16:06:13 +0000
+++ helper/utils/mojo_os_utils.py	2015-02-10 07:55:13 +0000
@@ -222,10 +222,13 @@
         mojo_utils.juju_set('neutron-gateway', 'ext-port=eth1', wait=False)
         if dvr_mode:
             logging.info('Seting neutron-openvswitch external port to eth1')
-            mojo_utils.juju_set('neutron-openvswitch', 'ext-port=eth1', wait=False)
+            mojo_utils.juju_set('neutron-openvswitch',
+                                'ext-port=eth1',
+                                wait=False)
         time.sleep(180)
         mojo_utils.juju_wait_finished()
 
+
 def create_tenant_network(neutron_client, tenant_id, net_name='private',
                           shared=False, network_type='gre'):
     networks = neutron_client.list_networks(name=net_name)

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2015-01-28 14:53:20 +0000
+++ helper/utils/mojo_utils.py	2015-02-10 07:55:13 +0000
@@ -199,7 +199,7 @@
 
 def juju_set(service, option, wait=None):
     if wait is None:
-        wait=True
+        wait = True
     logging.info('Setting %s to %s' % (service, option))
     subprocess.check_call(['juju', 'set', service, option])
     if wait:

=== removed directory 'partial_stack'
=== added directory 'specs'
=== added directory 'specs/bugs'
=== renamed directory 'dev' => 'specs/dev'
=== modified symlink 'specs/dev/bug1389670/mysql/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/bug1389670/mysql/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/bug1389670/mysql/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/bug1389670/mysql/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/bug1389670/mysql/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/bug1389670/mysql/network.yaml'
=== target changed u'../../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/bug1389670/mysql/network_setup.py'
=== target changed u'../../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/bug1389670/mysql/simple_os_checks.py'
=== target changed u'../../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/bug1389670/mysql/sync_charmhelpers.py'
=== target changed u'../../../helper/setup/sync_charmhelpers.py' => u'../../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/bug1389670/mysql/utils'
=== target changed u'../../../helper/utils/' => u'../../../../helper/utils/'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/network.yaml'
=== target changed u'../../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/network_setup.py'
=== target changed u'../../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/simple_os_checks.py'
=== target changed u'../../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/sync_charmhelpers.py'
=== target changed u'../../../helper/setup/sync_charmhelpers.py' => u'../../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/bug1389670/percona-cluster/utils'
=== target changed u'../../../helper/utils/' => u'../../../../helper/utils/'
=== modified symlink 'specs/dev/dvr/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/dvr/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/dvr/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/dvr/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/dvr/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/dvr/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/dvr/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../helper/collect/repo-next'
=== modified symlink 'specs/dev/dvr/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/dvr/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/full_nrpe/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/full_nrpe/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/full_nrpe/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/full_nrpe/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/full_nrpe/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/full_nrpe/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/full_nrpe/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/full_nrpe/run_nagios_checks.py'
=== target changed u'../../helper/tests/run_nagios_checks.py' => u'../../../helper/tests/run_nagios_checks.py'
=== modified symlink 'specs/dev/full_nrpe/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/full_nrpe/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/full_nrpe/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/haproxy_always/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/haproxy_always/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../helper/bundles/full.yaml'
=== modified symlink 'specs/dev/haproxy_always/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/haproxy_always/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/haproxy_always/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/haproxy_always/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/haproxy_always/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/haproxy_always/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/haproxy_always/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../helper/collect/repo-next'
=== modified symlink 'specs/dev/haproxy_always/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/haproxy_always/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/haproxy_always/test_obj_store.py'
=== target changed u'../../helper/tests/test_obj_store.py' => u'../../../helper/tests/test_obj_store.py'
=== modified symlink 'specs/dev/haproxy_always/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/keystone_ssl/add_unit.py'
=== target changed u'../../helper/setup/add_unit.py' => u'../../../helper/setup/add_unit.py'
=== modified symlink 'specs/dev/keystone_ssl/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/keystone_ssl/check_keystone_certs.py'
=== target changed u'../../helper/tests/check_keystone_certs.py' => u'../../../helper/tests/check_keystone_certs.py'
=== modified symlink 'specs/dev/keystone_ssl/checksum_keystone_certs.py'
=== target changed u'../../helper/tests/checksum_keystone_certs.py' => u'../../../helper/tests/checksum_keystone_certs.py'
=== modified symlink 'specs/dev/keystone_ssl/delete_crm_leader.py'
=== target changed u'../../helper/setup/delete_crm_leader.py' => u'../../../helper/setup/delete_crm_leader.py'
=== modified symlink 'specs/dev/keystone_ssl/delete_unit.py'
=== target changed u'../../helper/setup/delete_unit.py' => u'../../../helper/setup/delete_unit.py'
=== modified symlink 'specs/dev/keystone_ssl/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../helper/bundles/full.yaml'
=== modified symlink 'specs/dev/keystone_ssl/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/keystone_ssl/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/keystone_ssl/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/keystone_ssl/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/keystone_ssl/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/keystone_ssl/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/keystone_ssl/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/keystone_ssl/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/keystone_ssl/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/multicast_port_change/check_guest_connectivity.py'
=== target changed u'../../helper/tests/check_guest_connectivity.py' => u'../../../helper/tests/check_guest_connectivity.py'
=== modified symlink 'specs/dev/multicast_port_change/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/multicast_port_change/haphase1.yaml'
=== target changed u'../../helper/bundles/haphase1.yaml' => u'../../../helper/bundles/haphase1.yaml'
=== modified symlink 'specs/dev/multicast_port_change/haphase2.yaml'
=== target changed u'../../helper/bundles/haphase2.yaml' => u'../../../helper/bundles/haphase2.yaml'
=== modified symlink 'specs/dev/multicast_port_change/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/multicast_port_change/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/multicast_port_change/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/multicast_port_change/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/multicast_port_change/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/multicast_port_change/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/multicast_port_change/next-ha.yaml'
=== target changed u'../../helper/bundles/next-ha.yaml' => u'../../../helper/bundles/next-ha.yaml'
=== modified symlink 'specs/dev/multicast_port_change/repo-next-ha'
=== target changed u'../../helper/collect/repo-next-ha' => u'../../../helper/collect/repo-next-ha'
=== modified symlink 'specs/dev/multicast_port_change/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/multicast_port_change/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/multicast_port_change/upgrade_services.py'
=== target changed u'../../helper/setup/upgrade_services.py' => u'../../../helper/setup/upgrade_services.py'
=== modified symlink 'specs/dev/multicast_port_change/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/multicast_port_change/wipe_charm_dir.py'
=== target changed u'../../helper/setup/wipe_charm_dir.py' => u'../../../helper/setup/wipe_charm_dir.py'
=== modified symlink 'specs/dev/neutron_ha/check_guest_connectivity.py'
=== target changed u'../../helper/tests/check_guest_connectivity.py' => u'../../../helper/tests/check_guest_connectivity.py'
=== modified symlink 'specs/dev/neutron_ha/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/neutron_ha/delete_router_home.py'
=== target changed u'../../helper/setup/delete_router_home.py' => u'../../../helper/setup/delete_router_home.py'
=== modified symlink 'specs/dev/neutron_ha/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/neutron_ha/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/neutron_ha/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/neutron_ha/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/neutron_ha/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/neutron_ha/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/neutron_ha/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/neutron_ha/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/neutron_ha/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/novaccalch/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/novaccalch/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../helper/bundles/full.yaml'
=== modified symlink 'specs/dev/novaccalch/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/novaccalch/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/novaccalch/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/novaccalch/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/novaccalch/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../helper/setup/network.yaml'
=== modified symlink 'specs/dev/novaccalch/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/novaccalch/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../helper/collect/repo-next'
=== modified symlink 'specs/dev/novaccalch/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/novaccalch/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../helper/setup/sync_charmhelpers.py'
=== modified symlink 'specs/dev/novaccalch/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/add_unit.py'
=== target changed u'../../../helper/setup/add_unit.py' => u'../../../../helper/setup/add_unit.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/network_setup.py'
=== target changed u'../../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/run_nagios_checks.py'
=== target changed u'../../../helper/tests/run_nagios_checks.py' => u'../../../../helper/tests/run_nagios_checks.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/scale_out_swift_proxy.py'
=== target changed u'../../../helper/setup/scale_out_swift_proxy.py' => u'../../../../helper/setup/scale_out_swift_proxy.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/scale_out_swift_storage.py'
=== target changed u'../../../helper/setup/scale_out_swift_storage.py' => u'../../../../helper/setup/scale_out_swift_storage.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/swift_ring_status.py'
=== target changed u'../../../helper/tests/swift_ring_status.py' => u'../../../../helper/tests/swift_ring_status.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../helper/tests/test_obj_store.py'
=== modified symlink 'specs/dev/swift_nrpe/simple_nonha/utils'
=== target changed u'../../../helper/utils' => u'../../../../helper/utils'
=== modified symlink 'specs/dev/vxlan/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../helper/tests/check_juju.py'
=== modified symlink 'specs/dev/vxlan/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../helper/collect/collect-next'
=== modified symlink 'specs/dev/vxlan/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../helper/setup/image_setup.py'
=== modified symlink 'specs/dev/vxlan/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../helper/setup/images.yaml'
=== modified symlink 'specs/dev/vxlan/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../helper/setup/keystone_setup.py'
=== modified symlink 'specs/dev/vxlan/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../helper/setup/keystone_users.yaml'
=== modified symlink 'specs/dev/vxlan/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../helper/setup/network_setup.py'
=== modified symlink 'specs/dev/vxlan/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../helper/collect/repo-next'
=== modified symlink 'specs/dev/vxlan/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../helper/tests/simple_os_checks.py'
=== modified symlink 'specs/dev/vxlan/utils'
=== target changed u'../../helper/utils' => u'../../../helper/utils'
=== added directory 'specs/features'
=== renamed directory 'full_stack' => 'specs/full_stack'
=== added directory 'specs/full_stack/charmhelper_upgrade/icehouse'
=== renamed file 'full_stack/charmhelper_upgrade/SPEC_INFO.txt' => 'specs/full_stack/charmhelper_upgrade/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/charmhelper_upgrade/check_juju.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/collect-next' => 'specs/full_stack/charmhelper_upgrade/icehouse/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../../helper/collect/collect-next'
=== renamed symlink 'full_stack/charmhelper_upgrade/full.yaml' => 'specs/full_stack/charmhelper_upgrade/icehouse/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade/helper' => 'specs/full_stack/charmhelper_upgrade/icehouse/helper'
=== target changed u'../../helper' => u'../../../../helper'
=== renamed symlink 'full_stack/charmhelper_upgrade/image_setup.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/images.yaml' => 'specs/full_stack/charmhelper_upgrade/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade/keystone_setup.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/keystone_users.yaml' => 'specs/full_stack/charmhelper_upgrade/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/charmhelper_upgrade/manifest' => 'specs/full_stack/charmhelper_upgrade/icehouse/manifest'
=== renamed symlink 'full_stack/charmhelper_upgrade/network.yaml' => 'specs/full_stack/charmhelper_upgrade/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade/network_setup.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/repo-next' => 'specs/full_stack/charmhelper_upgrade/icehouse/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../../helper/collect/repo-next'
=== renamed symlink 'full_stack/charmhelper_upgrade/simple_os_checks.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/sync_charmhelpers.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../../helper/setup/sync_charmhelpers.py'
=== renamed symlink 'full_stack/charmhelper_upgrade/test_obj_store.py' => 'specs/full_stack/charmhelper_upgrade/icehouse/test_obj_store.py'
=== target changed u'../../helper/tests/test_obj_store.py' => u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/charmhelper_upgrade/juno'
=== added file 'specs/full_stack/charmhelper_upgrade/juno/SPEC_INFO.txt'
--- specs/full_stack/charmhelper_upgrade/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a non-ha deployment and testing the resulting cloud

=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade/juno/manifest'
--- specs/full_stack/charmhelper_upgrade/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade/juno/manifest	2015-02-10 07:55:13 +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
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

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

=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade/kilo/manifest'
--- specs/full_stack/charmhelper_upgrade/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade/kilo/manifest	2015-02-10 07:55:13 +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
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 target=${MOJO_SERIES}-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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/sync_charmhelpers.py'
=== target is u'../../../../helper/setup/sync_charmhelpers.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/charmhelper_upgrade_ha/icehouse'
=== renamed file 'full_stack/charmhelper_upgrade_ha/SPEC_INFO.txt' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/check_juju.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/collect-next-ha' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/collect-next-ha'
=== target changed u'../../helper/collect/collect-next-ha' => u'../../../../helper/collect/collect-next-ha'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/haphase1.yaml' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/haphase1.yaml'
=== target changed u'../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/haphase2.yaml' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/haphase2.yaml'
=== target changed u'../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/helper' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/helper'
=== target changed u'../../helper' => u'../../../../helper'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/image_setup.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/images.yaml' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/keystone_setup.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/keystone_users.yaml' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/charmhelper_upgrade_ha/manifest' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/manifest'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/network.yaml' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/network_setup.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/repo-next-ha' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/repo-next-ha'
=== target changed u'../../helper/collect/repo-next-ha' => u'../../../../helper/collect/repo-next-ha'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/set_vips.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/set_vips.py'
=== target changed u'../../helper/setup/set_vips.py' => u'../../../../helper/setup/set_vips.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/simple_os_checks.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/sync_charmhelpers.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/sync_charmhelpers.py'
=== target changed u'../../helper/setup/sync_charmhelpers.py' => u'../../../../helper/setup/sync_charmhelpers.py'
=== renamed symlink 'full_stack/charmhelper_upgrade_ha/test_obj_store.py' => 'specs/full_stack/charmhelper_upgrade_ha/icehouse/test_obj_store.py'
=== target changed u'../../helper/tests/test_obj_store.py' => u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/charmhelper_upgrade_ha/juno'
=== added file 'specs/full_stack/charmhelper_upgrade_ha/juno/SPEC_INFO.txt'
--- specs/full_stack/charmhelper_upgrade_ha/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade_ha/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec collects the charms and then upgrades charmhelpers in each charm
+before running a ha deployment and testing the resulting cloud

=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade_ha/juno/manifest'
--- specs/full_stack/charmhelper_upgrade_ha/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade_ha/juno/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

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

=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/helper'
=== target is u'../../../../helper'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/charmhelper_upgrade_ha/kilo/manifest'
--- specs/full_stack/charmhelper_upgrade_ha/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/charmhelper_upgrade_ha/kilo/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Sync charmhelpers into each charm
+script config=sync_charmhelpers.py
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-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.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/sync_charmhelpers.py'
=== target is u'../../../../helper/setup/sync_charmhelpers.py'
=== added symlink 'specs/full_stack/charmhelper_upgrade_ha/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added directory 'specs/full_stack/ha_phased/icehouse'
=== renamed file 'full_stack/ha_phased/SPEC_INFO.txt' => 'specs/full_stack/ha_phased/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/ha_phased/check_juju.py' => 'specs/full_stack/ha_phased/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/ha_phased/collect-next-ha' => 'specs/full_stack/ha_phased/icehouse/collect-next-ha'
=== target changed u'../../helper/collect/collect-next-ha' => u'../../../../helper/collect/collect-next-ha'
=== renamed symlink 'full_stack/ha_phased/haphase1.yaml' => 'specs/full_stack/ha_phased/icehouse/haphase1.yaml'
=== target changed u'../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1.yaml'
=== renamed symlink 'full_stack/ha_phased/haphase2.yaml' => 'specs/full_stack/ha_phased/icehouse/haphase2.yaml'
=== target changed u'../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2.yaml'
=== renamed symlink 'full_stack/ha_phased/image_setup.py' => 'specs/full_stack/ha_phased/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/ha_phased/images.yaml' => 'specs/full_stack/ha_phased/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/ha_phased/keystone_setup.py' => 'specs/full_stack/ha_phased/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/ha_phased/keystone_users.yaml' => 'specs/full_stack/ha_phased/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/ha_phased/manifest' => 'specs/full_stack/ha_phased/icehouse/manifest'
=== renamed symlink 'full_stack/ha_phased/network.yaml' => 'specs/full_stack/ha_phased/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/ha_phased/network_setup.py' => 'specs/full_stack/ha_phased/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/ha_phased/repo-next-ha' => 'specs/full_stack/ha_phased/icehouse/repo-next-ha'
=== target changed u'../../helper/collect/repo-next-ha' => u'../../../../helper/collect/repo-next-ha'
=== renamed symlink 'full_stack/ha_phased/set_vips.py' => 'specs/full_stack/ha_phased/icehouse/set_vips.py'
=== target changed u'../../helper/setup/set_vips.py' => u'../../../../helper/setup/set_vips.py'
=== renamed symlink 'full_stack/ha_phased/simple_os_checks.py' => 'specs/full_stack/ha_phased/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/ha_phased/test_obj_store.py' => 'specs/full_stack/ha_phased/icehouse/test_obj_store.py'
=== target changed u'../../helper/tests/test_obj_store.py' => u'../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'full_stack/ha_phased/utils' => 'specs/full_stack/ha_phased/icehouse/utils'
=== target changed u'../../helper/utils' => u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_phased/juno'
=== added file 'specs/full_stack/ha_phased/juno/SPEC_INFO.txt'
--- specs/full_stack/ha_phased/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment

=== added symlink 'specs/full_stack/ha_phased/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased/juno/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased/juno/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased/juno/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased/juno/manifest'
--- specs/full_stack/ha_phased/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/juno/manifest	2015-02-10 07:55:13 +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/full_stack/ha_phased/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_phased/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_phased/juno/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_phased/juno/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_phased/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_phased/juno/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_phased/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_phased/kilo'
=== added file 'specs/full_stack/ha_phased/kilo/SPEC_INFO.txt'
--- specs/full_stack/ha_phased/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment

=== added symlink 'specs/full_stack/ha_phased/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased/kilo/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased/kilo/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased/kilo/manifest'
--- specs/full_stack/ha_phased/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased/kilo/manifest	2015-02-10 07:55:13 +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/full_stack/ha_phased/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_phased/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_phased/kilo/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_phased/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_phased_chaos_pony/icehouse'
=== renamed file 'full_stack/ha_phased_chaos_pony/SPEC_INFO.txt' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/chaos_pony.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/chaos_pony.py'
=== target changed u'../../helper/setup/chaos_pony.py' => u'../../../../helper/setup/chaos_pony.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/check_juju.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/collect-next-ha' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/collect-next-ha'
=== target changed u'../../helper/collect/collect-next-ha' => u'../../../../helper/collect/collect-next-ha'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/haphase1.yaml' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/haphase1.yaml'
=== target changed u'../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1.yaml'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/haphase2.yaml' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/haphase2.yaml'
=== target changed u'../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2.yaml'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/image_setup.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/images.yaml' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/keystone_setup.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/keystone_users.yaml' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/ha_phased_chaos_pony/manifest' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/manifest'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/network.yaml' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/network_setup.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/repo-next-ha' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/repo-next-ha'
=== target changed u'../../helper/collect/repo-next-ha' => u'../../../../helper/collect/repo-next-ha'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/set_vips.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/set_vips.py'
=== target changed u'../../helper/setup/set_vips.py' => u'../../../../helper/setup/set_vips.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/simple_os_checks.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/test_obj_store.py' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/test_obj_store.py'
=== target changed u'../../helper/tests/test_obj_store.py' => u'../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'full_stack/ha_phased_chaos_pony/utils' => 'specs/full_stack/ha_phased_chaos_pony/icehouse/utils'
=== target changed u'../../helper/utils' => u'../../../../helper/utils'
=== added directory 'specs/full_stack/ha_phased_chaos_pony/juno'
=== added file 'specs/full_stack/ha_phased_chaos_pony/juno/SPEC_INFO.txt'
--- specs/full_stack/ha_phased_chaos_pony/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased_chaos_pony/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment. iThen chaos pony is used to add and remove units.

=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/chaos_pony.py'
=== target is u'../../../../helper/setup/chaos_pony.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased_chaos_pony/juno/manifest'
--- specs/full_stack/ha_phased_chaos_pony/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased_chaos_pony/juno/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 --target=${MOJO_SERIES}-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
+
+# Run chaos pony to destroy and add services
+script config=chaos_pony.py

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

=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/chaos_pony.py'
=== target is u'../../../../helper/setup/chaos_pony.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/haphase1.yaml'
=== target is u'../../../../helper/bundles/haphase1.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/haphase2.yaml'
=== target is u'../../../../helper/bundles/haphase2.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/ha_phased_chaos_pony/kilo/manifest'
--- specs/full_stack/ha_phased_chaos_pony/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/ha_phased_chaos_pony/kilo/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,38 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Copy the branches to the deployment directory
+repo config=repo-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=haphase1.yaml delay=0 --target=${MOJO_SERIES}-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
+
+# Run chaos pony to destroy and add services
+script config=chaos_pony.py

=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/ha_phased_chaos_pony/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy/icehouse'
=== renamed file 'full_stack/next_deploy/SPEC_INFO.txt' => 'specs/full_stack/next_deploy/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/next_deploy/check_juju.py' => 'specs/full_stack/next_deploy/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/next_deploy/collect-next' => 'specs/full_stack/next_deploy/icehouse/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../../helper/collect/collect-next'
=== renamed symlink 'full_stack/next_deploy/full.yaml' => 'specs/full_stack/next_deploy/icehouse/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full.yaml'
=== renamed symlink 'full_stack/next_deploy/image_setup.py' => 'specs/full_stack/next_deploy/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/next_deploy/images.yaml' => 'specs/full_stack/next_deploy/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/next_deploy/keystone_setup.py' => 'specs/full_stack/next_deploy/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/next_deploy/keystone_users.yaml' => 'specs/full_stack/next_deploy/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/next_deploy/manifest' => 'specs/full_stack/next_deploy/icehouse/manifest'
=== renamed symlink 'full_stack/next_deploy/network.yaml' => 'specs/full_stack/next_deploy/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/next_deploy/network_setup.py' => 'specs/full_stack/next_deploy/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/next_deploy/repo-next' => 'specs/full_stack/next_deploy/icehouse/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../../helper/collect/repo-next'
=== renamed symlink 'full_stack/next_deploy/simple_os_checks.py' => 'specs/full_stack/next_deploy/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/next_deploy/utils' => 'specs/full_stack/next_deploy/icehouse/utils'
=== target changed u'../../helper/utils' => u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy/juno'
=== added file 'specs/full_stack/next_deploy/juno/SPEC_INFO.txt'
--- specs/full_stack/next_deploy/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/next_deploy/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy/juno/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/juno/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/next_deploy/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy/juno/manifest'
--- specs/full_stack/next_deploy/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/juno/manifest	2015-02-10 07:55:13 +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/full_stack/next_deploy/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy/juno/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy/kilo'
=== added file 'specs/full_stack/next_deploy/kilo/SPEC_INFO.txt'
--- specs/full_stack/next_deploy/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/next_deploy/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy/kilo/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/kilo/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/next_deploy/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy/kilo/manifest'
--- specs/full_stack/next_deploy/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/kilo/manifest	2015-02-10 07:55:13 +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/full_stack/next_deploy/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy/kilo/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_ssl/icehouse'
=== renamed file 'full_stack/next_deploy_ssl/SPEC_INFO.txt' => 'specs/full_stack/next_deploy_ssl/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/next_deploy_ssl/check_juju.py' => 'specs/full_stack/next_deploy_ssl/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/next_deploy_ssl/collect-next' => 'specs/full_stack/next_deploy_ssl/icehouse/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../../helper/collect/collect-next'
=== renamed symlink 'full_stack/next_deploy_ssl/full_ssl.yaml' => 'specs/full_stack/next_deploy_ssl/icehouse/full_ssl.yaml'
=== target changed u'../../helper/bundles/full_ssl.yaml' => u'../../../../helper/bundles/full_ssl.yaml'
=== renamed symlink 'full_stack/next_deploy_ssl/image_setup.py' => 'specs/full_stack/next_deploy_ssl/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/next_deploy_ssl/images.yaml' => 'specs/full_stack/next_deploy_ssl/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/next_deploy_ssl/keystone_setup.py' => 'specs/full_stack/next_deploy_ssl/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/next_deploy_ssl/keystone_users.yaml' => 'specs/full_stack/next_deploy_ssl/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/next_deploy_ssl/manifest' => 'specs/full_stack/next_deploy_ssl/icehouse/manifest'
=== renamed symlink 'full_stack/next_deploy_ssl/network.yaml' => 'specs/full_stack/next_deploy_ssl/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/next_deploy_ssl/network_setup.py' => 'specs/full_stack/next_deploy_ssl/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/next_deploy_ssl/repo-next' => 'specs/full_stack/next_deploy_ssl/icehouse/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../../helper/collect/repo-next'
=== renamed symlink 'full_stack/next_deploy_ssl/simple_os_checks.py' => 'specs/full_stack/next_deploy_ssl/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/next_deploy_ssl/utils' => 'specs/full_stack/next_deploy_ssl/icehouse/utils'
=== target changed u'../../helper/utils' => u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_ssl/juno'
=== added file 'specs/full_stack/next_deploy_ssl/juno/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_ssl/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/next_deploy_ssl/juno/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/full_ssl.yaml'
=== target is u'../../../../helper/bundles/full_ssl.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_ssl/juno/manifest'
--- specs/full_stack/next_deploy_ssl/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/juno/manifest	2015-02-10 07:55:13 +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_ssl.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"

=== added symlink 'specs/full_stack/next_deploy_ssl/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/juno/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_deploy_ssl/kilo'
=== added file 'specs/full_stack/next_deploy_ssl/kilo/SPEC_INFO.txt'
--- specs/full_stack/next_deploy_ssl/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms wil ssl enabled
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/full_ssl.yaml'
=== target is u'../../../../helper/bundles/full_ssl.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy_ssl/kilo/manifest'
--- specs/full_stack/next_deploy_ssl/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy_ssl/kilo/manifest	2015-02-10 07:55:13 +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_ssl.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"

=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy_ssl/kilo/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/stable_to_next/icehouse'
=== renamed file 'full_stack/stable_to_next/SPEC_INFO.txt' => 'specs/full_stack/stable_to_next/icehouse/SPEC_INFO.txt'
=== renamed symlink 'full_stack/stable_to_next/check_juju.py' => 'specs/full_stack/stable_to_next/icehouse/check_juju.py'
=== target changed u'../../helper/tests/check_juju.py' => u'../../../../helper/tests/check_juju.py'
=== renamed symlink 'full_stack/stable_to_next/collect-next' => 'specs/full_stack/stable_to_next/icehouse/collect-next'
=== target changed u'../../helper/collect/collect-next' => u'../../../../helper/collect/collect-next'
=== renamed symlink 'full_stack/stable_to_next/collect-stable-precise' => 'specs/full_stack/stable_to_next/icehouse/collect-stable-precise'
=== target changed u'../../helper/collect/collect-stable-precise' => u'../../../../helper/collect/collect-stable-precise'
=== renamed symlink 'full_stack/stable_to_next/collect-stable-trusty' => 'specs/full_stack/stable_to_next/icehouse/collect-stable-trusty'
=== target changed u'../../helper/collect/collect-stable-trusty' => u'../../../../helper/collect/collect-stable-trusty'
=== renamed symlink 'full_stack/stable_to_next/full.yaml' => 'specs/full_stack/stable_to_next/icehouse/full.yaml'
=== target changed u'../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full.yaml'
=== renamed symlink 'full_stack/stable_to_next/image_setup.py' => 'specs/full_stack/stable_to_next/icehouse/image_setup.py'
=== target changed u'../../helper/setup/image_setup.py' => u'../../../../helper/setup/image_setup.py'
=== renamed symlink 'full_stack/stable_to_next/images.yaml' => 'specs/full_stack/stable_to_next/icehouse/images.yaml'
=== target changed u'../../helper/setup/images.yaml' => u'../../../../helper/setup/images.yaml'
=== renamed symlink 'full_stack/stable_to_next/keystone_setup.py' => 'specs/full_stack/stable_to_next/icehouse/keystone_setup.py'
=== target changed u'../../helper/setup/keystone_setup.py' => u'../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'full_stack/stable_to_next/keystone_users.yaml' => 'specs/full_stack/stable_to_next/icehouse/keystone_users.yaml'
=== target changed u'../../helper/setup/keystone_users.yaml' => u'../../../../helper/setup/keystone_users.yaml'
=== renamed file 'full_stack/stable_to_next/manifest' => 'specs/full_stack/stable_to_next/icehouse/manifest'
=== renamed symlink 'full_stack/stable_to_next/network.yaml' => 'specs/full_stack/stable_to_next/icehouse/network.yaml'
=== target changed u'../../helper/setup/network.yaml' => u'../../../../helper/setup/network.yaml'
=== renamed symlink 'full_stack/stable_to_next/network_setup.py' => 'specs/full_stack/stable_to_next/icehouse/network_setup.py'
=== target changed u'../../helper/setup/network_setup.py' => u'../../../../helper/setup/network_setup.py'
=== renamed symlink 'full_stack/stable_to_next/repo-next' => 'specs/full_stack/stable_to_next/icehouse/repo-next'
=== target changed u'../../helper/collect/repo-next' => u'../../../../helper/collect/repo-next'
=== renamed symlink 'full_stack/stable_to_next/simple_os_checks.py' => 'specs/full_stack/stable_to_next/icehouse/simple_os_checks.py'
=== target changed u'../../helper/tests/simple_os_checks.py' => u'../../../../helper/tests/simple_os_checks.py'
=== renamed symlink 'full_stack/stable_to_next/upgrade_all_services.py' => 'specs/full_stack/stable_to_next/icehouse/upgrade_all_services.py'
=== target changed u'../../helper/setup/upgrade_all_services.py' => u'../../../../helper/setup/upgrade_all_services.py'
=== renamed symlink 'full_stack/stable_to_next/utils' => 'specs/full_stack/stable_to_next/icehouse/utils'
=== target changed u'../../helper/utils' => u'../../../../helper/utils'
=== renamed symlink 'full_stack/stable_to_next/wipe_charm_dir.py' => 'specs/full_stack/stable_to_next/icehouse/wipe_charm_dir.py'
=== target changed u'../../helper/setup/wipe_charm_dir.py' => u'../../../../helper/setup/wipe_charm_dir.py'
=== added directory 'specs/full_stack/stable_to_next/juno'
=== added file 'specs/full_stack/stable_to_next/juno/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment

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

=== added symlink 'specs/full_stack/stable_to_next/juno/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next/juno/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next/juno/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/stable_to_next/juno/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next/juno/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next/juno/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next/juno/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'
=== added directory 'specs/full_stack/stable_to_next/kilo'
=== added file 'specs/full_stack/stable_to_next/kilo/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms, then upgrades the
+charms to the devel versions and then runs tests to validate the deployment

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

=== added symlink 'specs/full_stack/stable_to_next/kilo/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next/kilo/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next/kilo/repo-next'
=== target is u'../../../../helper/collect/repo-next'
=== added symlink 'specs/full_stack/stable_to_next/kilo/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next/kilo/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next/kilo/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next/kilo/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'
=== renamed directory 'object_storage_specs' => 'specs/object_storage'
=== added directory 'specs/object_storage/ceph_radosgw/ha/icehouse'
=== renamed file 'object_storage_specs/ceph_radosgw/ha/SPEC_INFO.txt' => 'specs/object_storage/ceph_radosgw/ha/icehouse/SPEC_INFO.txt'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/add_unit.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/add_unit.py'
=== target changed u'../../../helper/setup/add_unit.py' => u'../../../../../helper/setup/add_unit.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/cephradosgw-ha.yaml' => 'specs/object_storage/ceph_radosgw/ha/icehouse/cephradosgw-ha.yaml'
=== target changed u'../../../helper/bundles/cephradosgw-ha.yaml' => u'../../../../../helper/bundles/cephradosgw-ha.yaml'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/check_juju.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../../helper/tests/check_juju.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/collect-cephradosgw-ha' => 'specs/object_storage/ceph_radosgw/ha/icehouse/collect-cephradosgw-ha'
=== target changed u'../../../helper/collect/collect-cephradosgw-ha' => u'../../../../../helper/collect/collect-cephradosgw-ha'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/delete_crm_leader.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/delete_crm_leader.py'
=== target changed u'../../../helper/setup/delete_crm_leader.py' => u'../../../../../helper/setup/delete_crm_leader.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/juju_set.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/juju_set.py'
=== target changed u'../../../helper/setup/juju_set.py' => u'../../../../../helper/setup/juju_set.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/keystone_setup.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/keystone_users.yaml' => 'specs/object_storage/ceph_radosgw/ha/icehouse/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../../helper/setup/keystone_users.yaml'
=== renamed file 'object_storage_specs/ceph_radosgw/ha/manifest' => 'specs/object_storage/ceph_radosgw/ha/icehouse/manifest'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/repo-cephradosgw-ha' => 'specs/object_storage/ceph_radosgw/ha/icehouse/repo-cephradosgw-ha'
=== target changed u'../../../helper/collect/repo-cephradosgw-ha' => u'../../../../../helper/collect/repo-cephradosgw-ha'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/test_obj_store.py' => 'specs/object_storage/ceph_radosgw/ha/icehouse/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/ha/utils' => 'specs/object_storage/ceph_radosgw/ha/icehouse/utils'
=== target changed u'../../../helper/utils' => u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/ha/juno'
=== added file 'specs/object_storage/ceph_radosgw/ha/juno/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/ha/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/ha/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change

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

=== added symlink 'specs/object_storage/ceph_radosgw/ha/juno/repo-cephradosgw-ha'
=== target is u'../../../../../helper/collect/repo-cephradosgw-ha'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/juno/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/juno/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/ha/kilo'
=== added file 'specs/object_storage/ceph_radosgw/ha/kilo/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/ha/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/ha/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by multiple ceph rados gateway nodes.
+The rados gw leader is removed and additional units added. With tests run
+after each change

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

=== added symlink 'specs/object_storage/ceph_radosgw/ha/kilo/repo-cephradosgw-ha'
=== target is u'../../../../../helper/collect/repo-cephradosgw-ha'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/kilo/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/ha/kilo/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse'
=== renamed file 'object_storage_specs/ceph_radosgw/simple_nonha/SPEC_INFO.txt' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/SPEC_INFO.txt'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/cephradosgw.yaml' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/cephradosgw.yaml'
=== target changed u'../../../helper/bundles/cephradosgw.yaml' => u'../../../../../helper/bundles/cephradosgw.yaml'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/check_juju.py' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../../helper/tests/check_juju.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/collect-cephradosgw' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/collect-cephradosgw'
=== target changed u'../../../helper/collect/collect-cephradosgw' => u'../../../../../helper/collect/collect-cephradosgw'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/image_setup.py' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../../helper/setup/image_setup.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/images.yaml' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../../helper/setup/images.yaml'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/keystone_setup.py' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/keystone_users.yaml' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../../helper/setup/keystone_users.yaml'
=== renamed file 'object_storage_specs/ceph_radosgw/simple_nonha/manifest' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/manifest'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/repo-cephradosgw' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/repo-cephradosgw'
=== target changed u'../../../helper/collect/repo-cephradosgw' => u'../../../../../helper/collect/repo-cephradosgw'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/test_obj_store.py' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'object_storage_specs/ceph_radosgw/simple_nonha/utils' => 'specs/object_storage/ceph_radosgw/simple_nonha/icehouse/utils'
=== target changed u'../../../helper/utils' => u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/simple_nonha/juno'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/juno/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/simple_nonha/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/cephradosgw.yaml'
=== target is u'../../../../../helper/bundles/cephradosgw.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/collect-cephradosgw'
=== target is u'../../../../../helper/collect/collect-cephradosgw'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/juno/manifest'
--- specs/object_storage/ceph_radosgw/simple_nonha/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/juno/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,20 @@
+# Collect the charm branches from Launchpad
+collect config=collect-cephradosgw
+
+# Copy the branches to the deployment directory
+repo config=repo-cephradosgw
+
+# Use juju deployer with cephradosgw-ha.yaml bundle
+deploy config=cephradosgw.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/repo-cephradosgw'
=== target is u'../../../../../helper/collect/repo-cephradosgw'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/juno/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/ceph_radosgw/simple_nonha/kilo'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/SPEC_INFO.txt'
--- specs/object_storage/ceph_radosgw/simple_nonha/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a ceph cluster fronted by a single ceph rados gateway node.
+The cluster is then tested with mulitple object store gets and retrivals.
+Glance integeration is also tested.

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/cephradosgw.yaml'
=== target is u'../../../../../helper/bundles/cephradosgw.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/collect-cephradosgw'
=== target is u'../../../../../helper/collect/collect-cephradosgw'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/manifest'
--- specs/object_storage/ceph_radosgw/simple_nonha/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/ceph_radosgw/simple_nonha/kilo/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,20 @@
+# Collect the charm branches from Launchpad
+collect config=collect-cephradosgw
+
+# Copy the branches to the deployment directory
+repo config=repo-cephradosgw
+
+# Use juju deployer with cephradosgw-ha.yaml bundle
+deploy config=cephradosgw.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/repo-cephradosgw'
=== target is u'../../../../../helper/collect/repo-cephradosgw'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/ceph_radosgw/simple_nonha/kilo/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse'
=== renamed file 'object_storage_specs/swift_proxy/ha_parallel_scaleout/SPEC_INFO.txt' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/SPEC_INFO.txt'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/add_unit.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/add_unit.py'
=== target changed u'../../../helper/setup/add_unit.py' => u'../../../../../helper/setup/add_unit.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/check_juju.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../../helper/tests/check_juju.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/collect-swift-proxy' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/collect-swift-proxy'
=== target changed u'../../../helper/collect/collect-swift-proxy' => u'../../../../../helper/collect/collect-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/image_setup.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../../helper/setup/image_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/images.yaml' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../../helper/setup/images.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/keystone_setup.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/keystone_users.yaml' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../../helper/setup/keystone_users.yaml'
=== renamed file 'object_storage_specs/swift_proxy/ha_parallel_scaleout/manifest' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/manifest'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/repo-swift-proxy' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/repo-swift-proxy'
=== target changed u'../../../helper/collect/repo-swift-proxy' => u'../../../../../helper/collect/repo-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/swift-ha-proxy-phase1.yaml' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/swift-ha-proxy-phase1.yaml'
=== target changed u'../../../helper/bundles/swift-ha-proxy-phase1.yaml' => u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/swift_ring_status.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/swift_ring_status.py'
=== target changed u'../../../helper/tests/swift_ring_status.py' => u'../../../../../helper/tests/swift_ring_status.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/test_obj_store.py' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_parallel_scaleout/utils' => 'specs/object_storage/swift_proxy/ha_parallel_scaleout/icehouse/utils'
=== target changed u'../../../helper/utils' => u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/ha_parallel_scaleout/juno'
=== added directory 'specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo'
=== added directory 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse'
=== renamed file 'object_storage_specs/swift_proxy/ha_serial_scaleout/SPEC_INFO.txt' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/SPEC_INFO.txt'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/add_unit.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/add_unit.py'
=== target changed u'../../../helper/setup/add_unit.py' => u'../../../../../helper/setup/add_unit.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/check_juju.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../../helper/tests/check_juju.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/collect-swift-proxy' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/collect-swift-proxy'
=== target changed u'../../../helper/collect/collect-swift-proxy' => u'../../../../../helper/collect/collect-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/image_setup.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../../helper/setup/image_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/images.yaml' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../../helper/setup/images.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/keystone_setup.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/keystone_users.yaml' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../../helper/setup/keystone_users.yaml'
=== renamed file 'object_storage_specs/swift_proxy/ha_serial_scaleout/manifest' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/manifest'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/repo-swift-proxy' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/repo-swift-proxy'
=== target changed u'../../../helper/collect/repo-swift-proxy' => u'../../../../../helper/collect/repo-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/swift-ha-proxy-phase1.yaml' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/swift-ha-proxy-phase1.yaml'
=== target changed u'../../../helper/bundles/swift-ha-proxy-phase1.yaml' => u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/swift-ha-proxy-phase2.yaml' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/swift-ha-proxy-phase2.yaml'
=== target changed u'../../../helper/bundles/swift-ha-proxy-phase2.yaml' => u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/swift_ring_status.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/swift_ring_status.py'
=== target changed u'../../../helper/tests/swift_ring_status.py' => u'../../../../../helper/tests/swift_ring_status.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/test_obj_store.py' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'object_storage_specs/swift_proxy/ha_serial_scaleout/utils' => 'specs/object_storage/swift_proxy/ha_serial_scaleout/icehouse/utils'
=== target changed u'../../../helper/utils' => u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno'
=== added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/SPEC_INFO.txt'
--- specs/object_storage/swift_proxy/ha_serial_scaleout/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/ha_serial_scaleout/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.

=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/add_unit.py'
=== target is u'../../../../../helper/setup/add_unit.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/collect-swift-proxy'
=== target is u'../../../../../helper/collect/collect-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/manifest'
--- specs/object_storage/swift_proxy/ha_serial_scaleout/juno/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/ha_serial_scaleout/juno/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,53 @@
+# Collect the charm branches from Launchpad 
+collect config=collect-swift-proxy
+
+# Copy the branches to the deployment directory
+repo config=repo-swift-proxy
+
+# Deploy service units
+deploy config=swift-ha-proxy-phase1.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Add service relations
+deploy config=swift-ha-proxy-phase2.yaml delay=0 target=${MOJO_SERIES}-juno
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add a swift-proxy unit
+script config=add_unit.py UNITS='swift-proxy:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add swift-storage units
+script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/repo-swift-proxy'
=== target is u'../../../../../helper/collect/repo-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/swift-ha-proxy-phase1.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/swift-ha-proxy-phase2.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/juno/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo'
=== added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/SPEC_INFO.txt'
--- specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,3 @@
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.

=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/add_unit.py'
=== target is u'../../../../../helper/setup/add_unit.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/collect-swift-proxy'
=== target is u'../../../../../helper/collect/collect-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/manifest'
--- specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/manifest	2015-02-10 07:55:13 +0000
@@ -0,0 +1,53 @@
+# Collect the charm branches from Launchpad 
+collect config=collect-swift-proxy
+
+# Copy the branches to the deployment directory
+repo config=repo-swift-proxy
+
+# Deploy service units
+deploy config=swift-ha-proxy-phase1.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Add service relations
+deploy config=swift-ha-proxy-phase2.yaml delay=0 target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add a swift-proxy unit
+script config=add_unit.py UNITS='swift-proxy:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add swift-storage units
+script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/repo-swift-proxy'
=== target is u'../../../../../helper/collect/repo-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/swift-ha-proxy-phase1.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/swift-ha-proxy-phase2.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/swift_proxy/ha_serial_scaleout/kilo/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/simple_nonha/icehouse'
=== renamed file 'object_storage_specs/swift_proxy/simple_nonha/SPEC_INFO.txt' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/SPEC_INFO.txt'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/check_juju.py' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/check_juju.py'
=== target changed u'../../../helper/tests/check_juju.py' => u'../../../../../helper/tests/check_juju.py'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/collect-swift-proxy' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/collect-swift-proxy'
=== target changed u'../../../helper/collect/collect-swift-proxy' => u'../../../../../helper/collect/collect-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/image_setup.py' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/image_setup.py'
=== target changed u'../../../helper/setup/image_setup.py' => u'../../../../../helper/setup/image_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/images.yaml' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/images.yaml'
=== target changed u'../../../helper/setup/images.yaml' => u'../../../../../helper/setup/images.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/keystone_setup.py' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/keystone_setup.py'
=== target changed u'../../../helper/setup/keystone_setup.py' => u'../../../../../helper/setup/keystone_setup.py'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/keystone_users.yaml' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/keystone_users.yaml'
=== target changed u'../../../helper/setup/keystone_users.yaml' => u'../../../../../helper/setup/keystone_users.yaml'
=== renamed file 'object_storage_specs/swift_proxy/simple_nonha/manifest' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/manifest'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/repo-swift-proxy' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/repo-swift-proxy'
=== target changed u'../../../helper/collect/repo-swift-proxy' => u'../../../../../helper/collect/repo-swift-proxy'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/swift-proxy.yaml' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/swift-proxy.yaml'
=== target changed u'../../../helper/bundles/swift-proxy.yaml' => u'../../../../../helper/bundles/swift-proxy.yaml'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/swift_ring_status.py' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/swift_ring_status.py'
=== target changed u'../../../helper/tests/swift_ring_status.py' => u'../../../../../helper/tests/swift_ring_status.py'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/test_obj_store.py' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/test_obj_store.py'
=== target changed u'../../../helper/tests/test_obj_store.py' => u'../../../../../helper/tests/test_obj_store.py'
=== renamed symlink 'object_storage_specs/swift_proxy/simple_nonha/utils' => 'specs/object_storage/swift_proxy/simple_nonha/icehouse/utils'
=== target changed u'../../../helper/utils' => u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/simple_nonha/juno'
=== added file 'specs/object_storage/swift_proxy/simple_nonha/juno/SPEC_INFO.txt'
--- specs/object_storage/swift_proxy/simple_nonha/juno/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/simple_nonha/juno/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.

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

=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/juno/repo-swift-proxy'
=== target is u'../../../../../helper/collect/repo-swift-proxy'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/juno/swift-proxy.yaml'
=== target is u'../../../../../helper/bundles/swift-proxy.yaml'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/juno/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/juno/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/object_storage/swift_proxy/simple_nonha/juno/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/object_storage/swift_proxy/simple_nonha/kilo'
=== added file 'specs/object_storage/swift_proxy/simple_nonha/kilo/SPEC_INFO.txt'
--- specs/object_storage/swift_proxy/simple_nonha/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/object_storage/swift_proxy/simple_nonha/kilo/SPEC_INFO.txt	2015-02-10 07:55:13 +0000
@@ -0,0 +1,2 @@
+This spec deploys a swift cluster fronted by a single swift proxy. The
+resulting object store is then tested.

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

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