Merge lp:~dweaver/orange-box-examples/orange-box-examples into lp:~kirkland/orange-box-examples/trunk

[Darryl Weaver]

Modified all bundles to fix version numbers of deployed charms.
Removed individual 00-bootstrap.sh and 99-cleanup.sh commands to use generic version.
Modified 00-bootstrap.sh to allow booting requested series (either precise or trusty).
Modified icehouse bundles to position in the GUI.
Added Landscape deployment for Landscape Installer demos.

[lp:~dweaver/orange-box-examples/orange-box-examples]

17. By Dustin Kirkland  on 2014-07-25

* === added directory usr/lib/orange-box/examples/infrastructure, ===
  added directory usr/lib/orange-box/examples/infrastructure/precise,
  === added directory usr/lib/orange-
  box/examples/infrastructure/trusty, === added directory
  usr/lib/orange-box/examples/landscape, === added directory
  usr/lib/orange-box/examples/openstack/old-demos, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/havana, === added
  directory usr/lib/orange-box/examples/openstack/old-demos/havana-
  colo, === added directory usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/juju-config, ===
  added directory usr/lib/orange-box/examples/openstack/old-
  demos/openstack-configuration, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/devstack,
  === added directory usr/lib/orange-box/examples/openstack/old-
  demos/openstack-configuration/devstack/test_utils, === added
  directory usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master, === added directory usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates, === added directory
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/01demo-prep.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-colo/02deploy.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/03configure-cloud.sh,
  === added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-colo/04cleanup.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-colo/README, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  compute/01demo-prep.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/02deploy.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute/04cleanup.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/README, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/01demo-prep.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift/02deploy.sh, === added
  symlink usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/03configure-cloud.sh, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/havana-swift/04cleanup.sh, ===
  added symlink usr/lib/orange-box/examples/openstack/old-
  demos/havana-swift/README, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/essex, === added symlink usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/grizzly, === added symlink
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/havana, === added symlink
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/icehouse, === removed directory
  usr/lib/orange-box/examples/app-bundles/owncloud, === removed
  directory usr/lib/orange-box/examples/openstack/complex, === removed
  directory usr/lib/orange-box/examples/openstack/complex/havana, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/havana-colo, === removed directory
  usr/lib/orange-box/examples/openstack/complex/havana-compute, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/havana-swift, === removed directory
  usr/lib/orange-box/examples/openstack/complex/juju-config, ===
  removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration, === removed
  directory usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/devstack, === removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master, === removed directory usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates, === removed directory
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/01demo-prep.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/02deploy.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  colo/03configure-cloud.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-colo/04cleanup.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  colo/README, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/01demo-prep.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/02deploy.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/04cleanup.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-compute/README, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  swift/01demo-prep.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/02deploy.sh, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/havana-
  swift/03configure-cloud.sh, === removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/04cleanup.sh, ===
  removed symlink usr/lib/orange-
  box/examples/openstack/complex/havana-swift/README, === removed
  symlink usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/essex, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/grizzly, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/havana, === removed symlink
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/icehouse, === target is ufolsom, ===
  target is ugrizzly, === target is uhavana, === target is
  u../havana/01demo-prep.sh, === target is u../havana/02deploy.sh, ===
  target is u../havana/03configure-cloud.sh, === target is
  u../havana/04cleanup.sh, === target is u../havana/README, === target
  was ufolsom, === target was ugrizzly, === target was uhavana, ===
  target was u../havana/01demo-prep.sh, === target was
  u../havana/02deploy.sh, === target was u../havana/03configure-
  cloud.sh, === target was u../havana/04cleanup.sh, === target was
  u../havana/README, usr/lib/orange-box/examples/00-bootstrap.sh,
  usr/lib/orange-box/examples/99-cleanup.sh, usr/lib/orange-
  box/examples/app-bundles/owncloud/owncloud-bundle.yaml,
  usr/lib/orange-box/examples/hadoop/00-bootstrap.sh, usr/lib/orange-
  box/examples/hadoop/01-deploy.sh, usr/lib/orange-
  box/examples/hadoop/01-get-juju-gui-info.sh, usr/lib/orange-
  box/examples/hadoop/02-hadoop.yaml, usr/lib/orange-
  box/examples/hadoop/02-run-terasort.sh, usr/lib/orange-
  box/examples/hadoop/03-hive-demo.txt, usr/lib/orange-
  box/examples/hadoop/03-run-terasort.sh, usr/lib/orange-
  box/examples/hadoop/04-hive-demo.txt, usr/lib/orange-
  box/examples/hadoop/demo.sh, usr/lib/orange-
  box/examples/hadoop/hadoop.yaml, usr/lib/orange-
  box/examples/hadoop/README, usr/lib/orange-
  box/examples/infrastructure/precise/01-deploy.sh, usr/lib/orange-
  box/examples/infrastructure/precise/infrastructure-bundle.yaml,
  usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh,
  usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-
  bundle.yaml, usr/lib/orange-box/examples/landscape/01-deploy.sh,
  usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml,
  usr/lib/orange-box/examples/landscape/README, usr/lib/orange-
  box/examples/openstack/complex/bridge2.xml, usr/lib/orange-
  box/examples/openstack/complex/havana/01demo-prep.sh,
  usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh,
  usr/lib/orange-box/examples/openstack/complex/havana/03configure-
  cloud.sh, usr/lib/orange-
  box/examples/openstack/complex/havana/04cleanup.sh, usr/lib/orange-
  box/examples/openstack/complex/havana/bundle.yaml, usr/lib/orange-
  box/examples/openstack/complex/havana-colo/bundle.yaml,
  usr/lib/orange-box/examples/openstack/complex/havana-
  compute/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/complex/havana-compute/bundle.yaml,
  usr/lib/orange-box/examples/openstack/complex/havana/README,
  usr/lib/orange-box/examples/openstack/complex/havana-
  swift/bundle.yaml, usr/lib/orange-
  box/examples/openstack/complex/juju-config/environments.yaml,
  usr/lib/orange-box/examples/openstack/complex/juju-config/generate-
  jujuenv, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/configure-tests, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/configure_tests.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/config.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_devstack_exercises.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/cloud.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/config.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/client.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/__init__.py, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/devstack/test_utils/juju/juju_deployer.py,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/all_variables, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack.conf, usr/lib/orange-
  box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/exerciserc,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.master,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_essex,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_folsom,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_havana,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/etc_master/openstack.conf, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/get-cloud-
  images, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/inspect-environment, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/prepare-
  cloud, usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/prepare_cloud/folsom, usr/lib/orange-
  box/examples/openstack/complex/openstack-configuration/README,
  usr/lib/orange-box/examples/openstack/complex/openstack-
  configuration/verify-cloud, usr/lib/orange-
  box/examples/openstack/complex/openstack-prereqs-install.sh,
  usr/lib/orange-box/examples/openstack/complex/README,
  usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh,
  usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/00-
  bootstrap.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/01-deploy.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-
  openstack.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-
  juju.sh, usr/lib/orange-box/examples/openstack/icehouse/precise/99-
  cleanup.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/automated-deploy.sh,
  usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-
  instances.sh, usr/lib/orange-
  box/examples/openstack/icehouse/precise/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/precise/README,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/00-
  bootstrap.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/01-deploy.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/02-configure-openstack.sh,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-
  jumpserver-and-juju.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/99-cleanup.sh,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-
  deploy.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/deploy-instances.sh,
  usr/lib/orange-
  box/examples/openstack/icehouse/trusty/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/nova.rc,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/README,
  usr/lib/orange-box/examples/openstack/old-demos/bridge2.xml,
  usr/lib/orange-box/examples/openstack/old-demos/havana/01demo-
  prep.sh, usr/lib/orange-box/examples/openstack/old-
  demos/havana/02deploy.sh, usr/lib/orange-box/examples/openstack/old-
  demos/havana/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/old-demos/havana/04cleanup.sh,
  usr/lib/orange-box/examples/openstack/old-demos/havana/bundle.yaml,
  usr/lib/orange-box/examples/openstack/old-demos/havana-
  colo/bundle.yaml, usr/lib/orange-box/examples/openstack/old-
  demos/havana-compute/03configure-cloud.sh, usr/lib/orange-
  box/examples/openstack/old-demos/havana-compute/bundle.yaml,
  usr/lib/orange-box/examples/openstack/old-demos/havana/README,
  usr/lib/orange-box/examples/openstack/old-demos/havana-
  swift/bundle.yaml, usr/lib/orange-box/examples/openstack/old-
  demos/juju-config/environments.yaml, usr/lib/orange-
  box/examples/openstack/old-demos/juju-config/generate-jujuenv,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/configure-tests, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/configure_tests.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/config.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_devstack_exercises.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/cloud.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/config.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/client.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/__init__.py, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/devstack/test_utils/juju/juju_deployer.py,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/all_variables, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack.conf, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/exerciserc,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.master,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_essex,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_folsom,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/devstack_templates/openrc.stable_havana,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/etc_master/openstack.conf, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/get-cloud-
  images, usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/inspect-environment, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/prepare-
  cloud, usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/prepare_cloud/folsom, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-configuration/README,
  usr/lib/orange-box/examples/openstack/old-demos/openstack-
  configuration/verify-cloud, usr/lib/orange-
  box/examples/openstack/old-demos/openstack-prereqs-install.sh,
  usr/lib/orange-box/examples/openstack/old-demos/README,
  usr/lib/orange-box/examples/openstack/old-demos/remove-kvms.sh,
  usr/lib/orange-box/examples/openstack/old-
  demos/SUPERCEDED_USE_ICEHOUSE, usr/lib/orange-box/examples/README,
  usr/lib/orange-box/examples/telco/00-bootstrap.sh, usr/lib/orange-
  box/examples/telco/01-deploy.sh, usr/lib/orange-
  box/examples/telco/99-cleanup.sh, usr/lib/orange-
  box/examples/webdev-bundles/node-app/node-app.yaml:
  - Modified all bundles to fix version numbers of deployed charms.
  - Removed individual 00-bootstrap.sh and 99-cleanup.sh commands to
    use generic version.
  - Modified 00-bootstrap.sh to allow booting requested series
    (either precise or trusty).
  - Modified icehouse bundles to position in the GUI.
  - Added Landscape deployment for Landscape Installer demos.

=== modified file 'usr/lib/orange-box/examples/00-bootstrap.sh'
--- usr/lib/orange-box/examples/00-bootstrap.sh	2014-07-16 07:31:25 +0000
+++ usr/lib/orange-box/examples/00-bootstrap.sh	2014-07-24 01:23:40 +0000
@@ -1,12 +1,5 @@
 #!/bin/bash
 #
-# Ameet Paranjape, 2 April 2014
-
-set -x
-
-juju status && echo "Existing deployment found, exiting." && exit 0
-juju bootstrap --constraints "tags=virtual" --show-log --upload-tools
-juju set-constraints "tags="
-juju deploy --to 0 --repository=/srv/charmstore/ local:precise/juju-gui
-juju expose juju-gui
-
+# Darryl Weaver, 21 July 2014
+
+orange-box-bootstrap-juju

=== added file 'usr/lib/orange-box/examples/99-cleanup.sh'
--- usr/lib/orange-box/examples/99-cleanup.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/99-cleanup.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+orange-box-destroy-juju
+

=== modified file 'usr/lib/orange-box/examples/README'
--- usr/lib/orange-box/examples/README	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/README	2014-07-24 01:23:40 +0000
@@ -3,3 +3,12 @@
 Each directory contains a demo for the micro cluster as well as a README 
 file on how to run the demo.  It is highly recommended to read the 
 README before running a demo!
+
+To bootstrap Juju run:
+./00-bootstrap.sh
+
+Then deploy a demo by reading the README and usually running:
+cd demo-folder
+./01-deploy.sh
+
+Sometimes you can deploy a bundle using the Juju-gui, but there can be problems you can't see from the GUI, so please deploy complex applications using the command line.

=== removed directory 'usr/lib/orange-box/examples/app-bundles/owncloud'
=== removed file 'usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml'
--- usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/app-bundles/owncloud/owncloud-bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-envExport: 
-  services: 
-    owncloud: 
-      charm: "cs:precise/owncloud-13"
-      num_units: 1
-      options: 
-        password: admin
-        user: admin
-      annotations: 
-        "gui-x": "332"
-        "gui-y": "304"
-    "owncloud-mysql": 
-      charm: "cs:precise/mysql-46"
-      num_units: 1
-      annotations: 
-        "gui-x": "330"
-        "gui-y": "609"
-    "owncloud-phpmyadmin": 
-      charm: "cs:precise/phpmyadmin-4"
-      num_units: 1
-      expose: true
-      annotations: 
-        "gui-x": "722"
-        "gui-y": "607"
-    "owncloud-haproxy": 
-      charm: "cs:precise/haproxy-31"
-      num_units: 1
-      expose: true
-      annotations: 
-        "gui-x": "332"
-        "gui-y": "18"
-    "owncloud-nfs": 
-      charm: "cs:precise/nfs-4"
-      num_units: 1
-      annotations: 
-        "gui-x": "-114"
-        "gui-y": "449"
-  relations: 
-    - - "owncloud:db"
-      - "owncloud-mysql:db"
-    - - "owncloud-phpmyadmin:db-admin"
-      - "owncloud-mysql:db-admin"
-    - - "owncloud-haproxy:reverseproxy"
-      - "owncloud:website"
-    - - "owncloud:shared-fs"
-      - "owncloud-nfs:nfs"
-  series: precise

=== removed file 'usr/lib/orange-box/examples/hadoop/00-bootstrap.sh'
--- usr/lib/orange-box/examples/hadoop/00-bootstrap.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/hadoop/00-bootstrap.sh	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Remove any stale ssh known hosts
-rm -f ~/.ssh/known_hosts
-
-# Bootstrap the juju environment
-juju bootstrap --debug
-
-# Deploy the juju-gui to the bootstrap node
-juju deploy --to=0 juju-gui
-juju expose juju-gui
-
-ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
-JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
-echo "Admin Secret: $ADMIN_SECRET"
-echo "juju-gui: http://$JUJU_GUI"

=== added file 'usr/lib/orange-box/examples/hadoop/01-deploy.sh'
--- usr/lib/orange-box/examples/hadoop/01-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/hadoop/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+
+set -e
+
+juju set-constraints tags=
+juju-deployer -c hadoop.yaml
+
+
+echo "Deployment finished"

=== removed file 'usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh'
--- usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/hadoop/01-get-juju-gui-info.sh	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
-JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
-echo "Admin Secret: $ADMIN_SECRET"
-echo "juju-gui: http://$JUJU_GUI"
-

=== removed file 'usr/lib/orange-box/examples/hadoop/02-hadoop.yaml'
--- usr/lib/orange-box/examples/hadoop/02-hadoop.yaml	2014-07-16 07:31:25 +0000
+++ usr/lib/orange-box/examples/hadoop/02-hadoop.yaml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-envExport:
-  services:
-    "hadoop-master":
-      charm: "cs:trusty/hadoop-13"
-      num_units: 1
-      expose: true
-      constraints: tags=physical
-      annotations:
-        "gui-x": "914.9191466830049"
-        "gui-y": "112.84003435856067"
-    hive-metadata:
-      charm: "cs:precise/mysql-46"
-      num_units: 1
-      options:
-        "binlog-format": ROW
-      annotations:
-        "gui-x": "1424.919207718161"
-        "gui-y": "343.5067213702795"
-    hive:
-      charm: "cs:precise/hive-5"
-      num_units: 1
-      to: "hive-metadata"
-      annotations:
-        "gui-x": "1146.5858336947235"
-        "gui-y": "340.3796452663048"
-    "hadoop-slavecluster":
-      charm: "cs:trusty/hadoop-13"
-      num_units: 2
-      constraints: tags=physical
-      annotations:
-        "gui-x": "648.3332046960281"
-        "gui-y": "340.61878278661516"
-  relations:
-    - - "hive:jobtracker"
-      - "hadoop-master:resourcemanager"
-    - - "hive:namenode"
-      - "hadoop-master:namenode"
-    - - "hive:db"
-      - "hive-metadata:db"
-    - - "hadoop-master:resourcemanager"
-      - "hadoop-slavecluster:nodemanager"
-    - - "hadoop-master:namenode"
-      - "hadoop-slavecluster:datanode"
-  series: precise

=== added file 'usr/lib/orange-box/examples/hadoop/02-run-terasort.sh'
--- usr/lib/orange-box/examples/hadoop/02-run-terasort.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/hadoop/02-run-terasort.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+juju ssh hadoop-master/0 "sudo su -l ubuntu -c /home/ubuntu/hadoop/terasort.sh"

=== added file 'usr/lib/orange-box/examples/hadoop/03-hive-demo.txt'
--- usr/lib/orange-box/examples/hadoop/03-hive-demo.txt	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/hadoop/03-hive-demo.txt	2014-07-24 01:23:40 +0000
@@ -0,0 +1,9 @@
+create database demo;
+juju ssh hive/0
+sudo su
+su - hdfs
+hive
+use demo;
+create external table demo (field1 STRING, field2 STRING) location '/user/hdfs/demo';
+load data inpath '/user/hdfs/out_dir/part-00001' into table demo;
+select count(field1) from demo;

=== removed file 'usr/lib/orange-box/examples/hadoop/03-run-terasort.sh'
--- usr/lib/orange-box/examples/hadoop/03-run-terasort.sh	2014-07-16 07:31:25 +0000
+++ usr/lib/orange-box/examples/hadoop/03-run-terasort.sh	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/bash
-juju ssh hadoop-master/0 "sudo su -l ubuntu -c /home/ubuntu/hadoop/terasort.sh"

=== removed file 'usr/lib/orange-box/examples/hadoop/04-hive-demo.txt'
--- usr/lib/orange-box/examples/hadoop/04-hive-demo.txt	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/hadoop/04-hive-demo.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-create database demo;
-juju ssh hive/0
-sudo su
-su - hdfs
-hive
-use demo;
-create external table demo (field1 STRING, field2 STRING) location '/user/hdfs/demo';
-load data inpath '/user/hdfs/out_dir/part-00001' into table demo;
-select count(field1) from demo;

=== added file 'usr/lib/orange-box/examples/hadoop/README'
--- usr/lib/orange-box/examples/hadoop/README	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/hadoop/README	2014-07-24 01:23:40 +0000
@@ -0,0 +1,11 @@
+Run the command:
+./01-deploy.sh to deploy hadoop.
+./02-run-terasort.sh to run an example terasort and watch it from the hadoop web UI.
+
+To find out the Hadoop Web UI address run:
+./get-hadoop-info.sh
+
+There are demo commands for hive in:
+03-hive-demo.txt
+But you must run these manually, so cat the file and then run the commands at your terminal one at a time.
+

=== removed file 'usr/lib/orange-box/examples/hadoop/demo.sh'
--- usr/lib/orange-box/examples/hadoop/demo.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/hadoop/demo.sh	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Remove any stale ssh known hosts
-rm -f ~/.ssh/known_hosts
-
-# Bootstrap the juju environment
-juju bootstrap --debug
-
-# Deploy the juju-gui to the bootstrap node
-juju deploy --to=0 juju-gui
-juju expose juju-gui
-
-# Deploy hadoop ( with HBase enabled )
-juju deploy hadoop hadoop-master
-juju set hadoop-master hbase=True
-juju deploy hadoop hadoop-slavecluster -n 3
-juju set hadoop-slavecluster hbase=True
-juju add-relation hadoop-master:namenode hadoop-slavecluster:datanode
-juju add-relation hadoop-master:jobtracker hadoop-slavecluster:tasktracker
-juju expose hadoop-master
-
-# Deploy hive ( with MySQL )
-juju deploy hive -n 3
-juju deploy mysql
-juju set mysql binlog-format=ROW
-juju add-relation hive:db mysql:db
-juju add-relation hive:namenode hadoop-master:namenode
-juju add-relation hive:jobtracker hadoop-master:jobtracker
-
-ADMIN_SECRET=`cat ~/.juju/environments/maas.jenv | grep admin-secret | awk '{ print $2 }'`
-JUJU_GUI=`juju status juju-gui | grep public-address | awk '{ print $2 }' | xargs host | grep address | awk '{ print $4 }'`
-echo "Admin Secret: $ADMIN_SECRET"
-echo "juju-gui: http://$JUJU_GUI"

=== added file 'usr/lib/orange-box/examples/hadoop/hadoop.yaml'
--- usr/lib/orange-box/examples/hadoop/hadoop.yaml	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/hadoop/hadoop.yaml	2014-07-24 01:23:40 +0000
@@ -0,0 +1,44 @@
+envExport:
+  services:
+    "hadoop-master":
+      charm: "cs:trusty/hadoop-13"
+      num_units: 1
+      expose: true
+      constraints: tags=physical
+      annotations:
+        "gui-x": "914.9191466830049"
+        "gui-y": "112.84003435856067"
+    hive-metadata:
+      charm: "cs:precise/mysql-46"
+      num_units: 1
+      options:
+        "binlog-format": ROW
+      annotations:
+        "gui-x": "1424.919207718161"
+        "gui-y": "343.5067213702795"
+    hive:
+      charm: "cs:precise/hive-5"
+      num_units: 1
+      to: "hive-metadata"
+      annotations:
+        "gui-x": "1146.5858336947235"
+        "gui-y": "340.3796452663048"
+    "hadoop-slavecluster":
+      charm: "cs:trusty/hadoop-13"
+      num_units: 2
+      constraints: tags=physical
+      annotations:
+        "gui-x": "648.3332046960281"
+        "gui-y": "340.61878278661516"
+  relations:
+    - - "hive:jobtracker"
+      - "hadoop-master:resourcemanager"
+    - - "hive:namenode"
+      - "hadoop-master:namenode"
+    - - "hive:db"
+      - "hive-metadata:db"
+    - - "hadoop-master:resourcemanager"
+      - "hadoop-slavecluster:nodemanager"
+    - - "hadoop-master:namenode"
+      - "hadoop-slavecluster:datanode"
+  series: precise

=== added directory 'usr/lib/orange-box/examples/infrastructure'
=== added directory 'usr/lib/orange-box/examples/infrastructure/precise'
=== added file 'usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh'
--- usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/infrastructure/precise/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+sudo rm -f /srv/charmstore/precise/rsyslog-primary;sudo ln -s /srv/charmstore/precise/rsyslog /srv/charmstore/precise/rsyslog-primary
+sudo rm -f /srv/charmstore/precise/rsyslog-secondary;sudo ln -s /srv/charmstore/precise/rsyslog /srv/charmstore/precise/rsyslog-secondary
+sudo rm -f /srv/charmstore/precise/logstash-elasticsearch;sudo ln -s /srv/charmstore/precise/elasticsearch /srv/charmstore/precise/logstash-elasticsearch
+
+juju set-constraints tags=
+juju-deployer -c infrastructure-bundle.yaml 
+
+
+echo "Deployment finished"

=== added file 'usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml'
--- usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	2014-07-24 01:23:40 +0000
@@ -0,0 +1,42 @@
+envExport: 
+  services: 
+    "landscape-client": 
+      branch: "lp:charms/landscape-client"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "545"
+    nagios: 
+      branch: "lp:charms/nagios"
+      num_units: 1
+      constraints: tags=nagios
+      expose: true
+      annotations: 
+        "gui-x": "-680"
+        "gui-y": "785"
+    nrpe: 
+      branch: "lp:charms/nrpe"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "785"
+    ganglia: 
+      branch: "lp:charms/ganglia"
+      num_units: 1
+      to: lxc:nagios=0
+      expose: true
+      annotations: 
+        "gui-x": "-680"
+        "gui-y": "1020"
+    "ganglia-node": 
+      branch: "lp:charms/ganglia-node"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "1020"
+  relations: 
+    - - "ganglia:node"
+      - "ganglia-node:node"
+    - - "nagios:monitors"
+      - "nrpe:monitors"
+  series: precise

=== added directory 'usr/lib/orange-box/examples/infrastructure/trusty'
=== added file 'usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh'
--- usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/infrastructure/trusty/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+sudo rm -f /srv/charmstore/trusty/rsyslog-primary;sudo ln -s /srv/charmstore/trusty/rsyslog /srv/charmstore/trusty/rsyslog-primary
+sudo rm -f /srv/charmstore/trusty/rsyslog-secondary;sudo ln -s /srv/charmstore/trusty/rsyslog /srv/charmstore/trusty/rsyslog-secondary
+sudo rm -f /srv/charmstore/trusty/logstash-elasticsearch;sudo ln -s /srv/charmstore/trusty/elasticsearch /srv/charmstore/trusty/logstash-elasticsearch
+
+juju set-constraints tags=
+juju-deployer -c infrastructure-bundle.yaml 
+
+
+echo "Deployment finished"

=== added file 'usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml'
--- usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	2014-07-24 01:23:40 +0000
@@ -0,0 +1,42 @@
+envExport: 
+  services: 
+    "landscape-client": 
+      branch: "lp:charms/landscape-client"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "545"
+    nagios: 
+      branch: "lp:charms/nagios"
+      num_units: 1
+      constraints: tags=nagios
+      expose: true
+      annotations: 
+        "gui-x": "-680"
+        "gui-y": "785"
+    nrpe: 
+      branch: "lp:charms/nrpe"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "785"
+    ganglia: 
+      branch: "lp:charms/ganglia"
+      num_units: 1
+      to: lxc:nagios=0
+      expose: true
+      annotations: 
+        "gui-x": "-680"
+        "gui-y": "1020"
+    "ganglia-node": 
+      branch: "lp:charms/ganglia-node"
+      num_units: 0
+      annotations: 
+        "gui-x": "-420"
+        "gui-y": "1020"
+  relations: 
+    - - "ganglia:node"
+      - "ganglia-node:node"
+    - - "nagios:monitors"
+      - "nrpe:monitors"
+  series: trusty

=== added directory 'usr/lib/orange-box/examples/landscape'
=== added file 'usr/lib/orange-box/examples/landscape/01-deploy.sh'
--- usr/lib/orange-box/examples/landscape/01-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/landscape/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+
+set -e
+
+if [ ! -f repo-file ]; then
+    echo "repo-file not found! exiting"
+    exit
+fi
+if [ ! -f license-file ]; then
+    echo "license-file not found! exiting"
+    exit
+fi
+
+
+juju set-constraints tags=
+juju-deployer -c landscape-deployments-ob.yaml landscape-ob
+
+
+echo "Deployment finished"

=== added file 'usr/lib/orange-box/examples/landscape/README'
--- usr/lib/orange-box/examples/landscape/README	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/landscape/README	2014-07-24 01:23:40 +0000
@@ -0,0 +1,56 @@
+Landscape Installer Demo
+
+Prerequisites: 
+
+At least 5 physical nodes with a second disk.
+ You will therefore need extra USB flash drives (pref 64GB) on nodes without a second disk already (nodes 1-4).
+
+At least 1 node with 2 NICs, all management services will be installed here, including Neutron and Juju bootstrap.
+ This should be on node0vm1.maas.
+ This virtual machine must have at least 20GB of space available.
+
+At least 1 MAAS node with the MAAS tag "landscape", this should be node1.maas.
+
+You will need to create a file: "repo-file" in this directory with the URL of the Landscape repository.
+
+You will need to create a file: "license-file" in this directory with a valid license or trial license to use Landscape.
+
+Overview:
+
+First an initial Juju environment will be used to deploy Landscape itself onto the OB.
+Once Landscape is installed, register the MAAS into Landscape.
+Then use the Openstack Installer Page to install the rest of the cloud onto a new Juju environment managed by Landscape.
+Once installed, find the details to connect to the Openstack Dashboard from Landscape.
+Log in and start using the cloud.
+
+Method:
+
+1) Bootstrap the first Juju environment on node0vm0.maas and install Juju-gui.
+2) Deploy Landscape on node1.maas.
+3) Connect to Landscape Web UI and create initial admin user.
+4) Register the MAAS server into Landscape.
+5) Use the Landscape Cloud Installer to deploy a new Juju environment with Openstack.
+6) When completed, get the login credentials from Landscape.
+7) Log into the Openstack Dashboard to deploy instances.
+
+Commands:
+
+Use the normal bootstrap in ~/Examples/00-bootstrap.sh - bootstraps Juju and installs the GUI.
+cd ~/Examples/landscape
+./01-deploy.sh - Deploys the Landscape Bundle
+More demo actions here, such as deploying a cloud.
+Then destroying the cloud.
+./99-cleanup.sh - Destroys the Landscape Juju environment.
+
+Troubleshooting:
+
+To troubleshoot the Landscape Juju environment
+1) Connect to the landscape instance
+ juju ssh landscape/0
+2) sudo to the Landscape user, setting JUJU_HOME
+ sudo -u landscape JUJU_HOME=/var/lib/landscape/juju-homes/XXX/ bash 
+Where XXX is the Juju environment number (find it from the Juju tab in Landscape UI)
+3) Use juju commands as normal
+ juju stat
+ juju debug-log
+

=== added file 'usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml'
--- usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/landscape/landscape-deployments-ob.yaml	2014-07-24 01:23:40 +0000
@@ -0,0 +1,91 @@
+_common:
+    services:
+        rabbitmq-server:
+            charm: cs:precise/rabbitmq-server-28
+        postgresql:
+            charm: cs:precise/postgresql-73
+            constraints: mem=2048
+            options:
+                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+                max_connections: 500
+        haproxy:
+            charm: cs:precise/haproxy-31
+            options:
+                enable_monitoring: True
+                monitoring_allowed_cidr: "0.0.0.0/0"
+                monitoring_password: "haproxy"
+                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+                # Don't deploy default haproxy service on port 80
+                services: ""
+        apache2:
+            charm: cs:precise/apache2-24
+            expose: True
+            options:
+                enable_modules: proxy proxy_http proxy_balancer rewrite expires headers ssl
+                ssl_cert: SELFSIGNED
+                ssl_certlocation: apache2.cert
+                ssl_keylocation: apache2.key
+
+landscape:
+    inherits: _common
+    series: precise
+    services:
+        landscape:
+            branch: lp:~landscape/landscape-charm/stable
+            constraints: mem=2048
+            options:
+                service-count: "2"
+                landscape-password: "look-a-different-password"
+                services: static appserver pingserver combo-loader async-frontend apiserver package-upload jobhandler package-search cron juju-sync
+                repository: include-file://repo-file
+                license-file: include-file://license-file
+        landscape-msg:
+            branch: lp:~landscape/landscape-charm/stable
+            charm: landscape
+            constraints: mem=2048
+            options:
+                landscape-password: "look-a-different-password"
+                services: msgserver
+                repository: include-file://repo-file
+                license-file: include-file://license-file
+    relations:
+        - [landscape, rabbitmq-server]
+        - [landscape, haproxy]
+        - ["landscape:vhost-config", "apache2:vhost-config"]
+        - ["landscape:db-admin", "postgresql:db-admin"]
+        - ["haproxy:website", "apache2:reverseproxy"]
+        - [landscape-msg, rabbitmq-server]
+        - [landscape-msg, haproxy]
+        - ["landscape-msg:db-admin", "postgresql:db-admin"]
+
+landscape-dense-maas:
+    inherits: landscape
+    services:
+        landscape:
+            to: lxc:0
+        landscape-msg:
+            to: lxc:0
+        postgresql:
+            to: lxc:0
+        rabbitmq-server:
+            to: lxc:0
+        apache2:
+            to: lxc:0
+        haproxy:
+            to: lxc:0
+
+landscape-ob:
+    inherits: landscape
+    services:
+        landscape:
+            constraints: tags=landscape
+        landscape-msg:
+            to: lxc:landscape=0
+        postgresql:
+            to: lxc:landscape=0
+        rabbitmq-server:
+            to: lxc:landscape=0
+        apache2:
+            to: lxc:landscape=0
+        haproxy:
+            to: lxc:landscape=0

=== removed directory 'usr/lib/orange-box/examples/openstack/complex'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/README'
--- usr/lib/orange-box/examples/openstack/complex/README	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/README	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-*** CURRENTLY BROKEN ***
-
-This is the Openstack deployment demo folder.
-
-Step 1: Run the script:
-./openstack-prereqs-install.sh
-
-Step 2: Change into a subdirectory of the deployment you want to use, use havana as default.
-cd havana
-
-Step 3: Run the pre-deployment to set up Juju and the GUI
-./01demo-prep.sh
-
-Step 4: Ready to run the demo!
-./02deploy.sh
-
-Step 5: Configure Openstack and Juju to Use Openstack
-./03configure-cloud.sh
-
-Step 6: Deploy other workloads ontop of Openstack.
-See other demo workload folders
-
-Step 7: Cleanup after a demo:
-./04cleanup.sh
-
-Ready to run the demo again.

=== removed file 'usr/lib/orange-box/examples/openstack/complex/bridge2.xml'
--- usr/lib/orange-box/examples/openstack/complex/bridge2.xml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/bridge2.xml	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<network>
-  <name>bridge2</name>
-  <uuid>406212bb-45f7-4af7-91b6-0edfb6e5908c</uuid>
-  <forward dev='eth0' mode='nat'>
-    <interface dev='eth0'/>
-  </forward>
-  <bridge name='virbr1' stp='on' delay='0'/>
-  <mac address='52:54:00:e7:ee:1e'/>
-  <ip address='172.16.1.1' netmask='255.255.255.0'>
-  </ip>
-</network>

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana'
=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-colo'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/01demo-prep.sh'
=== target was u'../havana/01demo-prep.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/02deploy.sh'
=== target was u'../havana/02deploy.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/03configure-cloud.sh'
=== target was u'../havana/03configure-cloud.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/04cleanup.sh'
=== target was u'../havana/04cleanup.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-colo/README'
=== target was u'../havana/README'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml'
--- usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana-colo/bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-# vim :set ts=2 et:
-openstack:
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-havana
-    source: cloud:precise-updates/havana
-  services:
-    ubuntu: 
-      charm: cs:precise/ubuntu
-      constraints: tags=nuc
-    landscape-client:
-      charm: cs:precise/landscape-client
-      options:
-        origin: ppa:landscape/trunk
-        exchange-interval: 60
-        urgent-exchange-interval: 30
-        ping-interval: 10
-        script-users: ALL
-        include-manager-plugins: ScriptExecution
-    lds:
-      branch: lp:charms/lds-quickstart
-      options:
-        server_fqdn: lds.master
-        admin_email: [e-mail]
-        admin_name: admin
-        admin_password: Password1+
-        license: include-file://license.txt
-        sample_data: False
-      constraints: tags=lds
-    mysql:
-      charm: cs:precise/mysql-29
-      options:
-        dataset-size: 50%
-      to: lxc:ubuntu=0
-    rabbitmq-server:
-      charm: cs:precise/rabbitmq-server-16
-      constraints: mem=1G
-      to: lxc:ubuntu=0
-    ceph:
-      charm: cs:precise/ceph
-      num_units: 6
-      options:
-        monitor-count: 3
-        fsid: 9e7aac42-4bf4-11e3-b4b7-5254006a039c
-        monitor-secret: AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
-        osd-devices: /srv
-        osd-reformat: "yes"
-      to: [nova-compute=0, nova-compute=1, nova-compute=2, nova-compute=3, nova-compute=4, nova-compute=5]
-    keystone:
-      charm: cs:precise/keystone-23
-      options:
-        admin-password: Password1+
-        admin-token: ubuntutesting
-      to: lxc:ubuntu=0
-    openstack-dashboard:
-      charm: cs:precise/openstack-dashboard-11
-      options:
-        offline-compression: "no"
-        webroot: "/"
-      to: lxc:ubuntu=0
-    nova-compute:
-      charm: cs:precise/nova-compute
-      num_units: 8
-      options:
-        config-flags: "auto_assign_floating_ip=False"
-        enable-live-migration: False
-        virt-type: kvm
-      constraints: tags=nuc
-    nova-cloud-controller:
-      charm: cs:precise/nova-cloud-controller-19
-      options:
-        network-manager: Neutron
-        quantum-security-groups: "yes"
-      to: lxc:ubuntu=0
-    neutron-gateway:
-      charm: cs:precise/quantum-gateway-12
-      options:
-        ext-port: eth0
-      constraints: tags=neutron
-    cinder:
-      charm: cs:precise/cinder-14
-      options:
-        block-device: "None"
-      to: lxc:ubuntu=0
-    glance:
-      charm: cs:precise/glance-26
-      to: lxc:ubuntu=0
-    swift-proxy:
-      charm: cs:precise/swift-proxy
-      options:
-        zone-assignment: manual
-        replicas: 2
-        use-https: 'no'
-        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      to: lxc:ubuntu=0
-    swift-storage-z1:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 1
-        block-device: "/srv/swift.img|30G"
-      to: nova-compute=6
-    swift-storage-z2:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 2
-        block-device: "/srv/swift.img|30G"
-      to: nova-compute=7
-    ceilometer:
-      charm: cs:precise/ceilometer
-      to: lxc:ubuntu=0
-    ceilometer-agent:
-      charm: cs:precise/ceilometer-agent
-    mongodb:
-      charm: cs:precise/mongodb
-      to: lxc:ubuntu=0
-    ntp:
-      charm: cs:precise/ntp
-  relations:
-    - - keystone
-      - mysql
-    - - nova-cloud-controller
-      - mysql
-    - - nova-cloud-controller
-      - rabbitmq-server
-    - - nova-cloud-controller
-      - glance
-    - - nova-cloud-controller
-      - keystone
-    - - nova-compute
-      - nova-cloud-controller
-    - - nova-compute
-      - mysql
-    - - nova-compute
-      - rabbitmq-server:amqp
-    - - nova-compute
-      - glance
-    - - nova-compute
-      - ceph
-    - - glance
-      - mysql
-    - - glance
-      - keystone
-    - - glance
-      - ceph
-    - - glance
-      - cinder
-    - - cinder
-      - mysql
-    - - cinder
-      - rabbitmq-server
-    - - cinder
-      - nova-cloud-controller
-    - - cinder
-      - keystone
-    - - cinder
-      - ceph
-    - - neutron-gateway
-      - mysql
-    - - neutron-gateway
-      - rabbitmq-server
-    - - neutron-gateway
-      - nova-cloud-controller
-    - - openstack-dashboard
-      - keystone
-    - - swift-proxy
-      - keystone
-    - - swift-proxy
-      - swift-storage-z1
-    - - swift-proxy
-      - swift-storage-z2
-    - - ceilometer
-      - keystone
-    - - ceilometer
-      - rabbitmq-server
-    - - ceilometer
-      - mongodb
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - nova-cloud-controller:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ntp:juju-info
-      - ceph:juju-info
-    - - ntp:juju-info
-      - cinder:juju-info
-    - - ntp:juju-info
-      - keystone:juju-info
-    - - ntp:juju-info
-      - glance:juju-info
-    - - ntp:juju-info
-      - swift-proxy:juju-info
-    - - ntp:juju-info
-      - swift-storage-z1:juju-info
-    - - ntp:juju-info
-      - swift-storage-z2:juju-info
-    - - ntp:juju-info
-      - ceilometer:juju-info
-    - - ntp:juju-info
-      - mongodb:juju-info
-    - - ntp:juju-info
-      - rabbitmq-server:juju-info
-    - - ntp:juju-info
-      - mysql:juju-info
-    - - ntp:juju-info
-      - openstack-dashboard:juju-info
-    - - landscape-client:container
-      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, swift-proxy ]
-    - - landscape-client:registration
-      - lds

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-compute'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/01demo-prep.sh'
=== target was u'../havana/01demo-prep.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/02deploy.sh'
=== target was u'../havana/02deploy.sh'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh'
--- usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana-compute/03configure-cloud.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "Configuring Openstack environment"
-cd ../openstack-configuration/
-
-[ -f ~/images/precise-server-cloudimg-amd64-disk1.img ] || ./get-cloud-images
-
-./inspect-environment
-source envrc
-
-./prepare-cloud havana
-
-echo "Skipping Juju config as no Object Storage available for Juju"
-

=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/04cleanup.sh'
=== target was u'../havana/04cleanup.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-compute/README'
=== target was u'../havana/README'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml'
--- usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana-compute/bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,164 +0,0 @@
-# vim :set ts=2 et:
-openstack:
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-havana
-    source: cloud:precise-updates/havana
-  services:
-    ubuntu: 
-      charm: cs:precise/ubuntu
-      constraints: tags=nuc
-    landscape-client:
-      charm: cs:precise/landscape-client
-      options:
-        origin: ppa:landscape/trunk
-        exchange-interval: 60
-        urgent-exchange-interval: 30
-        ping-interval: 10
-        script-users: ALL
-        include-manager-plugins: ScriptExecution
-    lds:
-      branch: lp:charms/lds-quickstart
-      options:
-        server_fqdn: lds.master
-        admin_email: [e-mail]
-        admin_name: admin
-        admin_password: Password1+
-        license: include-file://license.txt
-        sample_data: False
-      constraints: tags=lds
-    mysql:
-      charm: cs:precise/mysql-29
-      options:
-        dataset-size: 50%
-      to: lxc:ubuntu=0
-    rabbitmq-server:
-      charm: cs:precise/rabbitmq-server-16
-      constraints: mem=1G
-      to: lxc:ubuntu=0
-    keystone:
-      charm: cs:precise/keystone-23
-      options:
-        admin-password: Password1+
-        admin-token: ubuntutesting
-      to: lxc:ubuntu=0
-    openstack-dashboard:
-      charm: cs:precise/openstack-dashboard-11
-      options:
-        offline-compression: "no"
-        webroot: "/"
-      to: lxc:ubuntu=0
-    nova-compute:
-      charm: cs:precise/nova-compute
-      num_units: 7
-      options:
-        config-flags: "auto_assign_floating_ip=False"
-        enable-live-migration: False
-        virt-type: kvm
-      constraints: tags=nuc
-    nova-cloud-controller:
-      charm: cs:precise/nova-cloud-controller-19
-      options:
-        network-manager: Neutron
-        quantum-security-groups: "yes"
-      to: lxc:ubuntu=0
-    neutron-gateway:
-      charm: cs:precise/quantum-gateway-12
-      options:
-        ext-port: eth0
-      constraints: tags=neutron
-    cinder:
-      charm: cs:precise/cinder-14
-      options:
-        block-device: "/srv/cinder.img|40G"
-      constraints: tags=nuc
-    glance:
-      charm: cs:precise/glance-26
-      to: lxc:ubuntu=0
-    ceilometer:
-      charm: cs:precise/ceilometer
-      to: lxc:ubuntu=0
-    ceilometer-agent:
-      charm: cs:precise/ceilometer-agent
-    mongodb:
-      charm: cs:precise/mongodb
-      to: lxc:ubuntu=0
-    ntp:
-      charm: cs:precise/ntp
-  relations:
-    - - keystone
-      - mysql
-    - - nova-cloud-controller
-      - mysql
-    - - nova-cloud-controller
-      - rabbitmq-server
-    - - nova-cloud-controller
-      - glance
-    - - nova-cloud-controller
-      - keystone
-    - - nova-compute
-      - nova-cloud-controller
-    - - nova-compute
-      - mysql
-    - - nova-compute
-      - rabbitmq-server:amqp
-    - - nova-compute
-      - glance
-    - - glance
-      - mysql
-    - - glance
-      - keystone
-    - - glance
-      - cinder
-    - - cinder
-      - mysql
-    - - cinder
-      - rabbitmq-server
-    - - cinder
-      - nova-cloud-controller
-    - - cinder
-      - keystone
-    - - neutron-gateway
-      - mysql
-    - - neutron-gateway
-      - rabbitmq-server
-    - - neutron-gateway
-      - nova-cloud-controller
-    - - openstack-dashboard
-      - keystone
-    - - ceilometer
-      - keystone
-    - - ceilometer
-      - rabbitmq-server
-    - - ceilometer
-      - mongodb
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - nova-cloud-controller:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ntp:juju-info
-      - cinder:juju-info
-    - - ntp:juju-info
-      - keystone:juju-info
-    - - ntp:juju-info
-      - glance:juju-info
-    - - ntp:juju-info
-      - ceilometer:juju-info
-    - - ntp:juju-info
-      - mongodb:juju-info
-    - - ntp:juju-info
-      - rabbitmq-server:juju-info
-    - - ntp:juju-info
-      - mysql:juju-info
-    - - ntp:juju-info
-      - openstack-dashboard:juju-info
-    - - landscape-client:container
-      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute ]
-    - - landscape-client:registration
-      - lds

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/havana-swift'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/01demo-prep.sh'
=== target was u'../havana/01demo-prep.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/02deploy.sh'
=== target was u'../havana/02deploy.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/03configure-cloud.sh'
=== target was u'../havana/03configure-cloud.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/04cleanup.sh'
=== target was u'../havana/04cleanup.sh'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/havana-swift/README'
=== target was u'../havana/README'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml'
--- usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana-swift/bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-# vim :set ts=2 et:
-openstack:
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-havana
-    source: cloud:precise-updates/havana
-  services:
-    ubuntu: 
-      charm: cs:precise/ubuntu
-      constraints: tags=nuc
-    landscape-client:
-      charm: cs:precise/landscape-client
-      options:
-        origin: ppa:landscape/trunk
-        exchange-interval: 60
-        urgent-exchange-interval: 30
-        ping-interval: 10
-        script-users: ALL
-        include-manager-plugins: ScriptExecution
-    lds:
-      branch: lp:charms/lds-quickstart
-      options:
-        server_fqdn: lds.master
-        admin_email: [e-mail]
-        admin_name: admin
-        admin_password: Password1+
-        license: include-file://license.txt
-        sample_data: False
-      constraints: tags=lds
-    mysql:
-      charm: cs:precise/mysql-29
-      options:
-        dataset-size: 50%
-      to: lxc:ubuntu=0
-    rabbitmq-server:
-      charm: cs:precise/rabbitmq-server-16
-      constraints: mem=1G
-      to: lxc:ubuntu=0
-    keystone:
-      charm: cs:precise/keystone-23
-      options:
-        admin-password: Password1+
-        admin-token: ubuntutesting
-      to: lxc:ubuntu=0
-    openstack-dashboard:
-      charm: cs:precise/openstack-dashboard-11
-      options:
-        offline-compression: "no"
-        webroot: "/"
-      to: lxc:ubuntu=0
-    nova-compute:
-      charm: cs:precise/nova-compute
-      num_units: 5
-      options:
-        config-flags: "auto_assign_floating_ip=False"
-        enable-live-migration: False
-        virt-type: kvm
-      constraints: tags=nuc
-    nova-cloud-controller:
-      charm: cs:precise/nova-cloud-controller-19
-      options:
-        network-manager: Neutron
-        quantum-security-groups: "yes"
-      to: lxc:ubuntu=0
-    neutron-gateway:
-      charm: cs:precise/quantum-gateway-12
-      options:
-        ext-port: eth0
-      constraints: tags=neutron
-    cinder:
-      charm: cs:precise/cinder-14
-      options:
-        block-device: "/srv/cinder.img|40G"
-      constraints: tags=nuc
-    glance:
-      charm: cs:precise/glance-26
-      to: lxc:ubuntu=0
-    swift-proxy:
-      charm: cs:precise/swift-proxy
-      options:
-        zone-assignment: manual
-        replicas: 2
-        use-https: 'no'
-        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      to: lxc:ubuntu=0
-    swift-storage-z1:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 1
-        block-device: "/srv/swift.img|40G"
-      constraints: tags=nuc
-    swift-storage-z2:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 2
-        block-device: "/srv/swift.img|40G"
-      constraints: tags=nuc
-    ceilometer:
-      charm: cs:precise/ceilometer
-      to: lxc:ubuntu=0
-    ceilometer-agent:
-      charm: cs:precise/ceilometer-agent
-    mongodb:
-      charm: cs:precise/mongodb
-      to: lxc:ubuntu=0
-    ntp:
-      charm: cs:precise/ntp
-  relations:
-    - - keystone
-      - mysql
-    - - nova-cloud-controller
-      - mysql
-    - - nova-cloud-controller
-      - rabbitmq-server
-    - - nova-cloud-controller
-      - glance
-    - - nova-cloud-controller
-      - keystone
-    - - nova-compute
-      - nova-cloud-controller
-    - - nova-compute
-      - mysql
-    - - nova-compute
-      - rabbitmq-server:amqp
-    - - nova-compute
-      - glance
-    - - glance
-      - mysql
-    - - glance
-      - keystone
-    - - glance
-      - cinder
-    - - cinder
-      - mysql
-    - - cinder
-      - rabbitmq-server
-    - - cinder
-      - nova-cloud-controller
-    - - cinder
-      - keystone
-    - - neutron-gateway
-      - mysql
-    - - neutron-gateway
-      - rabbitmq-server
-    - - neutron-gateway
-      - nova-cloud-controller
-    - - openstack-dashboard
-      - keystone
-    - - swift-proxy
-      - keystone
-    - - swift-proxy
-      - swift-storage-z1
-    - - swift-proxy
-      - swift-storage-z2
-    - - ceilometer
-      - keystone
-    - - ceilometer
-      - rabbitmq-server
-    - - ceilometer
-      - mongodb
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - nova-cloud-controller:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ntp:juju-info
-      - cinder:juju-info
-    - - ntp:juju-info
-      - keystone:juju-info
-    - - ntp:juju-info
-      - glance:juju-info
-    - - ntp:juju-info
-      - swift-proxy:juju-info
-    - - ntp:juju-info
-      - swift-storage-z1:juju-info
-    - - ntp:juju-info
-      - swift-storage-z2:juju-info
-    - - ntp:juju-info
-      - ceilometer:juju-info
-    - - ntp:juju-info
-      - mongodb:juju-info
-    - - ntp:juju-info
-      - rabbitmq-server:juju-info
-    - - ntp:juju-info
-      - mysql:juju-info
-    - - ntp:juju-info
-      - openstack-dashboard:juju-info
-    - - landscape-client:container
-      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, swift-proxy, swift-storage-z1, swift-storage-z2 ]
-    - - landscape-client:registration
-      - lds

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh'
--- usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/01demo-prep.sh	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#Canonical Micro-Cluster Demo Preparation
-echo "checking for existing Juju environment..."
-juju status && echo "Existing deployment found, exiting." && exit
-
-echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
-juju bootstrap --upload-tools=true --constraints "tags=juju"
-
-echo "unset constraints"
-juju set-constraints tags=""
-echo "Deploying Juju-gui to bootstrap node"
-juju deploy --to 0 juju-gui
-

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh'
--- usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/02deploy.sh	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -ex
-if [ ! -d ~/landscape ]; then
-	bzr launchpad-login || ( echo "Please set your Launchpad login: bzr launchpad-login LAUNCHPAD_ID and re-run." && false )
-	bzr branch lp:landscape ~/landscape
-fi
-
-if [ ! -f ~/license.txt ]; then
-	(echo "Need to create license.txt" && false)
-else
-	cp ~/license.txt ./license.txt
-fi
-
-if [ ! -d precise/lds ]; then
-  mkdir -p precise
-  cp -r ~/landscape/dev/charms/precise/lds-quickstart precise/lds
-  (
-    cd precise/lds
-    bzr init
-    bzr add
-    bzr commit -m "Fake lds charm"
-  )
-fi
-
-juju-deployer -c bundle.yaml -d
-
-# NOTE: add relation not encompassed in bundle
-juju add-relation landscape-client:container juju-gui
-
-echo "Deployment finished"

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh'
--- usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/03configure-cloud.sh	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-echo "Configuring Openstack environment"
-cd ../openstack-configuration/
-
-[ -f ~/images/precise-server-cloudimg-amd64-disk1.img ] || ./get-cloud-images
-
-./inspect-environment
-source envrc
-
-./prepare-cloud havana
-
-echo "Configuring Juju environment"
-cd ../juju-config/
-./generate-jujuenv
-
-

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh'
--- usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/04cleanup.sh	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-juju destroy-environment maas
-
-#Need to remove the Juju environments
-rm -rf ~/.juju/
-
-#Removing known hosts as all keys will be regenerated when re-deploying.
-rm ~/.ssh/known_hosts
-
-#Now re-create MAAS Juju environment.
-mkdir ~/.juju
-
-maas_oauth=$(maas-cli list | awk '{ print $3 }')
-
-cat > ~/.juju/environments.yaml <<EOF
-environments:
-    maas:
-        type: maas
-        admin-secret: Password1+
-
-        # maas-server specifies the location of the MAAS server. It must
-        # specify the base path.
-        maas-server: 'http://10.14.4.1/MAAS/'
-        
-        # maas-oauth holds the OAuth credentials from MAAS.
-        maas-oauth: '$maas_oauth'
-EOF
-
-

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/README'
--- usr/lib/orange-box/examples/openstack/complex/havana/README	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/README	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-This demo bundle deploys Openstack Havana with Ceph and Swift and Ceilometer with LDS
-
-01pre-deploy.sh - deploys Juju bootstrap and the Juju GUI
-02deploy.sh - deploys the Openstack Bundle
-03configure-cloud.sh - sets up networks and uploads an image and configures the Juju environment for Openstack as the default.
-04cleanup.sh - destroys the MAAS Juju environment

=== removed file 'usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml'
--- usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/havana/bundle.yaml	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-# vim :set ts=2 et:
-openstack:
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-havana
-    source: cloud:precise-updates/havana
-  services:
-    ubuntu: 
-      charm: cs:precise/ubuntu
-      constraints: tags=nuc
-    landscape-client:
-      charm: cs:precise/landscape-client
-      options:
-        origin: ppa:landscape/trunk
-        exchange-interval: 60
-        urgent-exchange-interval: 30
-        ping-interval: 10
-        script-users: ALL
-        include-manager-plugins: ScriptExecution
-    lds:
-      branch: lp:charms/lds-quickstart
-      options:
-        server_fqdn: lds.master
-        admin_email: [e-mail]
-        admin_name: admin
-        admin_password: Password1+
-        license: include-file://license.txt
-        sample_data: False
-      constraints: tags=lds
-    mysql:
-      charm: cs:precise/mysql-29
-      options:
-        dataset-size: 50%
-      to: lxc:ubuntu=0
-    rabbitmq-server:
-      charm: cs:precise/rabbitmq-server-16
-      constraints: mem=1G
-      to: lxc:ubuntu=0
-    ceph:
-      charm: cs:precise/ceph
-      num_units: 3
-      options:
-        monitor-count: 3
-        fsid: 9e7aac42-4bf4-11e3-b4b7-5254006a039c
-        monitor-secret: AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
-        osd-devices: /srv
-        osd-reformat: "yes"
-      constraints: tags=nuc
-    keystone:
-      charm: cs:precise/keystone-23
-      options:
-        admin-password: Password1+
-        admin-token: ubuntutesting
-      to: lxc:ubuntu=0
-    openstack-dashboard:
-      charm: cs:precise/openstack-dashboard-11
-      options:
-        offline-compression: "no"
-        webroot: "/"
-      to: lxc:ubuntu=0
-    nova-compute:
-      charm: cs:precise/nova-compute
-      num_units: 3
-      options:
-        config-flags: "auto_assign_floating_ip=False"
-        enable-live-migration: False
-        virt-type: kvm
-      constraints: tags=nuc
-    nova-cloud-controller:
-      charm: cs:precise/nova-cloud-controller-19
-      options:
-        network-manager: Neutron
-        quantum-security-groups: "yes"
-      to: lxc:ubuntu=0
-    neutron-gateway:
-      charm: cs:precise/quantum-gateway-12
-      options:
-        ext-port: eth0
-      constraints: tags=neutron
-    cinder:
-      charm: cs:precise/cinder-14
-      options:
-        block-device: "None"
-      to: lxc:ubuntu=0
-    glance:
-      charm: cs:precise/glance-26
-      to: lxc:ubuntu=0
-    swift-proxy:
-      charm: cs:precise/swift-proxy
-      options:
-        zone-assignment: manual
-        replicas: 2
-        use-https: 'no'
-        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      to: lxc:ubuntu=0
-    swift-storage-z1:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 1
-        block-device: "/srv/swift.img|40G"
-      constraints: tags=nuc
-    swift-storage-z2:
-      charm: cs:precise/swift-storage
-      options:
-        zone: 2
-        block-device: "/srv/swift.img|40G"
-      constraints: tags=nuc
-    ceilometer:
-      charm: cs:precise/ceilometer
-      to: lxc:ubuntu=0
-    ceilometer-agent:
-      charm: cs:precise/ceilometer-agent
-    mongodb:
-      charm: cs:precise/mongodb
-      to: lxc:ubuntu=0
-    ntp:
-      charm: cs:precise/ntp
-  relations:
-    - - keystone
-      - mysql
-    - - nova-cloud-controller
-      - mysql
-    - - nova-cloud-controller
-      - rabbitmq-server
-    - - nova-cloud-controller
-      - glance
-    - - nova-cloud-controller
-      - keystone
-    - - nova-compute
-      - nova-cloud-controller
-    - - nova-compute
-      - mysql
-    - - nova-compute
-      - rabbitmq-server:amqp
-    - - nova-compute
-      - glance
-    - - nova-compute
-      - ceph
-    - - glance
-      - mysql
-    - - glance
-      - keystone
-    - - glance
-      - ceph
-    - - glance
-      - cinder
-    - - cinder
-      - mysql
-    - - cinder
-      - rabbitmq-server
-    - - cinder
-      - nova-cloud-controller
-    - - cinder
-      - keystone
-    - - cinder
-      - ceph
-    - - neutron-gateway
-      - mysql
-    - - neutron-gateway
-      - rabbitmq-server
-    - - neutron-gateway
-      - nova-cloud-controller
-    - - openstack-dashboard
-      - keystone
-    - - swift-proxy
-      - keystone
-    - - swift-proxy
-      - swift-storage-z1
-    - - swift-proxy
-      - swift-storage-z2
-    - - ceilometer
-      - keystone
-    - - ceilometer
-      - rabbitmq-server
-    - - ceilometer
-      - mongodb
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - nova-cloud-controller:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ntp:juju-info
-      - ceph:juju-info
-    - - ntp:juju-info
-      - cinder:juju-info
-    - - ntp:juju-info
-      - keystone:juju-info
-    - - ntp:juju-info
-      - glance:juju-info
-    - - ntp:juju-info
-      - swift-proxy:juju-info
-    - - ntp:juju-info
-      - swift-storage-z1:juju-info
-    - - ntp:juju-info
-      - swift-storage-z2:juju-info
-    - - ntp:juju-info
-      - ceilometer:juju-info
-    - - ntp:juju-info
-      - mongodb:juju-info
-    - - ntp:juju-info
-      - rabbitmq-server:juju-info
-    - - ntp:juju-info
-      - mysql:juju-info
-    - - ntp:juju-info
-      - openstack-dashboard:juju-info
-    - - landscape-client:container
-      - [ lds, neutron-gateway, ubuntu, mysql, cinder, keystone, rabbitmq-server, glance, openstack-dashboard, nova-cloud-controller, ceilometer, mongodb, nova-compute, ceph, swift-proxy, swift-storage-z1, swift-storage-z2 ]
-    - - landscape-client:registration
-      - lds

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/juju-config'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml'
--- usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/juju-config/environments.yaml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-default: openstack
-environments:
-  openstack:
-    type: openstack
-    control-bucket: __UUID__
-    admin-secret: Password1+
-    auth-url: __AUTH_URL__
-    region: RegionOne
-    image-metadata-url: http://10.14.4.1/images/
-    username: admin
-    password: Password1+
-    tenant-name: admin
-    use-floating-ip: true

=== removed file 'usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv'
--- usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/juju-config/generate-jujuenv	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -e
-
-grep openstack ~/.juju/environments.yaml &&  echo "Openstack already configured in ~/.juju/environments.yaml" && exit 
-
-source ../openstack-configuration/envrc
-
-#Backup environments.yaml
-cp ~/.juju/environments.yaml ~/.juju/environments.yaml.bak
-
-sed -e "s/__UUID__/$(uuid)/g" -e "s!__AUTH_URL__!http://$KEYSTONE_HOST:5000/v2.0/!g"  environments.yaml >> ~/.juju/environments.yaml
-
-echo "Default Juju environment is now: openstack"
-
-echo "Generating Juju meta-data"
-juju-metadata generate-image -a amd64 -u ${OS_AUTH_URL?} -i $IMAGE_UUID -r $OS_REGION_NAME -s precise 
-
-echo "Copying data to web server"
-sudo cp -r images /var/www/html/
-sudo chmod -R go+r /var/www/html/images
-
-echo "Validating Juju Image Metadata"
-juju-metadata validate-images
-
-echo "Remove m1.tiny as it is too small for an Ubuntu Cloud Image and Juju defaults to the smallest flavor"
-nova flavor-list | grep m1.tiny && nova flavor-delete m1.tiny
-
-echo "Fixup DNS nameservers to point to 172.16.1.1 for Neutron subnets"
-#Get subnet IDs
-neutron subnet-update admin_net_subnet --dns_nameservers list=true 172.16.1.1
-neutron subnet-update ext_net_subnet --dns_nameservers list=true 172.16.1.1
-
-echo "Ready to bootstrap Juju"
-echo "juju bootstrap --upload-tools=true"
-
-

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/README	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-OpenStack Cloud Setup and Test
-------------------------------
-
-1) Inspect the deployed cloud
-
-./inspect-environment
-source envrc
-
-2) Prepare the cloud
-
-./prepare-cloud havana
-source envrc
-
-3) Verify the cloud
-
-./verify-cloud
-
-NOTES:
-
-verify-cloud currently clones devstack from github.
-

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure-tests	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-base=$(dirname $0)
-rm -rf etc
-cp -r ${base}/etc_master etc
-${base}/configure_tests.py --configure etc

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/configure_tests.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-
-import optparse
-import logging
-import os
-import sys
-import string
-import subprocess
-import re
-
-
-def list_configs(conf_dir):
-    confs = []
-    for f in os.listdir(conf_dir):
-        if os.path.isdir(os.path.join(conf_dir, f)):
-            confs += list_configs(os.path.join(conf_dir, f))
-        if f.endswith('.conf'):
-            confs.append(os.path.join(conf_dir, f))
-    return confs
-
-def update_test_configs(conf_dir):
-    if not os.path.exists(conf_dir):
-        die('Config directory does not exist at %s' % conf_dir)
-    vars_file = os.path.join(conf_dir, 'all_variables')
-    if not os.path.isfile(vars_file):
-        die('Could not load all_variables from %s' % vars_file)
-
-    env_vars = []
-    for l in open(vars_file, 'r').readlines():
-        if not l.startswith('#') and l.strip() != '':
-            env_vars.append(l.strip())
-
-    config_files = list_configs(conf_dir)
-
-    for var in env_vars:
-        if var in os.environ:
-            val = os.environ[var]
-            for f in config_files:
-                sep = ","
-                if re.search(",", val):
-                    sep = "/"
-                cmd = 'sed -i s%(sep)s%%%(var)s%%%(sep)s%(val)s%(sep)sg %(f)s' % locals()
-                subprocess.check_output(cmd.split(' '))
-        else:
-            print "[WARN] Not setting %s in config, could not find in environment."\
-                % var
-    print "Configured tests in %s" % conf_dir
-
-parser = optparse.OptionParser()
-parser.add_option('-C', '--configure', dest='configure', action='store_true',
-                  default=False,
-                  help='Configure all test configs based on enviornment.')
-(options, args) = parser.parse_args()
-
-if options.configure:
-    if len(args) == 0:
-        die('Must pass a directory as argument to --configure')
-
-    conf_dir=args.pop()
-    update_test_configs(conf_dir)

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/__init__.py'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/config.py	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-import ConfigParser
-import os
-import subprocess
-import logging
-import jinja2
-
-from test_utils.config import CloudConfig
-
-cloud_config = CloudConfig()
-
-DEFAULT_CONFIG='etc/devstack.conf'
-DEFAULT_WORK_DIR=os.path.join(os.environ['HOME'], 'devstack-test')
-
-class DevstackConfig(object):
-    def __init__(self, conf=DEFAULT_CONFIG, work_dir=DEFAULT_WORK_DIR):
-        self.config = ConfigParser.SafeConfigParser()
-        self.config.read(conf)
-
-        self.work_dir = work_dir
-        if not os.path.exists(self.work_dir):
-            os.makedirs(self.work_dir)
-
-        self.devstack_dir = os.path.join(self.work_dir, 'devstack')
-        self.git_repo = self.config.get('DEFAULT', 'devstack_repo')
-
-        templ_dir = self.config.get('DEFAULT', 'templates')
-        templ_dir = os.path.join(os.getcwd(), templ_dir)
-        if not os.path.exists(templ_dir):
-            logging.error('Could not locate devstack template directory @ %s'\
-                        % templ_dir)
-            raise
-        loader = jinja2.FileSystemLoader(templ_dir)
-        self.templates = jinja2.Environment(loader = loader)
-        self.git_branch = self.config.get('DEFAULT', 'devstack_branch')
-
-    def get(self, item, section='DEFAULT'):
-        return self.config.get(section, item)
-
-    def prepare_devstack(self):
-        self._clone_devstack(directory=self.devstack_dir)
-        self._write_openrc(branch=self.git_branch, directory=self.devstack_dir)
-        self._write_exerciserc()
-
-    def _clone_devstack(self, directory=None, branch=None):
-        if not directory:
-            directory = self.devstack_dir
-        if not branch:
-            branch = self.git_branch
-        cmd = [ 'git', 'clone', self.git_repo, directory ]
-        subprocess.check_output(cmd)
-
-        if branch != 'master':
-            os.chdir(directory)
-            cmd = [ 'git', 'checkout', branch ]
-            subprocess.check_output(cmd)
-
-    def _write_openrc(self, branch='master', directory=None):
-        ''' Write openrc template to specified directory.
-            branch is definied in config.
-            branch names are expected to be in git format.
-            _'s will be substited for /'s in template name,
-            ie, branch='stable/essex' -> $directory/openrc.stable_essex
-        '''
-        if not directory:
-            directory = self.devstack_dir
-        git_branch = ""
-        for i in branch:
-            if i == '/':
-                git_branch += '_'
-            else:
-                git_branch += i
-
-        openrc = os.path.join(directory, 'openrc')
-        templ = self.templates.get_template('openrc.%s' % git_branch)
-        context = { 'nova_host': cloud_config.get('DEFAULT', 'nova_host'),
-                    'glance_host': cloud_config.get('DEFAULT', 'glance_host'),
-                    'keystone_host': cloud_config.get('DEFAULT', 'keystone_host'),
-                    'service_host': cloud_config.get('DEFAULT', 'service_host'),
-                    'os_username': cloud_config.get('osapi', 'username'),
-                    'os_password': cloud_config.get('osapi', 'password'),
-                    'os_tenant_name': cloud_config.get('osapi', 'tenant_name'),
-                    'secondary_ip_pool': self.get('secondary_ip_pool'),
-                    'enabled_services': self.get('enabled_services')
-                  }
-        f = open(openrc, 'w')
-        f.write(templ.render(context))
-        f.close()
-
-    def _write_exerciserc(self, directory=None):
-        ''' Write out the exerciserc file based on whats in config.'''
-        if not directory:
-            directory = self.devstack_dir
-        exerciserc = os.path.join(directory, 'exerciserc')
-        templ = self.templates.get_template('exerciserc')
-        context = { 'active_timeout': self.get('active_timeout'),
-                    'associate_timeout': self.get('associate_timeout'),
-                    'boot_timeout': self.get('boot_timeout'),
-                    'running_timeout': self.get('running_timeout'),
-                    'terminate_timeout': self.get('terminate_timeout')
-        }
-        f = open(exerciserc, 'w')
-        f.write(templ.render(context))
-        f.close()

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_devstack_exercises.py	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-import unittest
-import shutil
-import os
-import nose
-import subprocess
-import sys
-import logging
-
-from test_utils.config import CloudConfig
-from config import DevstackConfig
-
-WORK_DIR='/tmp/devstack-test'
-
-cloud_config = CloudConfig()
-
-class DevstackExcercises(unittest.TestCase):
-    @classmethod
-    def setUpClass(self):
-        try:
-            self.artifacts_dir = cloud_config.get('tests', 'artifacts_dir')
-        except:
-            self.artifacts_dir = None
-        if self.artifacts_dir:
-            if os.path.isdir(self.artifacts_dir):
-                shutil.rmtree(self.artifacts_dir)
-            os.mkdir(self.artifacts_dir)
-        if os.path.exists(WORK_DIR):
-            logging.debug("Removing existing work_dir @ %s" % WORK_DIR)
-            shutil.rmtree(WORK_DIR)
-        self.devstack  = DevstackConfig(work_dir=WORK_DIR)
-        self.devstack.prepare_devstack()
-
-
-    def _call_exercise(self, exercise):
-        os.chdir(self.devstack.devstack_dir)
-        exercise_script = './exercises/%s' % exercise
-
-        if not os.path.isfile(exercise_script):
-            # Skip exercise if it is not found (its probably hosted
-            #  in another branch of devstack)
-            raise nose.SkipTest('Skipping %s, exercise script not found in '\
-                                ' this branch.' % exercise_script)
-
-        try:
-            archive_logs = cloud_config.get('tests', 'archive_logs')
-        except:
-            archive_logs = False
-
-        if archive_logs in ['True', 'true']:
-            log = os.path.join(self.artifacts_dir, 'devstack_ex_%s.log' %\
-                               exercise)
-            log = open(log, 'wb')
-            t_stdout = t_stderr = log
-        else:
-            t_stdout = t_stderr = subprocess.PIPE
-
-        p = subprocess.Popen(exercise_script,
-                             stdout=t_stdout, stderr=t_stderr)
-        p.poll()
-        (stdout, stderr) = p.communicate()
-        if p.returncode == 0:
-            return True
-        elif p.returncode == 55:
-            # Exercises that return 55 do so because the target service is
-            # not enabled, via ENABLED_SERVICES.
-            raise nose.SkipTest('Service not enabled, skipping test.')
-        else:
-            logging.debug('--- Exercise %s failed with RC %s.'\
-                           % (exercise,  p.returncode))
-            logging.debug('Debug output:')
-            logging.debug(stdout)
-            logging.debug(stderr)
-            return False
-
-    def test_aggregates(self):
-        '''test_aggregates: Test host aggregates'''
-        self.assertTrue(self._call_exercise('aggregates.sh'))
-
-    def test_client_env(self):
-        '''test_client_env: Test OpenStack client enviroment variable handling'''
-        self.assertTrue(self._call_exercise('client-env.sh'))
-
-    def test_floating_ips(self):
-        '''test_floating_ips: Test instance spawn + IP association via OSAPI'''
-        self.assertTrue(self._call_exercise('floating_ips.sh'))
-
-    def test_volumes(self):
-        '''test_volumes: Test instance spawn + volume attachment via OSAPI'''
-        self.assertTrue(self._call_exercise('volumes.sh'))
-
-    def test_sec_groups(self):
-        '''test_sec_groups: Test security groups via the command line tools'''
-        self.assertTrue(self._call_exercise('sec_groups.sh'))
-
-    def test_horizon(self):
-        '''test_horizon: Ensure horizon displays a login page.'''
-        self.assertTrue(self._call_exercise('horizon.sh'))
-
-    def test_boot_from_volume(self):
-        '''test_boot_from_volume: Test instance spawn from cinder volume.'''
-        self.assertTrue(self._call_exercise('boot_from_volume.sh'))
-
-    def test_swift(self):
-        '''test_swift: Ensure swift object storage if functional.'''
-        self.assertTrue(self._call_exercise('swift.sh'))

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/__init__.py'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/cloud.py	1970-01-01 00:00:00 +0000
@@ -1,351 +0,0 @@
-
-import json
-import urlparse
-import uuid
-import sys
-import time
-import logging
-from copy import copy, deepcopy
-
-from openstack_ubuntu_testing.test_utils.config import CloudConfig
-
-from boto import exception, connect_ec2
-from boto.ec2.regioninfo import RegionInfo
-
-from novaclient.v1_1.client import Client as OSNovaClient
-from cinderclient.v1.client import Client as OSCinderClient
-
-INST_RUN_TIMEOUT = 120
-INST_TERMINATE_TIMEOUT=60
-VOL_CREATE_TIMEOUT = 30
-VOL_ATTACH_TIMEOUT = 30
-
-def _normalize_ec2(d):
-    '''convert all values of dict to a string'''
-    out = {}
-    for k, v in out.iteritems():
-        if 'object at' in str(v):
-            out.pop(k)
-        elif isinstance(v, dict):
-            out[k] = _normalize_ec2(v)
-        else:
-            out[k] = str(v)
-    return out
-
-
-def _normalize_osapi(d):
-    '''
-    'ensure everythign in dict is a string, and remove any object references.
-    '''
-    out = {}
-    # these are known to hold references to objects in memory, remove them.
-    black_list = ['manager']
-    for k, v in d.iteritems():
-        if k in black_list:
-            continue
-        out[k] = str(v)
-    return out
-
-
-
-_resources = {
-    'ec2': {
-        'instances': [],
-        'floating_ips': [],
-        'key_pairs': [],
-        'volumes': [],
-    },
-    'osapi': {
-        'instances': [],
-        'floating_ips': [],
-        'key_pairs': [],
-        'volumes': [],
-    }
-}
-
-class EC2CloudClient(object):
-    def __init__(self, access_key, secret_key, endpoint):
-        url = urlparse.urlparse(endpoint)
-        sec = False
-        if url.scheme == 'https':
-            sec = True
-        region = RegionInfo(name='nova', endpoint=url.hostname)
-        self.api = connect_ec2(access_key, secret_key, host=url.hostname,
-                          port=url.port, path=url.path, is_secure=sec,
-                          region=region)
-
-        # track IDs of created resources for tear-down.
-        self.instances = []
-        self.key_pairs = []
-        self.floating_ips =[]
-        self.volumes = []
-
-    def instance_ids(self):
-        ids = []
-        for reservation in self.api.get_all_instances():
-            [ids.append(i.id) for i in reservation.instances]
-        return ids
-
-    def instances_running(self, instance_ids=[]):
-        '''given a list of instance_ids, return list of only running instances'''
-        running = []
-        reservations = []
-        for id in instance_ids:
-            try:
-                reservations.append(self.api.get_all_instances(instance_ids=str(id)))
-            except exception.EC2ResponseError:
-                instance_ids.remove(id)
-
-        instances = []
-        for r in reservations:
-            if len(r) > 0 and r[0].instances:
-                instances.append(r[0].instances[0])
-
-        for instance in instances:
-            if instance.state == 'running':
-                running.append(instance.id)
-        return running
-
-
-    def get_images(self):
-        images = {}
-        [images.update({i.id: _normalize_ec2(vars(i))})
-         for i in self.api.get_all_images()]
-        return images
-
-
-    def get_key_pairs(self):
-        kps = {}
-        [kps.update({k.name: _normalize_ec2(vars(k))})
-         for k in self.api.get_all_key_pairs()]
-        return kps
-
-
-    def get_instances(self):
-        insts = {}
-        for reservation in self.api.get_all_instances():
-            [insts.update({i.id: _normalize_ec2(vars(i))})
-             for i in reservation.instances]
-        return insts
-
-
-    def get_floating_ips(self):
-        ips = {}
-        [ips.update({ip.public_ip:  _normalize_ec2(vars(ip))})
-         for ip in self.api.get_all_addresses()]
-        return ips
-
-
-    def get_volumes(self):
-        vols = {}
-        [vols.update({v.id: _normalize_ec2(vars(v))})
-         for v in self.api.get_all_volumes()]
-        return vols
-
-
-    def create_key_pair_and_instance(self):
-        '''
-        create a key_pair, launch an instance with it, wait for it
-        to start
-        '''
-        kp_name = 'upgrade_key_pair_%s' % uuid.uuid1()
-        kp = self.api.create_key_pair(key_name=kp_name)
-        self.key_pairs.append(kp_name)
-
-        imgs = self.api.get_all_images()
-        img_id = None
-        for img in imgs:
-            if img.id.startswith('ami-'):
-                img_id = img.id
-                break
-
-        res = self.api.run_instances(img_id, key_name=kp_name,
-                                     instance_type='m1.tiny')
-        time.sleep(1)
-        instance_id = res.instances[0].id
-        self.instances.append(instance_id)
-
-        timeout = 0
-
-        while instance_id not in self.instances_running([instance_id]):
-            time.sleep(1)
-            timeout += 1
-            if timeout >= INST_RUN_TIMEOUT:
-                logging.error('Timed out waiting for instance to run: %s' %\
-                               instance_id)
-                raise Exception
-        logging.info('Instance running: %s' % instance_id)
-
-
-    def create_and_associate_floating_ip(self):
-        instance_id = self.instance_ids().pop()
-        address = self.api.allocate_address()
-        self.floating_ips.append(address.public_ip)
-        self.api.associate_address(instance_id, public_ip=address.public_ip)
-
-
-    def create_and_attach_volume(self):
-        instance_id = self.instance_ids().pop()
-        volume = self.api.create_volume(size=1, zone='nova')
-        self.volumes.append(volume.id)
-        time.sleep(1)
-        timeout = 0
-        while timeout <= VOL_CREATE_TIMEOUT:
-            vol = self.api.get_all_volumes(volume_ids=[volume.id])
-            if vol and vol[0].status == 'available':
-                break
-            timeout += 1
-            time.sleep(1)
-        print 'created vol: %s' %volume.id
-
-        self.api.attach_volume(volume_id=volume.id, instance_id=instance_id,
-                               device='/dev/vdb')
-        timeout = 0
-        while timeout <= VOL_ATTACH_TIMEOUT:
-            vol = self.api.get_all_volumes(volume_ids=[volume.id])
-            if vol and vol[0].status == 'in-use':
-                break
-            timeout += 1
-            time.sleep(1)
-
-
-    def teardown(self):
-        self.api.terminate_instances(self.instances)
-        timeout = 0
-        while self.instances_running(self.instances):
-            if timeout >= INST_TERMINATE_TIMEOUT:
-                logging.error('Timeout waiting for instances terminate: %s' %\
-                              self.instances)
-                raise Exception
-            timeout += 1
-            time.sleep(1)
-        [self.api.delete_key_pair(k) for k in self.key_pairs]
-        [self.api.release_address(ip)
-         for ip in self.floating_ips]
-        [self.api.delete_volume(vol) for vol in self.volumes]
-
-
-class OSAPICloudClient(object):
-    def __init__(self, username, password, tenant_name, auth_url):
-        self.compute_api = OSNovaClient(username, password,
-                                        tenant_name, auth_url, no_cache=True)
-        self.volume_api = OSCinderClient(username, password,
-                                         tenant_name, auth_url)
-        # track IDs of created resources for tear-down.
-        self.instances = []
-        self.key_pairs = []
-        self.floating_ips =[]
-        self.volumes = []
-
-    def instance_ids(self):
-        return [inst.id for inst in self.compute_api.servers.list()]
-
-    def instances_running(self, instance_ids=[]):
-        '''given a list of instance_ids, return list of only running instances'''
-        running = []
-        for id in instance_ids:
-            if id in [i.id for i in self.compute_api.servers.list()]:
-                running.append(id)
-
-        for id in running:
-            inst = self.compute_api.servers.get(id)
-            if inst.status != 'ACTIVE':
-                running.remove(id)
-        return running
-
-    def get_images(self):
-        images = {}
-        [images.update({i.id: _normalize_osapi(vars(i))})
-         for i in self.compute_api.images.list()]
-        return images
-
-    def get_key_pairs(self):
-        kps  = {}
-        [kps.update({k.id: _normalize_osapi(vars(k))})
-         for k in self.compute_api.keypairs.list()]
-        return kps
-
-    def get_instances(self):
-        insts = {}
-        [insts.update({i.id: _normalize_osapi(vars(i))})
-         for i in self.compute_api.servers.list()]
-        return insts
-
-    def get_floating_ips(self):
-        ips = {}
-        [ips.update({i.id: _normalize_osapi(vars(i))})
-         for i in self.compute_api.floating_ips.list()]
-        return ips
-
-
-    def get_volumes(self):
-        vols = {}
-        [vols.update({v.id: _normalize_osapi(vars(v))})
-         for v in self.volume_api.volumes.list()]
-        return vols
-
-
-    def create_key_pair_and_instance(self):
-        kp_name = 'upgrade_key_pair_%s' % uuid.uuid1()
-        inst_name = 'upgrade_instance_%s' % uuid.uuid1()
-        image_id = self.get_images().keys().pop()
-        kp = self.compute_api.keypairs.create(name=kp_name)
-        instance = self.compute_api.servers.create(name=inst_name, flavor=1,
-                                                   image=image_id,
-                                                   key_name=kp_name)
-        timeout = 0
-        while self.compute_api.servers.get(instance.id).status != 'ACTIVE':
-            if timeout >= INST_RUN_TIMEOUT:
-                logging.error('Timed out waiting for instance to run: %s' %\
-                               instance.name)
-                raise Exception
-            timeout += 1
-            time.sleep(1)
-
-        self.instances.append(instance.id)
-        self.key_pairs.append(kp_name)
-
-
-    def create_and_associate_floating_ip(self):
-        instance = self.compute_api.servers.list().pop()
-        floating_ip = self.compute_api.floating_ips.create()
-        self.floating_ips.append(floating_ip.ip)
-        instance.add_floating_ip(floating_ip.ip)
-
-
-    def create_and_attach_volume(self):
-        instance = self.compute_api.servers.list().pop()
-        volume = self.volume_api.volumes.create(size=1)
-        self.volumes.append(volume.id)
-        # TODO volume attach requires cinder.
-
-
-    def teardown(self):
-        for instance in self.instances:
-            self.compute_api.servers.delete(instance)
-
-        timeout = 0
-        while self.instances_running(self.instances):
-            if timeout >= INST_TERMINATE_TIMEOUT:
-                logging.error('Timeout waiting for instances terminate: %s' %\
-                              self.instances)
-                raise Exception
-            timeout += 1
-            time.sleep(1)
-        [self.compute_api.keypairs.delete(kp)
-         for kp in self.key_pairs]
-        [self.volume_api.volumes.delete(v)
-         for v in self.volumes]
-
-
-def create_snapshot(client):
-    snapshot = {}
-    for collection in ['images', 'key_pairs', 'instances', 'floating_ips',
-                       'volumes']:
-        f = 'get_%s' % collection
-        if not hasattr(client, f):
-            logging.warning('CloudClient (%s) does not implement %s' %\
-                            (client, f))
-        f = getattr(client, f)
-        snapshot[collection] = f()
-    return snapshot

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/config.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-
-import ConfigParser
-
-DEFAULT_CONFIG = 'etc/openstack.conf'
-
-
-class CloudConfig(object):
-    def __init__(self, conf=None):
-        if not conf:
-            conf = DEFAULT_CONFIG
-        self.config = ConfigParser.SafeConfigParser()
-        self.config.read(conf)
-
-    def get(self, section=None, item=None):
-        if not section:
-            section = 'DEFAULT'
-        return self.config.get(section, item)
-
-    def enabled_services(self):
-        '''translate ENABLED_SERVICES to corresponding juju OS service names.
-        '''
-        service_map = {
-            'n-api': 'nova-cloud-controller',
-            'n-crt': 'nova-cloud-controller',
-            'n-obj': 'nova-cloud-controller',
-            'n-sch': 'nova-cloud-controller',
-            'g-api': 'glance',
-            'g-reg': 'glance',
-            'key': 'keystone',
-            'cinder': 'cinder',
-            'c-api': 'cinder',
-            'c-vol': 'cinder',
-            'horizon': 'openstack-dashboard',
-            'n-net': 'nova-compute',
-            'quantum': 'quantum'
-        }
-        env = self.get('DEFAULT', 'enabled_services').split(',')
-        enabled_services = []
-        for svc in env:
-            try:
-                service = service_map[svc]
-                if service not in enabled_services:
-                    enabled_services.append(service)
-            except KeyError:
-                pass
-        return enabled_services

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/__init__.py'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/client.py	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-# Some simple helpers to wrap the juju client, mostly borrowed
-# from Kapil's charmrunner: lp:~hazmat/+junk/charmrunner
-
-import json
-import subprocess
-import logging
-import time
-import yaml
-
-
-class JujuTestClientException(Exception):
-    pass
-
-
-def call(juju_cmd, environment=None):
-    cmd = ['juju']
-    if environment:
-        cmd += ['-e', environment]
-    cmd += juju_cmd
-    logging.debug('Calling: %s' % ' '.join(cmd))
-    print 'juju client: %s' % cmd
-    subprocess.check_output(cmd)
-
-
-def destroy_environment(sudo=False):
-    logging.debug('Destroying environment.')
-    cmd = ['juju', 'destroy-environment', '-y']
-    if sudo:
-        cmd = ['sudo'] + cmd
-    p = subprocess.Popen(cmd,
-                         stdout=subprocess.PIPE, stdin=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-    print p.communicate(input='y\n')[0]
-
-
-def status(environment=None, with_stderr=False, timeout=None):
-    """Get a status dictionary.
-    """
-    args = ["juju", "status", "--format=json"]
-
-    if timeout:
-        args = ['timeout', str(timeout)] + args
-
-    if environment:
-        args += ['-e', environment]
-
-    if with_stderr:
-        output = subprocess.check_output(args, stderr=subprocess.STDOUT)
-        return output
-    else:
-        output = subprocess.check_output(args, stderr=open("/dev/null"))
-        return json.loads(output)
-
-
-def is_bootstrapped(environment=None, timeout=None):
-    try:
-        _status = status(environment=environment, with_stderr=False,
-                         timeout=timeout)
-    except:
-        return False
-
-    try:
-        return _status['machines']['0']['agent-state'] == 'started'
-    except KeyError:
-        return False
-
-
-def deploy(repo_dir, charm, environment=None, service=None, config=None,
-           args=[]):
-    '''
-    Deploy a charm as a service.
-    '''
-    cmd = ["juju", "deploy",
-           "--repository", repo_dir]
-    if config:
-        cmd += ['--config=%s' % config]
-    if environment:
-        cmd += ['-e', environment]
-    [cmd.append(a) for a in args]
-    cmd += ["local:%s" % charm]
-    if service:
-        cmd += [service]
-    output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-    logging.info("Deployed %s" % (service or charm))
-    return output
-
-
-def get_config(service):
-    args = ['juju', 'get', service]
-    output = subprocess.check_output(args, stderr=open('/dev/null'))
-    return yaml.load(output)
-
-
-def services(environment=None):
-    '''yield (name, address, state) for every service deployed.  this assumes
-       a single machine unit per service'''
-    _status = status(environment)
-    for service, info in _status['services'].iteritems():
-        unit = info['units'].keys()[0]
-        m_id = str(info['units'][unit]['machine'])
-        try:
-            dns_name = _status['machines'][m_id]['dns-name']
-        except KeyError:
-            dns_name = None
-        state = info['units'][unit]['agent-state']
-        yield (service, dns_name, state)
-
-
-def get_machine_unit(service_name, environment=None):
-    for service, address, state in services(environment):
-        if service == service_name:
-            return address
-
-
-def instance_ids():
-    _status = status()
-    return [_status['machines'][n]['instance-id'] for n in _status['machines']]
-
-
-def ensure_bootstrap(environment=None, constraints=None, timeout=180,
-                     sudo=False):
-    '''
-    Bootstrap and wait for a started environment within timeout specified.
-    Bootstrapping may require sudo access (ie, local provider)
-    '''
-
-    if is_bootstrapped(environment, timeout=5):
-        logging.info('Environment Already bootstrapped.')
-        return True
-
-    cmd = ['juju', 'bootstrap']
-    if environment:
-        cmd += ['-e', environment]
-    if constraints:
-        cmd += ['--constraints', constraints]
-
-    if sudo:
-        cmd = ['sudo'] + cmd
-
-    logging.info('Boostrapping new environment')
-    try:
-        subprocess.check_output(cmd)
-    except:
-        logging.error('Calling "juju bootstrap" failed!')
-
-    i = 0
-    while not is_bootstrapped(environment, timeout=5):
-        if i >= timeout:
-            logging.error('Juju bootstrap timeout.')
-            raise JujuTestClientException
-        time.sleep(1)
-        i += 1
-
-    return True
-
-
-def wait_for_state(service, state, environment=None, timeout=180):
-    logging.debug('Waiting for service %s to reach state %s.' %
-                  (service, state))
-    i = 0
-    while True:
-        _status = status(environment)
-        if service not in _status['services']:
-            logging.error('wait_for_state: Could not find service ' + service)
-            raise JujuTestClientException
-        _st = list(set([_status['services'][service]['units'][u]['agent-state']
-                   for u in _status['services'][service]['units']]))
-        if 'error' in _st:
-            logging.error('Unit error while waiting for %s to reach state %.'
-                          % (service, state))
-            raise JujuTestClientException
-        if _st == [state]:
-            return True
-        if i >= timeout:
-            logging.error('Timeout waiting for service %s to reach state: %s' %
-                          (service, state))
-            raise JujuTestClientException
-        time.sleep(1)
-        i += 1
-
-
-def service_machine_units(service, environment=None):
-    _status = status()
-    try:
-        _service = _status['services'][service]
-    except KeyError:
-        logging.error('Could not find machine units for unknown service %s' %
-                      service)
-        raise JujuTestClientException
-    return [_service['units'][u]['machine'] for u in _service['units']]

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/devstack/test_utils/juju/juju_deployer.py	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-import logging
-import os
-import paramiko
-import shutil
-import time
-import yaml
-
-from deployer.config import ConfigStack
-from deployer.action import importer
-from deployer.env import select_runtime
-from deployer.utils import setup_logging
-
-# SSH user for collecting log artifacts
-REMOTE_USER = 'ubuntu'
-
-# SSH Command to use for collecting artifacts on every node
-REMOTE_LOG_CMD = "sudo tar -czf /tmp/%s-%s-artifacts.tar.gz /etc /var/log"
-
-
-class Config(object):
-    # what juju-deployer would typically take as argparse
-    no_local_mods = False
-    update_charms = False
-    overrides = None
-    branch_only = False
-    timeout = 1800
-    watch = True
-    verbose = True
-    debug = True
-    rel_wait = 240
-    bootstrap = True
-    retry_count = None
-    deploy_delay = 0
-
-
-def run_deployer(environment, configs, deployment, **kwargs):
-    '''
-    Uses juju-deployer to deploy a deployment from a given config(s)
-    into an already deployed environment.
-
-    Example usage:
-        run_deployer(
-            environment='precise',
-            configs=['/tmp/base.cfg'],
-            deployment='precise-grizzly',
-            debug=True, verbose=True
-        )
-    '''
-    opts = Config()
-
-    setup_logging(
-        verbose=kwargs.get('verbose', False),
-        debug=kwargs.get('debug', False),
-    )
-
-    if 'overrides' in kwargs:
-        opts.overrides = kwargs['overrides']
-
-    for conf in configs:
-        if not os.path.isfile(conf):
-            e = 'Could not find deployment config @ %s.' % conf
-            raise Exception(e)
-
-    env = select_runtime(environment, opts)
-    config = ConfigStack(configs)
-    deploy = config.get(deployment)
-    importer.Importer(env, deploy, options=opts).run()
-
-
-def reset(environment):
-    env = select_runtime(environment, Config())
-    env.connect()
-    env.reset(terminate_machines=True, terminate_delay=6, watch=True,
-              timeout=600)
-
-
-def locate_machine(status, machine_id):
-    '''determine service unit assigned to machine id'''
-    if machine_id == '0':
-        return 'bootstrap-machine-0'
-    services = status['services']
-    for unit in [services[k]['units'] for k in services.iterkeys()]:
-        if machine_id in [u['machine'] for u in unit.itervalues()]:
-            return [k for k in unit.iterkeys()][0].replace('/', '-')
-    return None
-
-
-def hosts_services(status):
-    machines = []
-    for id, machine in status['machines'].iteritems():
-        if 'dns-name' not in machine:
-            logging.error('Machine %s has no dns-name.' % id)
-            logging.error(machine)
-            continue
-        m = {'id': id, 'dns-name': machine['dns-name']}
-        machines.append(m)
-    [m.update({'service': locate_machine(status, m['id'])})
-     for m in machines]
-    return machines
-
-
-def collect_artifacts(environment, outdir):
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
-    if not os.path.isdir(outdir):
-        raise Exception('%s exists but is not a directory.' % outdir)
-
-    env = select_runtime(environment, Config())
-
-    conns = {}
-    hosts = hosts_services(env.get_cli_status())
-
-    logging.info('Collecting artifacts from %s.' %
-                 [h['dns-name'] for h in hosts])
-
-    for host in hosts:
-        hn = host['dns-name']
-
-        conns[hn] = {}
-        conns[hn]['ssh'] = paramiko.SSHClient()
-        conns[hn]['ssh'].set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        try:
-            conns[hn]['ssh'].connect(hn, username=REMOTE_USER)
-            conns[hn]['sftp'] = conns[hn]['ssh'].open_sftp()
-        except Exception as e:
-            raise Exception('Could not setup ssh connection to %s: %s' %
-                            (hn, e))
-
-    for host in hosts:
-        hn = host['dns-name']
-        svc = host['service']
-        cmd = REMOTE_LOG_CMD % (svc, hn)
-        try:
-            conns[hn]['ssh'].exec_command(cmd)
-        except Exception as e:
-            logging.error('Could not execute remote log cmd on '
-                          'host %s: %s' % (hn, cmd))
-            raise e
-
-    # sleep for 5, allow all hosts to finish tarring.
-    time.sleep(5)
-
-    for host in hosts:
-        hn = host['dns-name']
-        svc = host['service']
-        try:
-            tgz = '%s-%s-artifacts.tar.gz' % (svc, hn)
-            conns[hn]['sftp'].get(
-                os.path.join('/tmp', tgz), os.path.join(outdir, tgz))
-        except Exception as e:
-            logging.error('Could not collect artifacts from %s:%s' %
-                          (hn, tgz))
-            raise e
-
-    # collect the local maas logs if they exist
-    if os.path.isdir('/var/log/maas'):
-        for log in ['maas.log', 'pserv.log']:
-            l = os.path.join('/var/log/maas', log)
-            if os.path.isfile(l):
-                shutil.copy(l, outdir)
-
-    # dump current juju status
-    with open(os.path.join(outdir, 'juju_status.yaml'), 'w') as out:
-        out.write(yaml.dump(env.get_cli_status()))
-
-
-class DeployerTest(object):
-    def __init__(self):
-        self.config = None
-
-    def deploy(self, env=None):
-        env = env or self.config.get('ubuntu_release')
-        run_deployer(environment=env,
-                     configs=[self.config.get('deployment_config')],
-                     deployment=self.config.get('deployment'),
-                     overrides=self.config.get('overrides'),
-                     debug=True, verbose=True)
-
-    def reset_environment(self, env=None):
-        _env = env or self.config.get('ubuntu_release')
-        reset(_env)
-
-    def collect_artifacts(self, env, outdir):
-        _env = env or self.config.get('ubuntu_release')
-        collect_artifacts(_env, outdir)

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/all_variables	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# List of all place holders used in any of the test configs.
-# 'run_tests.py --configure' will reference this, and update
-# configs according to what is available in environment.
-# Putting this here and into run_tests.py keeps the Jenkins
-# jobs slim and clean.
-
-# openstack.conf
-NOVA_HOST
-GLANCE_HOST
-KEYSTONE_HOST
-CINDER_HOST
-QUANTUM_HOST
-NOVA_COMPUTE_HOST
-NOVA_VOLUME_HOST
-ADMIN_TOKEN
-IMAGE_UUID
-IMAGE_NAME
-EC2_ACCESS_KEY
-EC2_SECRET_KEY
-EC2_URL
-S3_URL
-EC2_AMI_ID
-OS_USERNAME
-OS_PASSWORD
-OS_AUTH_URL
-OS_TENANT_NAME
-HORIZON_HOST
-ENABLED_SERVICES
-
-# devstack.conf
-ENABLED_SERVICES

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack.conf	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[DEFAULT]
-templates=etc/devstack_templates/
-devstack_repo=https://github.com/openstack-dev/devstack.git
-devstack_branch=stable/havana
-enabled_services=%ENABLED_SERVICES%
-active_timeout=60
-associate_timeout=60
-boot_timeout=60
-running_timeout=120
-terminate_timeout=60
-secondary_ip_pool=test_range

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/exerciserc	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-#
-# source exerciserc
-#
-# Configure the DevStack exercise scripts
-# For best results, source this _after_ stackrc/localrc as it will set
-# values only if they are not already set.
-
-# Max time to wait while vm goes from build to active state
-export ACTIVE_TIMEOUT={{ active_timeout }}
-# Max time to wait for proper IP association and dis-association.
-export ASSOCIATE_TIMEOUT={{ associate_timeout }}
-
-# Max time till the vm is bootable
-export BOOT_TIMEOUT={{ boot_timeout }}
-
-# Max time from run instance command until it is running
-export RUNNING_TIMEOUT={{ running_timeout }}
-
-# Max time to wait for a vm to terminate
-export TERMINATE_TIMEOUT={{ terminate_timeout }}
-
-# Max time to wait for a euca-volume command to propogate
-export VOLUME_TIMEOUT=${VOLUME_TIMEOUT:-30}
-
-# Max time to wait for a euca-delete command to propogate
-export VOLUME_DELETE_TIMEOUT=${SNAPSHOT_DELETE_TIMEOUT:-60}
-
-# The size of the volume we want to boot from; some storage back-ends
-# do not allow a disk resize, so it's important that this can be tuned
-export DEFAULT_VOLUME_SIZE=${DEFAULT_VOLUME_SIZE:-1}
-

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.master	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-
-###########################
-# Ubuntu CI Lab Settings
-###########################
-
-# List of all enabled services, compiled by inspect_environment.sh
-# and set in etc/tests/devstack.conf
-ENABLED_SERVICES={{ enabled_services }}
-
-# volumes + floating_ips test checks this when determining whether
-# or not it should try to ping internal IPs
-MULTI_HOST=1
-
-# The second pool of floating ips, created during jenkins
-# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
-TEST_FLOATING_POOL={{ secondary_ip_pool }}
-
-# Should point to keystone
-HOST_IP={{ keystone_host }}
-SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
-
-# Needed because tests use glance client directly
-GLANCE_HOST={{ glance_host }}
-
-PRIVATE_NETWORK_NAME="private network"
-
-# These get created by the Keystone charm during deployment.
-# They are set as config options to the charm
-export NOVA_PROJECT_ID={{ os_tenant_name }}
-export NOVA_USERNAME={{ os_username }}
-export NOVA_PASSWORD={{ os_password }}
-
-# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
-# auth so that they use OS_ env. variables, but doesn't translate
-# properly from existing NOVA_ ones
-export OS_TENANT_NAME=$NOVA_PROJECT_ID
-export OS_USERNAME=$NOVA_USERNAME
-export OS_PASSWORD=$NOVA_PASSWORD
-export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
-
-# Set the ec2 url so euca2ools works
-export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
-
-# Also set s3 url for bundle testing
-export S3_URL="http://{{ nova_host }}:3333"
-
-# Specify what image to parse out of 'glance index' so we don't accidentally
-# try spawning the test, null AMI that the bundle test publishses.
-# DISABLED: setting this actually throws off devstack's regexp 
-# and the test sometimes boots an AKI instead of AMI. 
-#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
-
-# Bumped these timeouts to 60, bump higher if we decide to use
-# cloud images instead of ttylinux
-# Max time till the vm is bootable
-export BOOT_TIMEOUT=60
-# Max time to wait while vm goes from build to active state
-export ACTIVE_TIMEOUT=60
-
-# Timeout for instance termination
-export TERMINATE_TIMEOUT=30
-
-# Disable use of python-keyring during tests.
-export OS_NO_CACHE=1
-
-###########################
-# Devstack defaults
-###########################
-
-# With the addition of Keystone, to use an openstack cloud you should
-# authenticate against keystone, which returns a **Token** and **Service
-# Catalog**.  The catalog contains the endpoint for all services the user/tenant
-# has access to - including nova, glance, keystone, swift, ...  We currently
-# recommend using the 2.0 *auth api*.
-#
-# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
-# will use the 1.1 *compute api*
-export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
-
-# Currently novaclient needs you to specify the *compute api* version.  This
-# needs to match the config of your catalog returned by Keystone.
-export NOVA_VERSION=${NOVA_VERSION:-1.1}
-
-# FIXME - why does this need to be specified?
-export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
-
-# Euca2ools Certificate stuff for uploading bundles
-# You can get your certs using ./tools/get_certs.sh
-NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
-        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
-NOVA_KEY_DIR=${NOVARC%/*}
-# Override this above, since devstack seems to use SERVICE_HOST to describe
-# both the nova host + keystone
-#export S3_URL=http://$SERVICE_HOST:3333
-export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
-export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
-export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
-export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
-export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
-
-# set log level to DEBUG (helps debug issues)
-# export NOVACLIENT_DEBUG=1
-
-# Max time from run instance command until it is running
-export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
-
-# Max time to wait for proper IP association and dis-association.
-export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_essex	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-
-###########################
-# Ubuntu CI Lab Settings
-###########################
-# stable/essex
-# volumes + floating_ips test checks this when determining whether
-# or not it should try to ping internal IPs
-MULTI_HOST=1
-
-# The second pool of floating ips, created during jenkins
-# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
-TEST_FLOATING_POOL={{ secondary_ip_pool }}
-
-# Should point to keystone
-HOST_IP={{ keystone_host }}
-SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
-
-# Needed because tests use glance client directly
-GLANCE_HOST={{ glance_host }}
-
-# These get created by the Keystone charm during deployment.
-# They are set as config options to the charm
-export NOVA_PROJECT_ID={{ os_tenant_name }}
-export NOVA_USERNAME={{ os_username }}
-export NOVA_PASSWORD={{ os_password }}
-
-# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
-# auth so that they use OS_ env. variables, but doesn't translate
-# properly from existing NOVA_ ones
-export OS_TENANT_NAME=$NOVA_PROJECT_ID
-export OS_USERNAME=$NOVA_USERNAME
-export OS_PASSWORD=$NOVA_PASSWORD
-export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
-
-# Set the ec2 url so euca2ools works
-export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
-
-# Also set s3 url for bundle testing
-export S3_URL="http://{{ nova_host }}:3333"
-
-# Specify what image to parse out of 'glance index' so we don't accidentally
-# try spawning the test, null AMI that the bundle test publishses.
-# DISABLED: setting this actually throws off devstack's regexp 
-# and the test sometimes boots an AKI instead of AMI. 
-#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
-
-# Bumped these timeouts to 60, bump higher if we decide to use
-# cloud images instead of ttylinux
-# Max time till the vm is bootable
-export BOOT_TIMEOUT=60
-# Max time to wait while vm goes from build to active state
-export ACTIVE_TIMEOUT=60
-
-# Timeout for instance termination
-export TERMINATE_TIMEOUT=30
-###########################
-# Devstack defaults 
-###########################
-
-# With the addition of Keystone, to use an openstack cloud you should
-# authenticate against keystone, which returns a **Token** and **Service
-# Catalog**.  The catalog contains the endpoint for all services the user/tenant
-# has access to - including nova, glance, keystone, swift, ...  We currently
-# recommend using the 2.0 *auth api*.
-#
-# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
-# will use the 1.1 *compute api*
-export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
-
-# Currently novaclient needs you to specify the *compute api* version.  This
-# needs to match the config of your catalog returned by Keystone.
-export NOVA_VERSION=${NOVA_VERSION:-1.1}
-
-# FIXME - why does this need to be specified?
-export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
-
-# Euca2ools Certificate stuff for uploading bundles
-# You can get your certs using ./tools/get_certs.sh
-NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
-        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
-NOVA_KEY_DIR=${NOVARC%/*}
-# Override this above, since devstack seems to use SERVICE_HOST to describe
-# both the nova host + keystone
-#export S3_URL=http://$SERVICE_HOST:3333
-export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
-export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
-export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
-export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
-export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
-
-# set log level to DEBUG (helps debug issues)
-# export NOVACLIENT_DEBUG=1
-
-# Max time from run instance command until it is running
-export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
-
-# Max time to wait for proper IP association and dis-association.
-export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_folsom	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-
-###########################
-# Ubuntu CI Lab Settings
-###########################
-
-# List of all enabled services, compiled by inspect_environment.sh
-# and set in etc/tests/devstack.conf
-ENABLED_SERVICES={{ enabled_services }}
-
-# volumes + floating_ips test checks this when determining whether
-# or not it should try to ping internal IPs
-MULTI_HOST=1
-
-# The second pool of floating ips, created during jenkins
-# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
-TEST_FLOATING_POOL={{ secondary_ip_pool }}
-
-# Should point to keystone
-HOST_IP={{ keystone_host }}
-SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
-
-# Needed because tests use glance client directly
-GLANCE_HOST={{ glance_host }}
-
-PRIVATE_NETWORK_NAME="private network"
-
-# These get created by the Keystone charm during deployment.
-# They are set as config options to the charm
-export NOVA_PROJECT_ID={{ os_tenant_name }}
-export NOVA_USERNAME={{ os_username }}
-export NOVA_PASSWORD={{ os_password }}
-
-# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
-# auth so that they use OS_ env. variables, but doesn't translate
-# properly from existing NOVA_ ones
-export OS_TENANT_NAME=$NOVA_PROJECT_ID
-export OS_USERNAME=$NOVA_USERNAME
-export OS_PASSWORD=$NOVA_PASSWORD
-export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
-
-# Set the ec2 url so euca2ools works
-export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
-
-# Also set s3 url for bundle testing
-export S3_URL="http://{{ nova_host }}:3333"
-
-# Specify what image to parse out of 'glance index' so we don't accidentally
-# try spawning the test, null AMI that the bundle test publishses.
-# DISABLED: setting this actually throws off devstack's regexp 
-# and the test sometimes boots an AKI instead of AMI. 
-#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
-
-# Bumped these timeouts to 60, bump higher if we decide to use
-# cloud images instead of ttylinux
-# Max time till the vm is bootable
-export BOOT_TIMEOUT=60
-# Max time to wait while vm goes from build to active state
-export ACTIVE_TIMEOUT=60
-
-# Timeout for instance termination
-export TERMINATE_TIMEOUT=30
-
-# Disable use of python-keyring during tests.
-export OS_NO_CACHE=1
-
-###########################
-# Devstack defaults
-###########################
-
-# With the addition of Keystone, to use an openstack cloud you should
-# authenticate against keystone, which returns a **Token** and **Service
-# Catalog**.  The catalog contains the endpoint for all services the user/tenant
-# has access to - including nova, glance, keystone, swift, ...  We currently
-# recommend using the 2.0 *auth api*.
-#
-# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
-# will use the 1.1 *compute api*
-export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
-
-# Currently novaclient needs you to specify the *compute api* version.  This
-# needs to match the config of your catalog returned by Keystone.
-export NOVA_VERSION=${NOVA_VERSION:-1.1}
-
-# FIXME - why does this need to be specified?
-export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
-
-# Euca2ools Certificate stuff for uploading bundles
-# You can get your certs using ./tools/get_certs.sh
-NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
-        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
-NOVA_KEY_DIR=${NOVARC%/*}
-# Override this above, since devstack seems to use SERVICE_HOST to describe
-# both the nova host + keystone
-#export S3_URL=http://$SERVICE_HOST:3333
-export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
-export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
-export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
-export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
-export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
-
-# set log level to DEBUG (helps debug issues)
-# export NOVACLIENT_DEBUG=1
-
-# Max time from run instance command until it is running
-export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
-
-# Max time to wait for proper IP association and dis-association.
-export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/devstack_templates/openrc.stable_havana	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-
-###########################
-# Ubuntu CI Lab Settings
-###########################
-
-# List of all enabled services, compiled by inspect_environment.sh
-# and set in etc/tests/devstack.conf
-ENABLED_SERVICES={{ enabled_services }}
-
-# volumes + floating_ips test checks this when determining whether
-# or not it should try to ping internal IPs
-MULTI_HOST=1
-
-# The second pool of floating ips, created during jenkins
-# via /var/lib/jenkins/tools/jenkins-scripts/prepare_cloud.sh
-TEST_FLOATING_POOL={{ secondary_ip_pool }}
-
-# Should point to keystone
-HOST_IP={{ keystone_host }}
-SERVICE_HOST={{ service_host }}
-
-# Needed because tests use glance client directly
-GLANCE_HOST={{ glance_host }}
-
-PRIVATE_NETWORK_NAME="admin_net network"
-DEFAULT_FLOATING_POOL="ext_net"
-DEFAULT_INSTANCE_TYPE="m1.small"
-
-# These get created by the Keystone charm during deployment.
-# They are set as config options to the charm
-export NOVA_PROJECT_ID={{ os_tenant_name }}
-export NOVA_USERNAME={{ os_username }}
-export NOVA_PASSWORD={{ os_password }}
-
-# Commit 10670d1bad6b4afd3dce9af61d22c8cd5eeded59 changed keystone token
-# auth so that they use OS_ env. variables, but doesn't translate
-# properly from existing NOVA_ ones
-export OS_TENANT_NAME=$NOVA_PROJECT_ID
-export OS_USERNAME=$NOVA_USERNAME
-export OS_PASSWORD=$NOVA_PASSWORD
-export OS_AUTH_URL="http://$HOST_IP:5000/v2.0/"
-
-# Set the ec2 url so euca2ools works
-export EC2_URL="http://{{ nova_host }}:8773/services/Cloud"
-
-# Also set s3 url for bundle testing
-export S3_URL="http://{{ nova_host }}:3333"
-
-# Specify what image to parse out of 'glance index' so we don't accidentally
-# try spawning the test, null AMI that the bundle test publishses.
-# DISABLED: setting this actually throws off devstack's regexp 
-# and the test sometimes boots an AKI instead of AMI. 
-#export DEFAULT_IMAGE_NAME="cirros-0.3.0-x86_64-uec-ami"
-
-# Bumped these timeouts to 60, bump higher if we decide to use
-# cloud images instead of ttylinux
-# Max time till the vm is bootable
-export BOOT_TIMEOUT=60
-# Max time to wait while vm goes from build to active state
-export ACTIVE_TIMEOUT=60
-
-# Timeout for instance termination
-export TERMINATE_TIMEOUT=30
-
-# Disable use of python-keyring during tests.
-export OS_NO_CACHE=1
-
-###########################
-# Devstack defaults
-###########################
-
-# With the addition of Keystone, to use an openstack cloud you should
-# authenticate against keystone, which returns a **Token** and **Service
-# Catalog**.  The catalog contains the endpoint for all services the user/tenant
-# has access to - including nova, glance, keystone, swift, ...  We currently
-# recommend using the 2.0 *auth api*.
-#
-# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We
-# will use the 1.1 *compute api*
-export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/}
-
-# Currently novaclient needs you to specify the *compute api* version.  This
-# needs to match the config of your catalog returned by Keystone.
-export NOVA_VERSION=${NOVA_VERSION:-1.1}
-
-# FIXME - why does this need to be specified?
-export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
-
-# Euca2ools Certificate stuff for uploading bundles
-# You can get your certs using ./tools/get_certs.sh
-NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
-        NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
-NOVA_KEY_DIR=${NOVARC%/*}
-# Override this above, since devstack seems to use SERVICE_HOST to describe
-# both the nova host + keystone
-#export S3_URL=http://$SERVICE_HOST:3333
-export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
-export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
-export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
-export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
-export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
-
-# set log level to DEBUG (helps debug issues)
-# export NOVACLIENT_DEBUG=1
-
-# Max time from run instance command until it is running
-export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
-
-# Max time to wait for proper IP association and dis-association.
-export ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-15}

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/etc_master/openstack.conf	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-[DEFAULT]
-nova_host=%NOVA_HOST%
-nova_compute_host=%NOVA_COMPUTE_HOST%
-nova_volume_host=%NOVA_VOLUME_HOST%
-glance_host=%GLANCE_HOST%
-keystone_host=%KEYSTONE_HOST%
-cinder_host=%CINDER_HOST%
-quantum_host=%QUANTUM_HOST%
-service_host=%HORIZON_HOST%
-glance_image_uuid=%IMAGE_UUID%
-glance_image_name=%IMAGE_NAME%
-admin_token=%ADMIN_TOKEN%
-enabled_services=%ENABLED_SERVICES%
-
-[ec2]
-access_key=%EC2_ACCESS_KEY%
-secret_key=%EC2_SECRET_KEY%
-ec2_url=%EC2_URL%
-s3_url=%S3_URL%
-ec2_ami_id=%EC2_AMI_ID%
-
-[osapi]
-username=%OS_USERNAME%
-password=%OS_PASSWORD%
-auth_url=%OS_AUTH_URL%
-tenant_name=%OS_TENANT_NAME%

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/get-cloud-images	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash -e
-
-mkdir -p ~/images
-wget -O ~/images/precise-server-cloudimg-amd64-disk1.img  http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/inspect-environment	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-#!/bin/bash
-# Generate an envrc to be sourced and used by all tests (and possibly humans).
-#
-#   - Using juju-deployer, determine where all services ended up.
-#   - With the admin credentials configured in juju's deployment configs,
-#     generate EC2 credentials.
-#   - Dump everything into envrc using names compatable with client tools
-#
-# Additionally dump anything else needed for test suite configurations. See
-# etc/tests/all_variables for a list of what should be set in envrc.
-#
-# Also collect all package version from the nodes, save in a text file.
-# Both envrc and versions_tested are to be used as file parameters to
-# Jenkins test jobs.
-
-echo "Inspecting deployed environment."
-# Discover where the services ended up
-NOVA_HOST=$(juju-deployer -f nova-cloud-controller 2>/dev/null)
-GLANCE_HOST=$(juju-deployer -f glance 2>/dev/null)
-KEYSTONE_HOST=$(juju-deployer -f keystone 2>/dev/null)
-NOVA_VOLUME_HOST=$(juju-deployer -f nova-volume 2>/dev/null)
-CINDER_HOST=$(juju-deployer -f cinder 2>/dev/null)
-NOVA_COMPUTE_HOST=$(juju-deployer -f nova-compute 2>/dev/null)
-NEUTRON_HOST=$(juju-deployer -f neutron-gateway 2>/dev/null)
-QUANTUM_HOST=$(juju-deployer -f quantum-gateway 2>/dev/null)
-HORIZON_HOST=$(juju-deployer -f openstack-dashboard 2>/dev/null)
-CEPH_HOST=$(juju-deployer -f ceph 2>/dev/null)
-SWIFT_HOST=$(juju-deployer -f swift-proxy 2>/dev/null)
-NOVA_VMWARE_HOST=$(juju-deployer -f nova-vmware 2>/dev/null)
-
-# Handle the quantum -> neutron rename.
-[[ -n "$NEUTRON_HOST" ]] && QUANTUM_HOST="$NEUTRON_HOST"
-
-# Ensure essential hosts are present, and build ENABLED_SERVICES so devstack
-# knows what it should be testing.
-ENABLED_SERVICES=""
-MISSING_HOSTS=""
-
-[[ ! -z "$NOVA_HOST" ]] &&
-  ENABLED_SERVICES="n-api,n-crt,n-obj,n-sch" ||
-  MISSING_HOSTS="$MISSING_HOSTS NOVA_HOST"
-[[ ! -z "$GLANCE_HOST" ]] &&
-  ENABLED_SERVICES="${ENABLED_SERVICES},g-api,g-reg" ||
-  MISSING_HOSTS="$MISSING_HOSTS GLANCE_HOST"
-[[ ! -z "$KEYSTONE_HOST" ]] &&
-  ENABLED_SERVICES="${ENABLED_SERVICES},key" ||
-  MISSING_HOSTS="$MISSING_HOSTS KEYSTONE_HOST"
-
-# Optional services.
-[[ ! -z "$NOVA_VOLUME_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,n-vol"
-[[ ! -z "$CEPH_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,ceph"
-[[ ! -z "$CINDER_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,cinder,c-api,c-vol"
-[[ ! -z "$HORIZON_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,horizon"
-[[ ! -z "$QUANTUM_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,quantum" ||
-  ENABLED_SERVICES="$ENABLED_SERVICES,n-net"
-[[ ! -z "$SWIFT_HOST" ]] && ENABLED_SERVICES="$ENABLED_SERVICES,swift"
-
-# Bail if we're missing any critical services.
-[[ -n "$MISSING_HOSTS" ]] &&
-  echo "Missing required host in deployment: $MISSING_HOSTS" && exit 1
-
-# These are hard-coded in charm deployment configs, for now.
-# They could potentially be extracted from Juju on the go, via
-# juju-get
-export OS_USERNAME='admin'
-export OS_PASSWORD='Password1+'
-export OS_TENANT_NAME='admin'
-export OS_AUTH_URL="http://$KEYSTONE_HOST:5000/v2.0/"
-export ADMIN_TOKEN='ubuntutesting'
-
-# Determine the tenant id for the configured tenant name.
-export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
-
-# Floating IP settings specific to our lab.  These are used in
-# Quantum network config from prepare_cloud.sh
-export QUANTUM_EXT_NET_GW=${QUANTUM_EXT_NET_GW:-172.16.1.1}
-export QUANTUM_EXT_NET_CIDR=${QUANTUM_EXT_NET_CIDR:-172.16.1.0/24}
-export QUANTUM_EXT_NET_NAME=${QUANTUM_EXT_NET_NAME:-ext_net}
-export QUANTUM_FLOAT_RANGE=${QUANTUM_FLOAT_RANGE:-172.16.1.2:172.16.1.254}
-export QUANTUM_FIXED_NET_CIDR=${QUANTUM_FIXED_NET_CIDR:-192.168.20.0/24}
-export QUANTUM_FIXED_NET_NAME=${QUANTUM_FIXED_NET_NAME:-admin_net}
-export QUANTUM_DNS=${QUANTUM_DNS:-172.16.1.1}
-
-# nova-network dhcp settings, used in prepare_cloud.sh
-export NOVA_NET_PRIVATE_NET_CIDR=${NOVA_NET_PRIVATE_NET_CIDR:-192.168.21.0/24}
-export NOVA_NET_FLOATING_POOL_RANGE=${NOVA_NET_FLOATING_POOL_RANGE:-192.168.20.224/27}
-export NOVA_NET_FLOATING_POOL_RANGE_2=${NOVA_NET_FLOATING_POOL_RANGE_2:-192.168.20.223/27}
-
-# Generate some EC2 creds via keystoneclient, if
-# its installed
-if which keystone >/dev/null 2>&1 ; then
-  EC2_URL=$(keystone catalog --service ec2 | awk '/ publicURL / { print $4 }')
-  S3_URL=$(keystone catalog --service s3 | awk '/ publicURL / { print $4 }')
-  CREDS=$(keystone ec2-credentials-create)
-  EC2_ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')
-  EC2_SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')
-else
-  echo "Couldn't find keystone client executable, skipping"\
-       " EC2 credential generation."
-fi
-
-echo "Writing envrc"
-
-cat >envrc <<END
-export NOVA_HOST=$NOVA_HOST
-export GLANCE_HOST=$GLANCE_HOST
-export KEYSTONE_HOST=$KEYSTONE_HOST
-export HORIZON_HOST=$HORIZON_HOST
-export CINDER_HOST=$CINDER_HOST
-export NOVA_VOLUME_HOST=$NOVA_VOLUME_HOST
-export NOVA_COMPUTE_HOST=$NOVA_COMPUTE_HOST
-export SWIFT_HOST=$SWIFT_HOST
-export OS_USERNAME=$OS_USERNAME
-export OS_PASSWORD=$OS_PASSWORD
-export OS_TENANT_NAME=$OS_TENANT_NAME
-export TENANT_ID=$TENANT_ID
-export OS_AUTH_URL=$OS_AUTH_URL
-export OS_REGION_NAME=RegionOne
-export ADMIN_TOKEN=$ADMIN_TOKEN
-export TEMPEST_USER_1=tempest-1
-export TEMPEST_USER_2=tempest-2
-export TEMPEST_USERS_PASSWORD=ubuntu
-export TEMPEST_TENANT_1=tempest-tenant-1
-export TEMPEST_TENANT_2=tempest-tenant-2
-export ENABLED_SERVICES=$ENABLED_SERVICES
-END
-
-if [[ -n "$EC2_URL" ]] ; then
-  cat >>envrc <<END
-export EC2_URL=$EC2_URL
-export S3_URL=$S3_URL
-export EC2_ACCESS_KEY=$EC2_ACCESS_KEY
-export EC2_SECRET_KEY=$EC2_SECRET_KEY
-END
-fi
-
-if [[ -n "$QUANTUM_HOST" ]] ; then
-  cat >>envrc <<END
-export NEUTRON_AVAILABLE=true
-export QUANTUM_AVAILABLE=true
-export QUANTUM_HOST=$QUANTUM_HOST
-export QUANTUM_EXT_NET_GW=$QUANTUM_EXT_NET_GW
-export QUANTUM_EXT_NET_CIDR=$QUANTUM_EXT_NET_CIDR
-export QUANTUM_EXT_NET_NAME=$QUANTUM_EXT_NET_NAME
-export QUANTUM_FLOAT_RANGE=$QUANTUM_FLOAT_RANGE
-export QUANTUM_FIXED_NET_CIDR=$QUANTUM_FIXED_NET_CIDR
-export QUANTUM_FIXED_NET_NAME=$QUANTUM_FIXED_NET_NAME
-export QUANTUM_DNS=$QUANTUM_DNS
-END
-else
-  cat >>envrc <<END
-export NEUTRON_AVAILABLE=false
-export QUANTUM_AVAILABLE=false
-export NOVA_NET_PRIVATE_NET_CIDR=$NOVA_NET_PRIVATE_NET_CIDR
-export NOVA_NET_FLOATING_POOL_RANGE=$NOVA_NET_FLOATING_POOL_RANGE
-export NOVA_NET_FLOATING_POOL_RANGE_2=$NOVA_NET_FLOATING_POOL_RANGE_2
-END
-fi
-
-if [[ -n "$SWIFT_HOST" ]] ; then
-  echo "export SWIFT_AVAILABLE=false" >>envrc
-else
-  echo "export SWIFT_AVAILABLE=false" >>envrc
-fi
-
-if [[ -n "$CEPH_HOST" ]] ; then
-  echo "export VOLUME_BACKEND=ceph" >>envrc
-else
-  echo "export VOLUME_BACKEND=iSCSI" >>envrc
-fi
-
-# TODO: Extend this to support detecting other computes (lxc)
-if [[ -n "$NOVA_COMPUTE_HOST" ]] ; then
-  virt_type=$(python -c "
-import yaml
-import subprocess
-conf = yaml.load(subprocess.check_output(['juju', 'get', 'nova-compute']))
-if 'value' in conf['settings']['virt-type']:
-    print conf['settings']['virt-type']['value']
-else:
-    print 'kvm'
-")
-  [[ -z "$virt_type" ]] && virt_type="kvm"
-  echo "export COMPUTE_BACKEND=$virt_type" >>envrc
-elif [[ -n "$NOVA_VMWARE_HOST" ]] ; then
-  echo "export COMPUTE_BACKEND=vmware" >>envrc
-fi

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare-cloud	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-#!/bin/bash -xe
-# Utility script to:
-# - Upload an image to glance, cirros by default.  
-#   Since our Jenkins host is cut off from the outside
-#   world, images are hard-coded and expected to exist in
-#   following locations locally:
-#     $HOME/images/precise-server-cloudimg-amd64.tar.gz
-#     $HOME/images/ttylinux-uec-i686-12.1_2.6.35-22_1.tar.gz
-#     $HOME/images/cirros-0.3.0-x86_64-uec.tar.gz
-#
-# - Configure networks in Nova's database.  Also hard-coded here
-#   to configure:
-#     - private instance network 10.14.4.24,
-#        multi_host, bridge=br100, bridge_interface=eth1
-#     - default floating ip pool 192.168.20.224/27
-#     - secondary floating ip pool 192.168.20.223/27
-#
-# This script expects:
-#   - Environment contains any variables needed by glance's client tools
-#     (use inspect_environment.sh to generate envrc containing these)
-#   - Passwordless ssh access to nova-cloud-controller, and passwordless
-#     sudo access for the ubuntu user (to call nova-manage)
-
-cwd=`dirname $0`
-
-function error_out() {
-  echo "* [ERROR prepare_cloud]: $@" && exit 1
-}
-
-function log() {
-  echo "- [prepare_cloud]: $@"
-}
-
-OS_RELEASE="$1"
-
-# These hosts should have all been set in environment, via envrc
-missing=""
-[[ -z "$NOVA_HOST" ]] && missing="$missing NOVA_HOST"
-[[ -z "$OS_USERNAME" ]] && missing="$missing OS_USERNAME"
-[[ -z "$OS_PASSWORD" ]] && missing="$missing OS_PASSWORD"
-[[ -z "$OS_AUTH_URL" ]] && missing="$missing OS_AUTH_URL"
-[[ -z "$OS_TENANT_NAME" ]] && missing="$missing OS_TENANT_NAME"
-[[ -n "$missing" ]] && error_out "Missing from environment: $missing"
-
-export IMG_DIR=${IMG_DIR:-$HOME/images}
-export DEFAULT_IMAGE=${DEFAULT_IMAGE:-$IMG_DIR/precise-server-cloudimg-amd64-disk1.img}
-export VMWARE_IMAGE=${VMWARE_IMAGE:-$IMG_DIR/vmware/precise.vmdk}
-export LXC_IMAGE=${LXC_IMAGE:-$IMG_DIR/lxc/precise-server-cloudimg-amd64.img
-}
-
-[[ ! -e $cwd/prepare_cloud/$OS_RELEASE ]] &&
-  error_out "Could not load prep library from $cwd/prepare_cloud/$OS_RELEASE"
-
-. $cwd/prepare_cloud/$OS_RELEASE
-
-setup_network
-publish_image ubuntu

=== removed directory 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/essex'
=== target was u'folsom'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/folsom	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-#!/bin/bash -xe
-# Utility script to:
-# - Upload an image to glance, cirros by default.
-#   Since our Jenkins host is cut off from the outside
-#   world, images are hard-coded and expected to exist in
-#   following locations locally:
-#
-#     $HOME/cirros-0.3.0-x86_64-disk.img
-#     $HOME/quantal-server-cloudimg-amd64-disk1.img
-#
-# - Configure networks in Nova's database.  Also hard-coded here
-#   to configure:
-#     - private instance network 192.168.21.0/24,
-#        multi_host, bridge=br100, bridge_interface=eth1
-#     - default floating ip pool 192.168.20.224/27
-#     - secondary floating ip pool 192.168.20.223/27
-#
-# This script expects:
-#   - Environment contains any variables needed by glance's client tools
-#     (use inspect_environment.sh to generate envrc containing these)
-#   - Passwordless ssh access to nova-cloud-controller, and passwordless
-#     sudo access for the ubuntu user (to call nova-manage)
-
-
-function setup_nova_network() {
-  # Conditionally create nova's instance network and 2 floating ip pools
-  # this takes place on the cloud-controller using nova-manage
-  log "Logging into $NOVA_HOST and creating network via nova-manage"
-  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/network-created ]] || \
-                    (sudo nova-manage network create private $NOVA_NET_PRIVATE_NET_CIDR \
-                     1 256 --bridge=br100 --bridge_interface=eth1 --multi_host=T \
-                     && touch ~/network-created)" ||
-                   error_out "Could not create network."
-
-  log "Logging into $NOVA_HOST and creating default floating IP pool"
-  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/floating-pool1-created ]] || \
-                   (sudo nova-manage floating create $NOVA_NET_FLOATING_POOL_RANGE \
-                    && touch ~/floating-pool1-created)" ||
-                   error_out "Could not create default floating pool."
-
-  log "Logging into $NOVA_HOST and creating secondary floating IP pool"
-  ssh ubuntu@"$NOVA_HOST" "[[ -e ~/floating-pool2-created ]] || \
-                   (sudo nova-manage floating create --ip_range=$NOVA_NET_FLOATING_POOL_RANGE_2 \
-                     --pool=test_range && touch ~/floating-pool2-created)" ||
-                   error_out "ERROR: Could not create secondary floatig pool."
-}
-
-function setup_quantum_network() {
-  # SSHes to nova-c-c and uses the charm's quantum utility script with
-  # creds generated by inspect_environment.sh.
-  ssh ubuntu@"$NOVA_HOST" "\
-                  OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD \
-                  OS_TENANT_NAME=$OS_TENANT_NAME  OS_AUTH_URL=$OS_AUTH_URL  \
-                  OS_REGION_NAME=RegionOne \
-                  quantum-ext-net -g $QUANTUM_EXT_NET_GW \
-                  -c $QUANTUM_EXT_NET_CIDR \
-                  -f $QUANTUM_FLOAT_RANGE \
-                  -t services \
-                  $QUANTUM_EXT_NET_NAME"
-  ssh ubuntu@"$NOVA_HOST" "\
-                OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD \
-                OS_TENANT_NAME=$OS_TENANT_NAME OS_AUTH_URL=$OS_AUTH_URL  \
-                OS_REGION_NAME=RegionOne \
-                quantum-tenant-net -t admin -r provider-router \
-                $QUANTUM_FIXED_NET_NAME $QUANTUM_FIXED_NET_CIDR"
-
-  # save the IDs of new network to envrc for later testing.
-  ext_net_id=$(neutron net-list | grep "$QUANTUM_EXT_NET_NAME " | \
-               awk '{ print $2 }')
-  fixed_net_id=$(neutron net-list | grep "$QUANTUM_FIXED_NET_NAME " | \
-               awk '{ print $2 }')
-  ext_net_router=$(neutron router-list | grep "$ext_net_id" | \
-               grep provider-router | awk '{ print $2 }')
-  [[ -e envrc ]] &&
-    echo "export QUANTUM_EXT_NET_ID=$ext_net_id" >>envrc &&
-    echo "export QUANTUM_FIXED_NET_ID=$fixed_net_id" >>envrc &&
-    echo "export QUANTUM_EXT_NET_ROUTER_ID=$ext_net_router" >>envrc
-}
-
-function setup_network() {
-  if (echo $ENABLED_SERVICES | grep -q quantum) ||
-     (echo $ENABLED_SERVICES | grep -q neutron) ; then
-    setup_quantum_network
-  else
-    setup_nova_network
-  fi
-}
-
-
-function ubuntu_image() {
-  # certain compute backends require certain image formats
-  case "$COMPUTE_BACKEND" in
-    "vmware") echo $VMWARE_IMAGE ;;
-    "lxc") echo $LXC_IMAGE ;;
-    *) echo $DEFAULT_IMAGE ;;
-  esac
-}
-
-function glance_args() {
-  # certain compute backends require images be published with special
-  # properties
-  # NOTE: assumes vmware images are sparse. needs to be adjusted
-  #       publishing preallocated or thin images
-  case "$COMPUTE_BACKEND" in
-    "vmware") echo "--disk-format=vmdk --container-format=bare " \
-                   "--is-public=true --property vmware-adaptertype=ide " \
-                   "--property vmware-ostype=ubuntuGuest " \
-                   "--property vmware_disktype=sparse" ;;
-    "lxc") echo "--container-format=bare --disk-format=raw --property hypervisor_type=lxc" \
-                "--is-public true" ;;
-    *) echo "--is-public=true --container-format=ami --disk-format=ami" ;;
-  esac
-}
-
-function publish_image() {
-  # Publish a cloud img directly into glance using glance client
-  case "$1" in
-    "ubuntu") IMG="$(ubuntu_image)" ;;
-    "cirros"|*) IMG="$IMG_DIR/cirros-0.3.0-x86_64-disk.img" ;;
-  esac
-  [[ ! -e "$IMG" ]] && error_out "Could not find IMG @ $IMG"
-  log "Using IMG @ $IMG."
-
-  # Clear out any existing images.
-  for i in $(glance image-list | grep active | awk '{ print $2 }') ; do
-    log "Deleting existing image from glance with id $i"
-    glance image-delete $i
-  done
-
-  IMG_NAME=$(echo ${IMG##*/} | sed -e 's/\.img//g')
-  args="$(glance_args)"
-  RESP=$(glance image-create --name="$IMG_NAME-ami" $args < $IMG)
-  IMG_UUID=$(echo "$RESP" | grep " id " | awk '{ print $4 }')
-  log "Published AMI for $IMG_NAME with ID $IMG_UUID"
-  log "Cleaning up $IMG_NAME..."
-  rm -rf $IMG_NAME*
-
-  # Find the correpsonding EC2 AMI ID that was assigned the the Glance image.
-  EC2_IMG_UUID=$(euca-describe-images | grep "$IMG_NAME-ami" | awk '{ print $2 }'  | head -n1)
-
-  # if this is being run as part of jenkins job, its likely there is an envrc
-  # in the pwd that we care to update with the name of the image we just published.
-  [[ -e envrc ]] && \
-    echo "export IMAGE_NAME=$IMG_NAME-ami" >>envrc && \
-    echo "export IMAGE_UUID=$IMG_UUID" >>envrc
-    echo "export EC2_IMG_UUID=$EC2_IMG_UUID" >>envrc
-}

=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/grizzly'
=== target was u'folsom'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/havana'
=== target was u'grizzly'
=== removed symlink 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/prepare_cloud/icehouse'
=== target was u'havana'
=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud'
--- usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-configuration/verify-cloud	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-source envrc
-base=$(dirname $0)
-${base}/configure-tests
-nosetests -v

=== removed file 'usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh'
--- usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/openstack-prereqs-install.sh	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-#!/bin/bash
-set -ex
-sudo apt-get install --yes libvirt-bin virtinst qemu-kvm juju iptables-persistent juju-deployer \
-  python-keystoneclient python-novaclient python-cinderclient python-glanceclient python-neutronclient \
-  python-nose git python-swiftclient uuid
-[ -d ~/isos ] || mkdir ~/isos
-[ -f ~/isos/ubuntu-12.04.3-server-amd64.iso ] || wget http://releases.ubuntu.com/precise/ubuntu-12.04.3-server-amd64.iso -O ~/isos/ubuntu-12.04.3-server-amd64.iso
-
-grep 'libvirtd.*ubuntu' /etc/group || (echo "Adding ubuntu user to libvirtd group" && sudo adduser ubuntu libvirtd && echo "Please re-login and run again" && exit 0)
-
-[ -f /home/ubuntu/.ssh/id_rsa ] || echo -e "\n\n\n" | ssh-keygen -N "" -t rsa -f /home/ubuntu/.ssh/id_rsa
-maas-cli admin sshkeys list | grep id || maas-cli admin sshkeys new key="$(cat ~/.ssh/id_rsa.pub)"
-
-# Make Logical Volumes for the guests
-echo "Skipping setup of LVMs"
-# sudo vgscan | grep BigDisk || sudo vgcreate BigDisk /dev/sdb1
-
-# for service in juju lds neutron; do
-#     sudo lvdisplay | grep ${service}_disk && sudo lvremove -f BigDisk/${service}_disk
-# done
-# sudo lvcreate -L20G -n juju_disk BigDisk
-# sudo lvcreate -L800G -n lds_disk BigDisk
-# sudo lvcreate -L20G -n neutron_disk BigDisk
-
-sudo tee /etc/init/maas-pserv.override << EOF
-# Don't start maas-pserv until bridge has started
-start on net-device-up IFACE=br1
-EOF
-
-# Setup networking
-# Add to /etc/network/interfaces
-grep br0 /etc/network/interfaces || sudo tee /etc/network/interfaces <<EOF
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-
-# USB NIC; connect to LAN.
-#auto em1
-#iface em1 inet dhcp
-
-#auto eth0
-#iface eth0 inet dhcp
-
-# External connectivity
-auto br0
-iface br0 inet dhcp
-    bridge_ports eth0
-    bridge_stp off
-    bridge_fd 0
-    bridge_maxwait 0
-
-# The interface to the internal network.
-auto br1
-iface br1 inet static
-    address 10.14.4.1
-    netmask 255.255.255.0
-    broadcast 10.14.4.255
-    network 10.14.4.0
-    bridge_ports em1
-    bridge_stp off
-    bridge_fd 0
-    bridge_maxwait 0
-    dns-nameservers 10.14.4.1
-    dns-search orangebox.org
-
-EOF
-
-sudo sed -i -e's/eth0/br0/g' /etc/iptables/rules.v4
-sudo sed -i -e's/em1/br1/g' /etc/iptables/rules.v4
-sudo service iptables-persistent restart
-
-cluster_controller_uuid=$(maas-cli admin node-groups list | grep uuid | cut -d'"' -f4)
-# Replace MAAS management of em1 with br1
-maas-cli admin node-group-interface delete ${cluster_controller_uuid} em1 && maas-cli admin node-group-interfaces new ${cluster_controller_uuid} interface=br1 ip=10.14.4.1 subnet_mask=255.255.255.0 broadcast_ip=10.14.4.255 router_ip=10.14.4.1 ip_range_low=10.14.4.20 ip_range_high=10.14.4.254 management=2 && sudo service maas-dhcp-server restart && sudo service maas-pserv restart && sudo service maas-cluster-celery restart && sudo service maas-region-celery restart
-
-sudo sed -ie 's/#prepend domain-name-servers 127.0.0.1;/prepend domain-name-servers 10.14.4.1;/' /etc/dhcp/dhclient.conf
-virsh net-info default && virsh net-destroy default && virsh net-undefine default
-
-# create bridge on 172.16.1.0/24 for neutron
-virsh net-info bridge2 || ( virsh net-define bridge2.xml && virsh net-autostart bridge2 && virsh net-start bridge2 )
-
-# cat >/tmp/maas-private.xml <<EOF
-# <network>
-#   <name>maas-private</name>
-#   <uuid>c46a86d4-3111-ddfa-1118-922b78d37600</uuid>
-#   <bridge name='virbr1' stp='on' delay='0' />
-#   <mac address='52:54:11:26:F2:BC'/>
-# </network>
-# EOF
-
-# cat >/tmp/maas-external.xml <<EOF
-# <network>
-#   <name>maas-external</name>
-#   <uuid>c46a86d4-3111-ddfa-1118-922b78201208</uuid>
-#   <bridge name='virbr2' stp='on' delay='0' />
-#   <mac address='52:54:11:26:F2:BD'/>
-# </network>
-# EOF
-# for net in maas-private maas-external; do
-#     virsh net-define /tmp/$net.xml
-#     virsh net-autostart $net
-#     virsh net-start $net
-# done
-sudo ifup br0
-sudo ifup br1
-[ -d /home/maas ] || sudo install -d /home/maas --owner maas --group maas
-sudo chsh maas -s /bin/bash
-[ -d /home/maas/.ssh ] || echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /home/maas/.ssh/id_rsa
-[ -f /home/maas/.ssh/config ] || sudo -u maas tee /home/maas/.ssh/config <<EOF
-Host *
-   UserKnownHostsFile /dev/null
-   StrictHostKeyChecking no
-EOF
-grep 'maas@' ~/.ssh/authorized_keys || sudo cat /home/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
-# 10.14.4.1 known hosts
-
-# create the kvms, not in loop due to neutron being different
-echo -e "virt-install juju instance"
-virsh list --all --name | grep juju || sudo virt-install --name juju --ram 4096 --disk path=/mnt/juju_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=br1 --boot network || true
-echo -e "virt-install lds instance"
-virsh list --all --name | grep lds || sudo virt-install --name lds --ram 4096 --disk path=/mnt/lds_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=br1 --boot network || true
-echo -e "virt-install neutron instance"
-virsh list --all --name | grep neutron || sudo virt-install --name neutron --ram 4096 --disk path=/mnt/neutron_disk,size=20 --vcpus=2 --os-type=linux --pxe --network=bridge=virbr1 --network=bridge=br1 --boot network || true
-
-# loop to fixup the kvms
-for system in juju lds neutron; do
-    mac=$(virsh dumpxml $system | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
-    system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
-    # until [ $system_id ]; do
-    #     system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
-    #     sleep 10
-    # done
-    maas-cli admin node update $system_id hostname=$system.master power_type=virsh power_parameters_power_address=qemu+ssh://ubuntu@10.14.4.1/system power_parameters_power_id=$system
-    maas-cli admin tags new name=$system || true
-    maas-cli admin tag update-nodes $system add=$system_id
-    maas-cli admin tag update-nodes use-fastpath-installer add=$system_id
-    maas-cli admin node commission $system_id || true
-done
-
-
-for system in juju lds neutron; do
-    mac=$(virsh dumpxml $system | python -c 'import sys, lxml.etree; print list(lxml.etree.parse(sys.stdin).iter("mac"))[0].get("address")')
-    system_id=$(maas-cli admin nodes list mac_address=$mac | grep system_id | cut -d'"' -f4)
-    echo "Waiting for $system to be Ready"
-    until maas-cli admin node read $system_id | grep status | awk {'print $2'} | grep '4,'; do echo -n '.'; sleep 5; done
-done
-
-
-# set all physical nodes to use fast installer
-
-for system in node1 node2 node3 node4 node5 node6 node7 node8 node9; do
-   system_id=$(maas-cli admin nodes list hostname=$system.master | grep system_id | cut -d'"' -f4)
-   maas-cli admin tag update-nodes use-fastpath-installer add=$system_id
-done
-
-#Add Tag NUC to identify physical nodes
-maas-cli admin tag new name='nuc' comment='physical nuc nodes' definition='//node[@id="core"]/product = "D53427RKE"'
-
-# DNS forwarding, /etc/bind/named.conf.options
-
-[ -d ~/.juju ] || mkdir ~/.juju
-
-maas_oauth=$(maas-cli list | awk '{ print $3 }')
-
-cat > ~/.juju/environments.yaml <<EOF
-environments:
-    maas:
-        type: maas
-        admin-secret: Password1+
-
-        # maas-server specifies the location of the MAAS server. It must
-        # specify the base path.
-        maas-server: 'http://10.14.4.1/MAAS/'
-        
-        # maas-oauth holds the OAuth credentials from MAAS.
-        maas-oauth: '$maas_oauth'
-EOF
-
-echo "Install script finished"

=== removed file 'usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh'
--- usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh	2014-06-10 23:44:37 +0000
+++ usr/lib/orange-box/examples/openstack/complex/remove-kvms.sh	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# BE FOREWARNED!
-#
-# THIS SCRIPT
-#	TAKES NODES 1-9 BACK TO BASE READY STATE
-#	ELIMINATES ALL KVMS FROM NODE 0
-#	TAKES MAAS STATE BACK TO BASE LEVELS
-#
-# THIS SCRIPT WILL LEAVE ALONE
-# 	The LVM setup
-#	The networking setup (including DNS/DHCP info)
-#	The MAAS basic setup (including maas user/ssh,
-#	  but not juju environment/bootstrap info)
-#
-
-set -e
-echo -e "Clear juju environment with juju destroy-environment"
-echo -e "This will set nodes 1-9 back to Ready state in MAAS"
-echo -e "and delete the ~/.juju/environments dir."
-juju destroy-environment maas || true
-rm -rf ~/.juju/environments
-
-echo -e "Removing the ssh known_hosts file"
-rm -f ~/.ssh/known_hosts
-
-echo -e " Delete virtual nodes from MAAS state"
-#nodes=$(maas-cli admin tag nodes virtual | grep system_id | sed -e 's/", $//' -e 's/^.*"//')
-#for node in $nodes;do 
-#	echo "Deleting virtual node: $node from MAAS."
-#	maas-cli admin node delete $node
-#done
-for nodename in juju lds neutron; do
-	system_id=$(maas-cli admin nodes list hostname=$nodename.master | grep system_id | cut -d'"' -f4)
-	echo -e  "Deleting virtual node: $nodename == $system_id from MAAS."
-	maas-cli admin node delete $system_id || :
-done
-
-echo -e "Deleting KVMs from node 0"
-
-set +e # We want to try all of these
-sudo virsh destroy juju
-sudo virsh destroy lds
-sudo virsh destroy neutron
-sudo virsh undefine juju
-sudo virsh undefine lds
-sudo virsh undefine neutron
-set -e
-
-echo -e "Removing virtual bridge2"
-sudo virsh net-destroy bridge2
-
-echo -e "Done."

=== removed file 'usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh'
--- usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh	2014-07-16 07:31:25 +0000
+++ usr/lib/orange-box/examples/openstack/havana/99-cleanup.sh	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-#Destroy everything
-juju destroy-environment maas
-export AMT_PASSWORD=Password1+
-for i in $(seq 11 19); do
-	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
-done

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/00-bootstrap.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-#Canonical Micro-Cluster Demo Preparation
-echo "checking for existing Juju environment..."
-juju status && echo "Existing deployment found, exiting." && exit
-
-rm ~/.ssh/known_hosts
-
-juju env maas
-
-echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
-juju bootstrap --upload-tools=true --constraints "tags=bootstrap" --show-log --series=precise,trusty
-
-echo "unset constraints"
-juju set-constraints tags=""
-echo "Deploying Juju-gui to bootstrap node"
-juju deploy --to 0 juju-gui
-juju expose juju-gui
-

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -4,7 +4,7 @@
 set -ex
 
 juju set-constraints tags=
-juju-deployer -e maas -c  icehouseOB.yaml
+juju-deployer -c  icehouseOB.yaml
 
 
 echo "Deployment finished"

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/02-configure-openstack.sh	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "This command is run to configure an Orange-Box Openstack deployment"
-
-### assume you ran this :  sudo apt-get install python-keystone python-novaclient zile python-neutron python-glanceclient
-unset http_proxy 
-unset https_proxy
-
-QUANTUM_EXT_NET_GW="10.14.4.1"
-QUANTUM_EXT_NET_CIDR="10.14.4.0/24"
-QUANTUM_EXT_NET_NAME="ext_net"
-QUANTUM_DNS="10.14.4.1"
-QUANTUM_FLOAT_RANGE_START="10.14.4.20"
-QUANTUM_FLOAT_RANGE_END="10.14.4.49"
-
-QUANTUM_FIXED_NET_CIDR="192.168.14.0/24"
-QUANTUM_FIXED_NET_NAME="admin_net"
-
-keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
-
-echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
-export SERVICE_TOKEN=admin
-export OS_AUTH_URL=http://$keystone:35357/v2.0/
-export OS_USERNAME=admin
-export OS_PASSWORD=admin
-export OS_TENANT_NAME=admin
-export OS_REGION_NAME=RegionOne
-" > nova.rc
-
-source nova.rc
-
-# Determine the tenant id for the configured tenant name.
-export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
-
-#create ext network with neutron for floating IPs
-EXTERNAL_NETWORK_ID=$(neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True | grep " id" | awk '{print $4}')
-neutron subnet-create ext_net $QUANTUM_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
---allocation-pool start=$QUANTUM_FLOAT_RANGE_START,end=$QUANTUM_FLOAT_RANGE_END \
---gateway $QUANTUM_EXT_NET_GW --disable-dhcp --dns_nameservers $QUANTUM_DNS list=true
-
-#Create private network for neutron for tenant VMs
-neutron net-create private
-SUBNET_ID=$(neutron subnet-create private $QUANTUM_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $QUANTUM_DNS | grep " id" | awk '{print $4}')
-
-#Create router for external network and private network
-ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID provider-router | grep " id" | awk '{print $4}')
-neutron router-interface-add $ROUTER_ID $SUBNET_ID
-neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
-
-#Configure the default security group to allow ICMP and SSH
-nova  secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-nova  secgroup-add-rule default tcp 22 22 0.0.0.0/0
-#for rdp
-nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0
-
-#Upload a default SSH key
-nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default
-
-#Remove the m1.tiny as it is too small for Ubuntu.
-nova flavor-delete m1.tiny
-
-#Upload images to glance
-glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
-glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
-glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
-glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
-glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2
-
-exit
-

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/04-deploy-jumpserver-and-juju.sh	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-echo "This command is run to launch the first instance on a new Orange box Openstack deployment"
-
-source nova.rc
-
-#Modify quotas for the tenant to allow large deployments
-TENANT=$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{print $2}')
-nova quota-update --instances 50 $TENANT
-nova quota-update --cores 50 $TENANT
-nova quota-update --ram 102400 $TENANT
-nova quota-update --security-groups 50 $TENANT
-
-#Create a floating IP for the instance
-FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-
-#Launch an instance
-NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
-IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
-nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
-sleep 40
-
-#Associate the floating IP with the new instance
-nova floating-ip-associate jumpserver $FLOAT_IP
-sleep 10
-#SSH into the instance and install Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP sudo apt-get -y install juju-core juju-quickstart juju-deployer
-
-#Set up the Juju default environment
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP juju init
-
-#Output a juju env file that works on this cloud
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "echo 'default: openstack
-environments:
-    openstack:
-        type: openstack
-        network: private
-        auth-url: $OS_AUTH_URL
-        tenant-name: $OS_TENANT_NAME
-        region: $OS_REGION_NAME
-        auth-mode: userpass
-        username: $OS_USERNAME
-        password: $OS_PASSWORD
-        admin-secret: $OS_PASSWORD
-        default-series: precise
-' > ~/.juju/environments.yaml"
-
-#Create juju metadata
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s trusty"
-
-IMAGE_UUID="$(nova image-list | grep Precise | awk '{ print $2 }')"
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s precise"
-
-#Bootstrap Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju bootstrap --metadata-source=/home/ubuntu --upload-tools=true --series=precise,trusty"
-
-#Deploy juju-gui
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju deploy --to 0 juju-gui && juju expose juju-gui"
-
-#Create a new floating IP and associate with juju bootstrap instance
-INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
-FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2
-
-#Print the address of Juju-gui for deployments on Openstack
-echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
-echo "Pass: $OS_PASSWORD"
-
-exit
-

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/99-cleanup.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-#Destroy everything
-juju destroy-environment maas-trusty
-echo "wait a bit for maas to do his job"
-sleep 45
-export AMT_PASSWORD=Password1+
-for i in $(seq 11 19); do
-	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
-done
-

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/README'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/README	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/README	2014-07-24 01:23:40 +0000
@@ -1,10 +1,20 @@
-This demo will deploy Icehouse on 14.04
+This demo will deploy Icehouse on 12.04
 By the end of the demo you will have a working Openstack,
 plus a working Openstack Juju environment and GUI to deploy further workloads to.
-Just run each script in order:
-00-bootstrap.sh - This will boostrap Juju on the MAAS provider
-01-deploy.sh - This will deploy Openstack on the Orange Box.
-02-configure-openstack.sh - This will configure openstack ready to launch instances
-03-deploy-jumpserver-and-juju.sh - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
-99-cleanup.sh - This will destroy the Juju environment on the MAAS provider and make sure all NUC nodes are shut down.
+
+
+./01-deploy.sh - This will deploy Openstack on the Orange Box.
+orange-box-configure-openstack - This will configure openstack ready to launch instances
+
+orange-box-launch-openstack-juju - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
+
+OPTIONAL:
+./deploy-instances.sh - This will deploy a number of instances to show the cloud working.
+
+
+automated deployment
+For testing purposes or an unattended deployment, you can use the script:
+./automated-deployment.sh
+which will run the deployment scripts from bootstrap to deploying the jumpserver and juju-gui.
+This takes about 30 minutes.
 

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/automated-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+#Canonical Micro-Cluster auto-deployment bootstrap to tenant juju-gui
+set -e #-x for debugging output
+
+start=`date`
+orange-box-bootstrap-juju
+until (juju pprint | grep juju-gui | grep started) ; do
+             sleep 10
+         done
+./01-deploy.sh
+sleep 60
+orange-box-configure-openstack
+sleep 60
+source ~/nova.rc
+until (glance image-list | grep Precise | grep active) ; do
+             sleep 10
+         done
+until (glance image-list | grep Trusty | grep active) ; do
+             sleep 10
+         done
+orange-box-launch-openstack-juju
+end=`date`
+
+echo "Deployment started: $start"
+echo "Deployment completed: $end"
+

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/deploy-instances.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#This script expects you to already have a nova.rc file in this directory.
+#your nova.rc can be created manually or downlaoded from horizon dashboard.
+#it should look like this:
+#export SERVICE_ENDPOINT=http://HOST:35357/v2.0/
+#export SERVICE_TOKEN=admin
+#export OS_AUTH_URL=http://HOST:35357/v2.0/
+#export OS_USERNAME=admin
+#export OS_PASSWORD=admin
+#export OS_TENANT_NAME=admin
+#export OS_REGION_NAME=RegionOne
+#Where HOST is your keystone host or IP address.
+
+set -e
+
+echo "This command is run to deploy any number of instance on a new Orange box Openstack deployment"
+
+source nova.rc
+
+#How many instances to start
+echo "How many machines should be deployed? (Default is 0, 0-48)"
+read -n 2 instances
+if [ "$instances" = "0"  ] ; then
+   echo "You selected 0 instances to deploy, exiting!"
+   exit
+fi
+
+#Launch an instance
+NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
+IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
+for (( c=1; c<=$instances; c++ ))
+do
+	echo "Deploying test instance: $c"
+        nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default test-instance-$c
+done
+
+exit
+
+

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-24 01:23:40 +0000
@@ -4,7 +4,7 @@
     source: "cloud:precise-updates/icehouse"
   services:
     ceph:
-      charm: "cs:precise/ceph"
+      charm: "cs:precise/ceph-26"
       num_units: 3
       constraints: tags=physical
       options:
@@ -12,107 +12,134 @@
         "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
         "osd-devices": "/srv"
         "osd-reformat": "yes"
-    "ceph-radosgw": 
-      charm: "cs:precise/ceph-radosgw"
-      num_units: 1
-      constraints: tags=physical
+      annotations:
+        "gui-x": "2648.6688842773438"
+        "gui-y": "708.3873901367188"
     keystone: 
-      charm: "cs:precise/keystone"
+      charm: "cs:precise/keystone-37"
       num_units: 1
       constraints: tags=physical
       options: 
         "admin-password": "admin"
         "admin-token": "admin"
       annotations:
-        "gui-x": "1731.1756591796875"
-        "gui-y": "59.8729248046875"
+        "gui-x": "2013.905517578125"
+        "gui-y": "75.58013916015625"
     "nova-compute":
-      charm: "cs:precise/nova-compute"
+      charm: "cs:precise/nova-compute-31"
       num_units: 3
       to: [ceph=0, ceph=1, ceph=2]
       options:
         "flat-interface": eth0
       annotations:
-        "gui-x": "1325.8563232421875"
-        "gui-y": "-27.374825477600098"
+        "gui-x": "776.1040649414062"
+        "gui-y": "-81.22811031341553"
     "neutron-gateway":
-      charm: "cs:precise/quantum-gateway"
+      charm: "cs:precise/quantum-gateway-21"
       num_units: 1
       constraints: tags=neutron
       options:
         ext-port: eth1
         instance-mtu: 1400
       annotations:
-        "gui-x": "847.3951416015625"
-        "gui-y": "432.41436767578125"
+        "gui-x": "329.0572509765625"
+        "gui-y": "46.4658203125"
     "nova-cloud-controller": 
-      charm: "cs:precise/nova-cloud-controller"
+      charm: "cs:precise/nova-cloud-controller-41"
       num_units: 1
       constraints: tags=physical
       options: 
         "network-manager": Neutron
       annotations:
-        "gui-x": "1401.865234375"
-        "gui-y": "891.737548828125"
+        "gui-x": "1388.40185546875"
+        "gui-y": "-118.01156234741211"
     rabbitmq: 
-      charm: "cs:precise/rabbitmq-server"
+      charm: "cs:precise/rabbitmq-server-28"
       num_units: 1
-      to: 0
+      to: mysql
       annotations:
-        "gui-x": "2000.339111328125"
-        "gui-y": "420.60723876953125"
+        "gui-x": "633.8120727539062"
+        "gui-y": "862.6530151367188"
     glance: 
-      charm: "cs:precise/glance"
+      charm: "cs:precise/glance-34"
       num_units: 1
       to: nova-cloud-controller
       annotations:
-        "gui-x": "1008.2059936523438"
-        "gui-y": "734.3492889404297"
+        "gui-x": "1147.3269653320312"
+        "gui-y": "1389.5643157958984"
     cinder: 
-      charm: "cs:precise/cinder"
+      charm: "cs:precise/cinder-26"
       num_units: 1
       to: nova-cloud-controller
       options: 
         "block-device": none
       annotations:
-        "gui-x": "980.4285888671875"
-        "gui-y": "154.0172348022461"
+        "gui-x": "1752.32568359375"
+        "gui-y": "1365.716194152832"
     "ceph-radosgw":
-      charm: "cs:precise/ceph-radosgw"
+      charm: "cs:precise/ceph-radosgw-12"
       num_units: 1
       to: nova-cloud-controller
+      annotations:
+        "gui-x": "2216.68212890625"
+        "gui-y": "697.16796875"
     cinder-ceph:
-      charm: "cs:precise/cinder-ceph"
+      charm: "cs:precise/cinder-ceph-1"
+      num_units: 0
+      annotations:
+        "gui-x": "2257.5515747070312"
+        "gui-y": "1231.2130126953125"
     "openstack-dashboard": 
-      charm: "cs:precise/openstack-dashboard"
+      charm: "cs:precise/openstack-dashboard-20"
       num_units: 1
       to: "keystone"
+      options:
+        webroot: "/"
       annotations:
-        "gui-x": "2023.8385009765625"
-        "gui-y": "65.05170631408691"
+        "gui-x": "2353.6898193359375"
+        "gui-y": "-94.2642593383789"
     mysql: 
-      charm: "cs:precise/mysql"
+      charm: "cs:precise/mysql-46"
       num_units: 1
-      to: 0
+      constraints: tags=physical
       options:
         "dataset-size": "20%"
       annotations:
-        "gui-x": "1912.73876953125"
-        "gui-y": "762.34814453125"
+        "gui-x": "364.4567565917969"
+        "gui-y": "1067.5167846679688"
     mongodb:
-      charm: "cs:precise/mongodb"
+      charm: "cs:precise/mongodb-29"
       num_units: 1
       constraints: tags=physical
+      annotations:
+        "gui-x": "-70.0399979352951"
+        "gui-y": "1282.8224487304688"
     ceilometer:
-      charm: "cs:precise/ceilometer"
+      charm: "cs:precise/ceilometer-20"
       num_units: 1
       to: mongodb
+      annotations:
+        "gui-x": "-78.13333225250244"
+        "gui-y": "919.3128051757812"
     ceilometer-agent:
-      charm: "cs:precise/ceilometer-agent"
+      charm: "cs:precise/ceilometer-agent-18"
+      num_units: 0
+      annotations:
+        "gui-x": "-90.9158582687378"
+        "gui-y": "562.5347595214844"
     heat:
-      charm: "cs:precise/heat"
+      charm: "cs:precise/heat-3"
       num_units: 1
       to: mongodb
+      annotations:
+        "gui-x": "494.94012451171875"
+        "gui-y": "1363.6024169921875"
+    ntp:
+      charm: "cs:precise/ntp-3"
+      num_units: 0
+      annotations:
+        "gui-x": "-104.57728099822998"
+        "gui-y": "294.6641273498535"
   relations: 
     - - "keystone:shared-db"
       - "mysql:shared-db"
@@ -180,5 +207,33 @@
       - "ceph:radosgw"
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
+    - - "ntp:juju-info"
+      - "neutron-gateway:juju-info"
+    - - "ntp:juju-info"
+      - "ceph:juju-info"
+    - - "ntp:juju-info"
+      - "keystone:juju-info"
+    - - "ntp:juju-info"
+      - "nova-compute:juju-info"
+    - - "ntp:juju-info"
+      - "nova-cloud-controller:juju-info"
+    - - "ntp:juju-info"
+      - "rabbitmq:juju-info"
+    - - "ntp:juju-info"
+      - "glance:juju-info"
+    - - "ntp:juju-info"
+      - "cinder:juju-info"
+    - - "ntp:juju-info"
+      - "ceph-radosgw:juju-info"
+    - - "ntp:juju-info"
+      - "openstack-dashboard:juju-info"
+    - - "ntp:juju-info"
+      - "mysql:juju-info"
+    - - "ntp:juju-info"
+      - "mongodb:juju-info"
+    - - "ntp:juju-info"
+      - "ceilometer:juju-info"
+    - - "ntp:juju-info"
+      - "heat:juju-info"
   series: precise
 

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/00-bootstrap.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-#Canonical Micro-Cluster Demo Preparation
-echo "checking for existing Juju environment..."
-juju status && echo "Existing deployment found, exiting." && exit
-
-rm ~/.ssh/known_hosts
-
-juju env maas-trusty
-
-echo "Deploying Juju Bootstrap node to Virtual machine: juju.local using tags=juju"
-juju bootstrap --upload-tools=true --constraints "tags=bootstrap" --show-log --series=precise,trusty
-
-echo "unset constraints"
-juju set-constraints tags=""
-echo "Deploying Juju-gui to bootstrap node"
-juju deploy --to 0 juju-gui
-juju expose juju-gui
-

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/01-deploy.sh	2014-07-24 01:23:40 +0000
@@ -4,7 +4,7 @@
 set -ex
 
 juju set-constraints tags=
-juju-deployer -e maas-trusty -c  icehouseOB.yaml
+juju-deployer -c  icehouseOB.yaml
 
 
 echo "Deployment finished"

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/02-configure-openstack.sh	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "This command is run to configure an Orange-Box Openstack deployment"
-
-### assume you ran this :  sudo apt-get install python-keystone python-novaclient zile python-neutron python-glanceclient
-unset http_proxy 
-unset https_proxy
-
-QUANTUM_EXT_NET_GW="10.14.4.1"
-QUANTUM_EXT_NET_CIDR="10.14.4.0/24"
-QUANTUM_EXT_NET_NAME="ext_net"
-QUANTUM_DNS="10.14.4.1"
-QUANTUM_FLOAT_RANGE_START="10.14.4.20"
-QUANTUM_FLOAT_RANGE_END="10.14.4.49"
-
-QUANTUM_FIXED_NET_CIDR="192.168.14.0/24"
-QUANTUM_FIXED_NET_NAME="admin_net"
-
-keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
-
-echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
-export SERVICE_TOKEN=admin
-export OS_AUTH_URL=http://$keystone:35357/v2.0/
-export OS_USERNAME=admin
-export OS_PASSWORD=admin
-export OS_TENANT_NAME=admin
-export OS_REGION_NAME=RegionOne
-" > nova.rc
-
-source nova.rc
-
-# Determine the tenant id for the configured tenant name.
-export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
-
-#create ext network with neutron for floating IPs
-EXTERNAL_NETWORK_ID=$(neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True | grep " id" | awk '{print $4}')
-neutron subnet-create ext_net $QUANTUM_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
---allocation-pool start=$QUANTUM_FLOAT_RANGE_START,end=$QUANTUM_FLOAT_RANGE_END \
---gateway $QUANTUM_EXT_NET_GW --disable-dhcp --dns_nameservers $QUANTUM_DNS list=true
-
-#Create private network for neutron for tenant VMs
-neutron net-create private
-SUBNET_ID=$(neutron subnet-create private $QUANTUM_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $QUANTUM_DNS | grep " id" | awk '{print $4}')
-
-#Create router for external network and private network
-ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID provider-router | grep " id" | awk '{print $4}')
-neutron router-interface-add $ROUTER_ID $SUBNET_ID
-neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
-
-#Configure the default security group to allow ICMP and SSH
-nova  secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-nova  secgroup-add-rule default tcp 22 22 0.0.0.0/0
-#for rdp
-nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0
-
-#Upload a default SSH key
-nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default
-
-#Remove the m1.tiny as it is too small for Ubuntu.
-nova flavor-delete m1.tiny
-
-#Upload images to glance
-glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
-glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
-glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
-glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
-glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20131117.qcow2
-
-exit
-

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/04-deploy-jumpserver-and-juju.sh	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-echo "This command is run to launch the first instance on a new Orange box Openstack deployment"
-
-source nova.rc
-
-#Modify quotas for the tenant to allow large deployments
-TENANT=$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{print $2}')
-nova quota-update --instances 50 $TENANT
-nova quota-update --cores 50 $TENANT
-nova quota-update --ram 102400 $TENANT
-nova quota-update --security-groups 50 $TENANT
-
-#Create a floating IP for the instance
-FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-
-#Launch an instance
-NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
-IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
-nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
-sleep 40
-
-#Associate the floating IP with the new instance
-nova floating-ip-associate jumpserver $FLOAT_IP
-sleep 10
-#SSH into the instance and install Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP sudo apt-get -y install juju-core juju-quickstart juju-deployer
-
-#Set up the Juju default environment
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP juju init
-
-#Output a juju env file that works on this cloud
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "echo 'default: openstack
-environments:
-    openstack:
-        type: openstack
-        network: private
-        auth-url: $OS_AUTH_URL
-        tenant-name: $OS_TENANT_NAME
-        region: $OS_REGION_NAME
-        auth-mode: userpass
-        username: $OS_USERNAME
-        password: $OS_PASSWORD
-        admin-secret: $OS_PASSWORD
-        default-series: trusty
-' > ~/.juju/environments.yaml"
-
-#Create juju metadata
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s trusty"
-
-IMAGE_UUID="$(nova image-list | grep Precise | awk '{ print $2 }')"
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s precise"
-
-#Bootstrap Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju bootstrap --metadata-source=/home/ubuntu --upload-tools=true --series=precise,trusty"
-
-#Deploy juju-gui
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju deploy --to 0 juju-gui && juju expose juju-gui"
-
-#Install the Orange-box-examples package
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "sudo apt-add-repository ppa:orange-box-examples/ppa && sudo apt-get update && sudo apt-get install -y orange-box-examples"
-
-#Create a new floating IP and associate with juju bootstrap instance
-INSTANCE_ID="$(nova list | grep juju-openstack-machine-0 | awk '{ print $2}')"
-FLOAT_IP2="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-nova floating-ip-associate $INSTANCE_ID $FLOAT_IP2
-
-#Print the address of Juju-gui for deployments on Openstack
-echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
-echo "Pass: $OS_PASSWORD"
-
-echo "OR Log in to openstack Jumpserver to deploy from command line"
-echo "ssh ubuntu@$FLOAT_IP"
-exit
-

=== removed file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/99-cleanup.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-#Destroy everything
-juju destroy-environment maas-trusty
-echo "wait a bit for maas to do his job"
-sleep 45
-export AMT_PASSWORD=Password1+
-for i in $(seq 11 19); do
-	yes | amttool 10.14.4.$i powerdown >/dev/null 2>&1
-done
-

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/README'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/README	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/README	2014-07-24 01:23:40 +0000
@@ -1,10 +1,20 @@
 This demo will deploy Icehouse on 14.04
 By the end of the demo you will have a working Openstack,
 plus a working Openstack Juju environment and GUI to deploy further workloads to.
+
 Just run each script in order:
-00-bootstrap.sh - This will boostrap Juju on the MAAS provider
-01-deploy.sh - This will deploy Openstack on the Orange Box.
-02-configure-openstack.sh - This will configure openstack ready to launch instances
-03-deploy-jumpserver-and-juju.sh - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
-99-cleanup.sh - This will destroy the Juju environment on the MAAS provider and make sure all NUC nodes are shut down.
+./01-deploy.sh - This will deploy Openstack on the Orange Box.
+orange-box-configure-openstack - This will configure openstack ready to launch instances
+
+orange-box-launch-openstack-juju - This will deploy a Jumpserver with a public IP for SSH access into the tenant private network, install Juju and create an Openstack Juju environment, bootstrap and launch the GUI and print the public IP of the GUI.
+
+OPTIONAL:
+./deploy-instances.sh - This will deploy a number of instances to show the cloud working.
+
+
+automated deployment
+For testing purposes or an unattended deployment, you can use the script:
+./automated-deployment.sh
+which will run the deployment scripts from bootstrap to deploying the jumpserver and juju-gui.
+This takes about 30 minutes.
 

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/automated-deploy.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+#Canonical Micro-Cluster auto-deployment bootstrap to tenant juju-gui
+set -e #-x for debugging output
+
+start=`date`
+orange-box-bootstrap-juju trusty
+until (juju pprint | grep juju-gui | grep started) ; do
+             sleep 10
+         done
+./01-deploy.sh
+sleep 60
+orange-box-configure-openstack
+sleep 60
+source ~/nova.rc
+until (glance image-list | grep Precise | grep active) ; do
+             sleep 10
+         done
+until (glance image-list | grep Trusty | grep active) ; do
+             sleep 10
+         done
+orange-box-launch-openstack-juju
+end=`date`
+
+echo "Deployment started: $start"
+echo "Deployment completed: $end"
+

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/deploy-instances.sh	2014-07-24 01:23:40 +0000
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#This script expects you to already have a nova.rc file in this directory.
+#your nova.rc can be created manually or downlaoded from horizon dashboard.
+#it should look like this:
+#export SERVICE_ENDPOINT=http://HOST:35357/v2.0/
+#export SERVICE_TOKEN=admin
+#export OS_AUTH_URL=http://HOST:35357/v2.0/
+#export OS_USERNAME=admin
+#export OS_PASSWORD=admin
+#export OS_TENANT_NAME=admin
+#export OS_REGION_NAME=RegionOne
+#Where HOST is your keystone host or IP address.
+
+set -e
+
+echo "This command is run to deploy any number of instance on a new Orange box Openstack deployment"
+
+source nova.rc
+
+#How many instances to start
+echo "How many machines should be deployed?"
+read -n 2 instances
+if [ "$instances" = "0"  ] ; then
+   echo "You selected 0 instances to deploy, exiting!"
+   exit
+fi
+
+#Launch an instance
+NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
+IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
+for (( c=1; c<=$instances; c++ ))
+do
+	echo "Deploying test instance: $c"
+        nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default test-instance-$c
+done
+
+exit
+
+

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-14 07:26:29 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-24 01:23:40 +0000
@@ -1,10 +1,10 @@
 icehouse:
   overrides:
-    openstack-origin: distro
-    source: distro
+    openstack-origin: "cloud:trusty-icehouse"
+    source: "distro"
   services:
     ceph:
-      charm: "cs:trusty/ceph"
+      charm: "cs:trusty/ceph-27"