Merge lp:~thomnico/orange-box-examples/telco into lp:orange-box-examples

[Nicolas Thomas]

[Darryl Weaver (dweaver)]

Already merged

review: Disapprove

[lp:~thomnico/orange-box-examples/telco]

71. By Nicolas Thomas on 2014-11-12

modified:
  bin/orange-box-launch-openstack-juju
pending merges:
  Darryl Weaver 2014-11-12 Modified orange-box-launch-openstack-juju to correct errors.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2014-10-28 18:40:11 +0000
+++ .bzrignore	2014-11-10 14:55:38 +0000
@@ -1,4 +1,2 @@
 precise
-telco/precise
-telco/trusty
 cloudfoundry/trusty

=== modified file 'telco/01-deploy.sh'
--- telco/01-deploy.sh	2014-10-27 15:23:26 +0000
+++ telco/01-deploy.sh	2014-11-10 14:55:38 +0000
@@ -13,5 +13,5 @@
     export JUJU_REPOSITORY=$PWD
     juju-deployer -c bundle-telco.yaml
 else
-    echo "Run ./bzr-sync-local-charms before running this script"
+    echo "Run ./sync-local-charms before running this script"
 fi

=== modified file 'telco/bundle-telco-store.yaml'
--- telco/bundle-telco-store.yaml	2014-11-10 00:33:48 +0000
+++ telco/bundle-telco-store.yaml	2014-11-10 14:55:38 +0000
@@ -78,7 +78,7 @@
         "gui-x": "-857.8215242215981"
         "gui-y": "698.5485784445332"
     sipml5: 
-      charm: "local:trusty/sipml5"
+      charm: "cs:~thomnico/trusty/sipml5"
       num_units: 1
       expose: true
       annotations: 

=== modified file 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml	2014-11-10 00:33:48 +0000
+++ telco/bundle-telco.yaml	2014-11-10 14:55:38 +0000
@@ -78,6 +78,7 @@
         "gui-x": "-857.8215242215981"
         "gui-y": "698.5485784445332"
     sipml5: 
+#      charm: "cs:~thomnico/trusty/sipml5"
       charm: "local:trusty/sipml5"
       num_units: 1
       expose: true

=== added directory 'telco/precise'
=== added directory 'telco/precise/clearwater-bono'
=== added file 'telco/precise/clearwater-bono/README.md'
--- telco/precise/clearwater-bono/README.md	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/README.md	2014-11-10 14:55:38 +0000
@@ -0,0 +1,90 @@
+# Overview
+
+This charm supports deployment and scaling of the Bono component of a Project Clearwater system.  See http://www.projectclearwater.org for more information on Project Clearwater.
+
+# Usage
+
+The Bono service should be deployed as part of a Clearwater system.  A Clearwater system can be deployed in a Juju environment by creating a config.yaml file then running the following commands.
+
+    juju deploy --config config.yaml clearwater-route53
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-ellis
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-bono
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-sprout
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homestead
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homer
+    juju add-relation clearwater-ellis clearwater-route53:register-ellis
+    juju add-relation clearwater-bono clearwater-route53:register-bono
+    juju add-relation clearwater-sprout clearwater-route53:register-sprout
+    juju add-relation clearwater-homestead clearwater-route53:register-homestead
+    juju add-relation clearwater-homer clearwater-route53:register-homer
+    juju expose clearwater-bono
+    juju expose clearwater-ellis
+
+The config.yaml configuration file takes the following format.
+
+    clearwater-route53:
+      zone: <domain>
+      access_key: <ec2 access key>
+      secret_key: <ec2 secret access key>
+      sas: "0.0.0.0"
+
+    clearwater-ellis:
+      smtp_server: smtp.cw-ngv.com
+      smtp_username: username
+      smtp_password: password
+      email_sender: [e-mail]<mailto:[e-mail]>
+      signup_key: secret
+      base_number: "6505550000"
+      number_count: 1000
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-bono:
+      turn_workaround: password
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-sprout:
+      reg_min_expires: 400
+      session_max_expires: 900
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homestead:
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homer:
+      repo: http://repo.cw-ngv.com/stable
+
+Note that the clearwater-bono charm can only be deployed on the `amd64` architecture.
+
+## Scale out Usage
+
+## Known Limitations and Issues
+
+The only currently supported DNS service for Clearwater is clearwater-route53 (when deploying in Amazon EC2), so will currently only work on EC2.  Additional DNS services will be added for other environments in future.
+
+clearwater-bono currently only supports running as a single unit.  Clustering support will be released shortly, which will allow units to be added to and removed from a clearwater-bono deployment using juju add-unit and juju remove-unit commands.
+
+Note that this charm does not current pass charm proof because its hooks use EC2 APIs directly to obtain the public IP address rather than unit-get public-address.  This is to work around what looks like a Juju bug - unit-get public-address on EC2 returns the public hostname of the unit rather than the public IP address.  Unfortunately EC2 public hostname are actually split horizon hostnames, so if you attempt to resolve the hostname from within EC2 it actually resolved to a private IP address - it will only resolve to a public address if resolved from outside EC2.
+
+# Configuration
+
+Clearwater has a number of configuration fields which are non-defaultable.  These are as follows.
+
+clearwater-route53
+
+-  `zone:` This must be set to a DNS zone name which is managed by the AWS Route53 service.
+-  `access_key:` and `secret_key:` These must be set to the AWS access key and secret key of the AWS account which owns the DNS zone name.
+
+clearwater-ellis
+
+-  `signup_key:` This is used as a signup key on the Ellis self-provisioning portal, so should be set to a unique string for each installation.
+-  `base_number:` and `number_count:` These define the telephone number range assigned to the Clearwater system.
+
+# Contact Information
+
+## Upstream Project Name
+
+See http:www.projectclearwater.org and https://github.com/Metaswitch/clearwater-docs/wiki for information about clearwater.
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+The Clearwater mailing list is at lists.projectclearwater.org.

=== added file 'telco/precise/clearwater-bono/config.yaml'
--- telco/precise/clearwater-bono/config.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/config.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,20 @@
+options:
+  zone:
+    description: The DNS root zone for this service
+    type: string
+  sas:
+    default: ""
+    description: The location of the SAS server
+    type: string
+  turn_workaround: 
+    default: ""
+    description: TURN workaround password, used by faulty WebRTC clients
+    type: string
+  trusted_peers:
+    default: ""
+    description: Comma-separated list of IP addresses of trusted peers
+    type: string
+  repo:
+    default: http://repo.cw-ngv.com/stable
+    description: The location of the repo server
+    type: string

=== added file 'telco/precise/clearwater-bono/copyright'
--- telco/precise/clearwater-bono/copyright	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/copyright	2014-11-10 14:55:38 +0000
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2013  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at [e-mail] or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.

=== added directory 'telco/precise/clearwater-bono/hooks'
=== added file 'telco/precise/clearwater-bono/hooks/config-changed'
--- telco/precise/clearwater-bono/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/config-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Update the /etc/clearwater/config file, the node.json, and re-run
+# chef-solo
+$CHARM_DIR/lib/config_script
+$CHARM_DIR/lib/node_json_script
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-bono/hooks/install'
--- telco/precise/clearwater-bono/hooks/install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+# This is a big hack.  Juju on EC2 returns hostnames rather than IP addresses
+# for public-address and private-address.  To work-around this, we resolve the
+# host names.  However, after we've joined to the DNSaaS charm, we can no longer
+# resolve these, so add them to /etc/hosts.
+if ! grep "# added by clearwater-*/hooks/install" /etc/hosts ; then
+  private_address=$(unit-get private-address)
+  public_address=$(unit-get public-address)
+  private_ip=$($CHARM_DIR/lib/unit-get private-address)
+  public_ip=$($CHARM_DIR/lib/unit-get public-address)
+  [ "$private_address" = "$private_ip" ] || echo "$private_ip $private_address # added by clearwater-*/hooks/install" >>/etc/hosts
+  [ "$public_address" = "$public_ip" ] || echo "$public_ip $public_address $(sed -e 's/\..*$//' <<< $public_address) # added by clearwater-*/hooks/install" >>/etc/hosts
+  echo "$public_ip bono-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone) # added by clearwater-*/hooks/install" >>/etc/hosts
+fi
+
+# Install chef solo, and create the node.json and config file
+$CHARM_DIR/lib/chef_solo_install
+$CHARM_DIR/lib/node_json_script
+$CHARM_DIR/lib/config_script
+
+apt-get update
+
+# Install the node
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Expose the correct ports
+open-port 22/tcp
+open-port 123/udp
+open-port 161/udp
+open-port 3478/tcp
+open-port 3478/udp
+open-port 5060/tcp
+open-port 5060/udp
+open-port 5062/tcp
+open-port 6666/tcp

=== added file 'telco/precise/clearwater-bono/hooks/programmable-multiple-relation-changed'
--- telco/precise/clearwater-bono/hooks/programmable-multiple-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/programmable-multiple-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+# Set our DNS requirements
+TTL=300
+id=$(cut -d/ -f2 <<< $JUJU_UNIT_NAME)
+ip=$($CHARM_DIR/lib/unit-get public-address)
+relation-set domain=$(config-get zone)
+relation-set resources='@ '$TTL' IN A '$ip'
+@ '$TTL' IN NAPTR 1 1 "S" "SIP+D2T" "" _sip._tcp
+@ '$TTL' IN NAPTR 2 1 "S" "SIP+D2U" "" _sip._udp
+_sip._tcp '$TTL' IN SRV 0 0 5060 bono-'$id'
+_sip._udp '$TTL' IN SRV 0 0 5060 bono-'$id'
+bono-'$id' '$TTL' IN A '$ip
+
+# Update our DNS server
+if [ "$(relation-get public-address)" != "" ]
+then
+  echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
+  mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
+  service dnsmasq restart
+fi
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script programmable-multiple
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-bono/hooks/ralf-ctf-relation-changed'
--- telco/precise/clearwater-bono/hooks/ralf-ctf-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/ralf-ctf-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script ralf-ctf
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-bono/hooks/scscf-relation-changed'
--- telco/precise/clearwater-bono/hooks/scscf-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/scscf-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script scscf
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-bono/hooks/start'
--- telco/precise/clearwater-bono/hooks/start	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/start	2014-11-10 14:55:38 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# This hook needs to be idempotent, so this could be run when bono is
+# already running, when it's running but not monitored by monit, when
+# it's stopped but being monitored (so it's about to start), or stopped
+# and unmonitored. To cover all these cases, stop monit, start bono, start
+# monit, then finally have monit monitor bono
+service monit stop
+service bono start
+service monit start
+sleep 1
+monit monitor bono

=== added file 'telco/precise/clearwater-bono/hooks/stop'
--- telco/precise/clearwater-bono/hooks/stop	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/stop	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Stop bono via monit
+sudo service monit start
+sudo monit stop bono

=== added file 'telco/precise/clearwater-bono/hooks/upgrade-charm'
--- telco/precise/clearwater-bono/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/hooks/upgrade-charm	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install and
+# hooks/config-changed to ensure all updates are processed
+set -e
+
+$CHARM_DIR/hooks/install
+$CHARM_DIR/hooks/config-changed

=== added file 'telco/precise/clearwater-bono/icon.svg'
--- telco/precise/clearwater-bono/icon.svg	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/icon.svg	2014-11-10 14:55:38 +0000
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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
+AABJRU5ErkJggg==
+"
+       height="96"
+       width="96"
+       style="stroke:#000000;stroke-opacity:0.18666669" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added directory 'telco/precise/clearwater-bono/lib'
=== added file 'telco/precise/clearwater-bono/lib/chef_solo_install'
--- telco/precise/clearwater-bono/lib/chef_solo_install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/chef_solo_install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This covers installing chef-solo and the Clearwater chef recipes
+# Install needed libraries
+apt-get -y install git libxml2-dev libxslt1-dev wget curl
+
+# Install chef
+install_sh="http://opscode.com/chef/install.sh"
+version_string="-v 11.6.0"
+bash <(wget  ${install_sh} -O -) ${version_string}
+
+# Pull down the Clearwater chef recipes
+if [ ! -d /home/ubuntu/chef-solo ]
+then
+  mkdir /home/ubuntu/chef-solo
+  git clone --recursive -b master git://github.com/Metaswitch/chef.git /home/ubuntu/chef-solo
+fi
+
+# Update the chef recipes
+cd /home/ubuntu/chef-solo
+git pull origin --recurse-submodules master
+
+# Create the solo.rb file
+cat > /home/ubuntu/chef-solo/solo.rb <<EOP
+file_cache_path "/var/chef-solo"
+cookbook_path  [
+    "/home/ubuntu/chef-solo/cookbooks"
+]
+data_bag_path "/home/ubuntu/chef-solo/data_bags"
+environment_path "/home/ubuntu/chef-solo/environments"
+role_path "/home/ubuntu/chef-solo/roles"
+verbose_logging true
+log_level :debug
+EOP

=== added file 'telco/precise/clearwater-bono/lib/config_script'
--- telco/precise/clearwater-bono/lib/config_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/config_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+relation_name=$1
+
+set -e
+
+# Defaults
+sprout_hostname=sprout.$(config-get zone)
+hs_hostname=homestead.$(config-get zone):8888
+hs_provisioning_hostname=homestead.$(config-get zone):8889
+xdms_hostname=
+ralf_hostname=
+enum_server=
+
+# Import existing configuration
+[ ! -f /etc/clearwater/config ] || . /etc/clearwater/config
+
+# Apply new configuration
+home_domain=$(config-get zone)
+[ "$relation-name" != "scscf" ] || [ "$(relation-get public-address)" = "" ] || sprout_hostname=$(relation-get public-address)
+[ "$relation-name" != "ralf-ctf" ] || [ "$(relation-get public-address)" = "" ] || ralf_hostname=$(relation-get public-address):9888
+sas_server=$(config-get sas)
+local_ip=$($CHARM_DIR/lib/unit-get private-address)
+public_ip=$($CHARM_DIR/lib/unit-get public-address)
+public_hostname=bono-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone)
+turn_workaround=$(config-get turn_workaround)
+
+# Write configuration back
+mkdir -p /etc/clearwater
+cat >/etc/clearwater/config <<EOF
+# Deployment definitions
+home_domain=$home_domain
+sprout_hostname=$sprout_hostname
+hs_hostname=$hs_hostname
+hs_provisioning_hostname=$hs_provisioning_hostname
+xdms_hostname=$xdms_hostname
+ralf_hostname=$ralf_hostname
+sas_server=$sas_server
+enum_server=$enum_server
+
+# Local IP configuration
+local_ip=$local_ip
+public_ip=$public_ip
+public_hostname=$public_hostname
+
+# Keys
+turn_workaround=$turn_workaround
+EOF

=== added file 'telco/precise/clearwater-bono/lib/node_json_script'
--- telco/precise/clearwater-bono/lib/node_json_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/node_json_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+
+import subprocess
+import string
+import socket
+import os
+import argparse
+
+# Create the ~/chef-solo/node.json file.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and after
+# clustering the tag 'clustered' is added (for homer/homestead)
+#
+# The node.json file is templated in lib/node_json_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--tag', action='store_true')
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(subprocess.check_output(["unit-get", "private-address"]).rstrip())
+d['MACHINE_ID'] = str(int(os.environ['JUJU_UNIT_NAME'].split('/')[1]) + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+d['TRUSTED_PEERS'] = ','.join(['"' + ip + '"' for ip in subprocess.check_output(["config-get", "trusted_peers"]).rstrip().split(',')])
+
+node_file = "/home/ubuntu/chef-solo/node.json"
+if args.cluster or (os.path.exists(node_file) and "clustered" in open(node_file).read()):
+        d['CLUSTER'] = ",\n    \"role[clustered]\""
+        d['CLUSTERED'] = ", \"clustered\""
+        d['TAG'] = ""
+
+        if args.tag or (os.path.exists(node_file) and "tags" in open(node_file).read()):
+                d['TAG'] = ",\n  \"tags\": [\"clustered\"]"
+
+else:
+        d['CLUSTER'] = ""
+        d['CLUSTERED'] = ""
+        d['TAG'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/node.json
+with open('/home/ubuntu/chef-solo/node.json', 'w') as f:
+        f.write(result)

=== added file 'telco/precise/clearwater-bono/lib/node_json_template'
--- telco/precise/clearwater-bono/lib/node_json_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/node_json_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,18 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "role": "bono",
+  "roles": ["clearwater-infrastructure", "bono"$CLUSTERED],
+  "cloud": {
+    "local_ipv4": "$LOCAL_IP"
+  },
+  "clearwater": {
+    "index": $MACHINE_ID,
+    "repo_server": "$REPO",
+    "trusted_peers": [$TRUSTED_PEERS]
+  },
+  "run_list": [
+    "role[bono]"$CLUSTER
+  ]$TAG
+}

=== added file 'telco/precise/clearwater-bono/lib/restart'
--- telco/precise/clearwater-bono/lib/restart	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/restart	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Restart clearwater-infrastructure, and stop bono (to be restarted by monit)
+service clearwater-infrastructure restart
+service bono stop

=== added file 'telco/precise/clearwater-bono/lib/unit-get'
--- telco/precise/clearwater-bono/lib/unit-get	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/lib/unit-get	2014-11-10 14:55:38 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -ex
+onEC2=false
+key=$1
+val=$(unit-get $1)
+
+if [ -f $CHARM_DIR/lib/provider.txt ]
+then
+    PROVIDER=`cat $CHARM_DIR/lib/provider.txt `
+else
+    #checking dirty ec2 hack will work
+    wget  -q http://169.254.169.254/latest/meta-data/public-ipv4 && onEC2=true
+    if ( "$onEC2" == true )
+    then
+	echo "EC2" >  $CHARM_DIR/lib/provider.txt
+    else
+	echo "NOTEC2" >  $CHARM_DIR/lib/provider.txt
+    fi
+fi
+
+if [ "$PROVIDER" == "EC2" ]
+then
+ if [ "$key" = "public-address" ] &&   [ -n "$(dig +short $val | head -1)" ]
+  then
+   val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+ elif [ "$key" = "private-address" ]
+ then
+   val_ip=$(dig +short $val | head -1)
+   [ -z "$val_ip" ] || val=$val_ip
+   ##if val_ip is empty getting the system IP
+   [ -z "$val_ip" ] && val=`ip route | grep src | cut -d " " -f 12`
+ fi
+fi
+
+echo $val
+

=== added file 'telco/precise/clearwater-bono/metadata.yaml'
--- telco/precise/clearwater-bono/metadata.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/metadata.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,15 @@
+name: clearwater-bono
+summary: Bono charm for Project Clearwater
+maintainer: Project Clearwater Maintainers <[e-mail]>
+description: Bono charm for Project Clearwater
+categories:
+  - misc
+subordinate: false
+requires:
+  programmable-multiple:
+    interface: dns-multi
+  scscf:
+    interface: 3GPP-Mr
+  ralf-ctf:
+    interface: ralf-ctf-interface
+    optional: true

=== added file 'telco/precise/clearwater-bono/revision'
--- telco/precise/clearwater-bono/revision	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-bono/revision	2014-11-10 14:55:38 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'telco/precise/clearwater-ellis'
=== added file 'telco/precise/clearwater-ellis/README.md'
--- telco/precise/clearwater-ellis/README.md	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/README.md	2014-11-10 14:55:38 +0000
@@ -0,0 +1,90 @@
+# Overview
+
+This charm supports deployment of the Ellis self-provisioning portal for Project Clearwater system.  See http://www.projectclearwater.org for more information on Project Clearwater.
+
+# Usage
+
+The Ellis service should be deployed as part of a Clearwater system.  A Clearwater system can be deployed in a Juju environment by creating a config.yaml file then running the following commands.
+
+    juju deploy --config config.yaml clearwater-route53
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-ellis
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-bono
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-sprout
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homestead
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homer
+    juju add-relation clearwater-ellis clearwater-route53:register-ellis
+    juju add-relation clearwater-bono clearwater-route53:register-bono
+    juju add-relation clearwater-sprout clearwater-route53:register-sprout
+    juju add-relation clearwater-homestead clearwater-route53:register-homestead
+    juju add-relation clearwater-homer clearwater-route53:register-homer
+    juju expose clearwater-bono
+    juju expose clearwater-ellis
+
+The config.yaml configuration file takes the following format.
+
+    clearwater-route53:
+      zone: <domain>
+      access_key: <ec2 access key>
+      secret_key: <ec2 secret access key>
+      sas: "0.0.0.0"
+
+    clearwater-ellis:
+      smtp_server: smtp.cw-ngv.com
+      smtp_username: username
+      smtp_password: password
+      email_sender: [e-mail]<mailto:[e-mail]>
+      signup_key: secret
+      base_number: "6505550000"
+      number_count: 1000
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-bono:
+      turn_workaround: password
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-sprout:
+      reg_min_expires: 400
+      session_max_expires: 900
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homestead:
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homer:
+      repo: http://repo.cw-ngv.com/stable
+
+Note that the clearwater-ellis charm can only be deployed on the `amd64` architecture.
+
+## Scale out Usage
+
+Ellis does not currently support scaling out.
+
+## Known Limitations and Issues
+
+The only currently supported DNS service for Clearwater is clearwater-route53 (when deploying in Amazon EC2), so will currently only work on EC2.  Additional DNS services will be added for other environments in future.
+
+Note that this charm does not current pass charm proof because its hooks use EC2 APIs directly to obtain the public IP address rather than unit-get public-address.  This is to work around what looks like a Juju bug - unit-get public-address on EC2 returns the public hostname of the unit rather than the public IP address.  Unfortunately EC2 public hostname are actually split horizon hostnames, so if you attempt to resolve the hostname from within EC2 it actually resolved to a private IP address - it will only resolve to a public address if resolved from outside EC2.
+
+# Configuration
+
+Clearwater has a number of configuration fields which are non-defaultable.  These are as follows.
+
+clearwater-route53
+
+-  `zone:` This must be set to a DNS zone name which is managed by the AWS Route53 service.
+-  `access_key:` and `secret_key:` These must be set to the AWS access key and secret key of the AWS account which owns the DNS zone name.
+
+clearwater-ellis
+
+-  `signup_key:` This is used as a signup key on the Ellis self-provisioning portal, so should be set to a unique string for each installation.
+-  `base_number:` and `number_count:` These define the telephone number range assigned to the Clearwater system.
+
+# Contact Information
+
+## Upstream Project Name
+
+See http:www.projectclearwater.org and https://github.com/Metaswitch/clearwater-docs/wiki for information about clearwater.
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+The Clearwater mailing list is at lists.projectclearwater.org.

=== added file 'telco/precise/clearwater-ellis/config.yaml'
--- telco/precise/clearwater-ellis/config.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/config.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,34 @@
+options:
+  zone:
+    description: The DNS root zone for this service
+    type: string
+  smtp_server:
+    default: ""
+    description: The SMTP server to send password recovery emails from
+    type: string
+  smtp_username:
+    default: ""
+    description: Username to authenticate with the SMTP server
+    type: string
+  smtp_password:
+    default: ""
+    description: Password to authenticate with the SMTP server
+    type: string
+  email_sender:
+    default: ""
+    description: Email address to send recovery emails from
+    type: string
+  signup_key:
+    description: The secret signup key used to create a new account
+    type: string
+  base_number:
+    description: The first number to be allocated in the number range
+    type: string
+  number_count:
+    default: 1
+    description: The count of numbers to allocate
+    type: int
+  repo:
+    default: http://repo.cw-ngv.com/stable
+    description: The location of the repo server
+    type: string

=== added file 'telco/precise/clearwater-ellis/copyright'
--- telco/precise/clearwater-ellis/copyright	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/copyright	2014-11-10 14:55:38 +0000
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2013  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at [e-mail] or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.

=== added directory 'telco/precise/clearwater-ellis/hooks'
=== added file 'telco/precise/clearwater-ellis/hooks/as-catalog-relation-changed'
--- telco/precise/clearwater-ellis/hooks/as-catalog-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/as-catalog-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+AS_JSON=/usr/share/clearwater/ellis/web-content/js/app-servers.json
+TMP_AS_JSON=/tmp/app-servers.json.$$
+
+id=$(cut -d/ -f2 <<< $JUJU_REMOTE_UNIT)
+as_name=$(relation-get as-name)
+as_uri=$(relation-get as-uri)
+
+# If an AS name was specified, create/update a file for the AS.  Otherwise delete it.
+if [ "$as_name" != "" ] ; then
+  cat > $AS_JSON.$id <<EOF
+  "$as_name": "<InitialFilterCriteria><Priority>1</Priority><TriggerPoint><ConditionTypeCNF /><SPT><Group>0</Group><Method>REGISTER</Method></SPT><SPT><Group>1</Group><Method>INVITE</Method></SPT><SPT><Group>2</Group><Method>MESSAGE</Method></SPT></TriggerPoint><ApplicationServer><ServerName>$as_uri</ServerName><DefaultHandling>0</DefaultHandling></ApplicationServer></InitialFilterCriteria>",
+EOF
+else
+  rm -f $AS_JSON.$id
+fi
+
+{
+  # Open the JSON body
+  echo {
+  # Concatenate all the AS files,
+  # remove any duplicates (on the first field) and then
+  # remove a comma from the end of the last line.
+  cat $AS_JSON.* 2>/dev/null |
+  sort -k 1,1 -u |
+  sed -e '$ s/,$//'
+  # Close the JSON body
+  echo }
+} > $TMP_AS_JSON
+mv $TMP_AS_JSON $AS_JSON

=== added file 'telco/precise/clearwater-ellis/hooks/as-catalog-relation-departed'
--- telco/precise/clearwater-ellis/hooks/as-catalog-relation-departed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/as-catalog-relation-departed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+AS_JSON=/usr/share/clearwater/ellis/web-content/js/app-servers.json
+TMP_AS_JSON=/tmp/app-servers.json.$$
+
+id=$(cut -d/ -f2 <<< $JUJU_REMOTE_UNIT)
+
+# Delete the entry for this relation peer.
+rm -f $AS_JSON.$id
+
+{
+  # Open the JSON body
+  echo {
+  # Concatenate all the AS files,
+  # remove any duplicates (on the first field) and then
+  # remove a comma from the end of the last line.
+  cat $AS_JSON.* 2>/dev/null |
+  sort -k 1,1 -u |
+  sed -e '$ s/,$//'
+  # Close the JSON body
+  echo }
+} > $TMP_AS_JSON
+mv $TMP_AS_JSON $AS_JSON

=== added file 'telco/precise/clearwater-ellis/hooks/config-changed'
--- telco/precise/clearwater-ellis/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/config-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+# Update the /etc/clearwater/config file, the node.json, and re-run
+# chef-solo
+$CHARM_DIR/lib/config_script
+$CHARM_DIR/lib/node_json_script
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+$CHARM_DIR/lib/restart
+
+# Create subscribers
+if [ "$(config-get base_number)" != "" ] ; then
+  /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start "$(config-get base_number)" --count "$(config-get number_count)"
+fi

=== added file 'telco/precise/clearwater-ellis/hooks/homestead-prov-relation-changed'
--- telco/precise/clearwater-ellis/hooks/homestead-prov-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/homestead-prov-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script homestead-hss
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-ellis/hooks/install'
--- telco/precise/clearwater-ellis/hooks/install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# This is a big hack.  Juju on EC2 returns hostnames rather than IP addresses
+# for public-address and private-address.  To work-around this, we resolve the
+# host names.  However, after we've joined to the DNSaaS charm, we can no longer
+# resolve these, so add them to /etc/hosts.
+if ! grep "# added by clearwater-*/hooks/install" /etc/hosts ; then
+  private_address=$(unit-get private-address)
+  public_address=$(unit-get public-address)
+  private_ip=$($CHARM_DIR/lib/unit-get private-address)
+  public_ip=$($CHARM_DIR/lib/unit-get public-address)
+  [ "$private_address" = "$private_ip" ] || echo "$private_ip $private_address # added by clearwater-*/hooks/install" >>/etc/hosts
+  [ "$public_address" = "$public_ip" ] || echo "$public_ip $public_address $(sed -e 's/\..*$//' <<< $public_address) # added by clearwater-*/hooks/install" >>/etc/hosts
+  echo "$public_ip ellis-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone) # added by clearwater-*/hooks/install" >>/etc/hosts
+fi
+
+# Install chef solo, and create the node.json and config file
+$CHARM_DIR/lib/chef_solo_install
+$CHARM_DIR/lib/node_json_script
+$CHARM_DIR/lib/config_script
+
+apt-get update
+
+# Install the node
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Create subscribers
+if [ "$(config-get base_number)" != "" ] ; then
+  /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start "$(config-get base_number)" --count "$(config-get number_count)"
+fi
+
+# Expose the correct ports
+open-port 22/tcp
+open-port 80/tcp
+open-port 123/udp
+open-port 161/udp
+open-port 443/tcp

=== added file 'telco/precise/clearwater-ellis/hooks/programmable-multiple-relation-changed'
--- telco/precise/clearwater-ellis/hooks/programmable-multiple-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/programmable-multiple-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+# Set our DNS requirements
+TTL=300
+id=$(cut -d/ -f2 <<< $JUJU_UNIT_NAME)
+ip=$($CHARM_DIR/lib/unit-get public-address)
+relation-set domain=$(config-get zone)
+relation-set resources='ellis '$TTL' IN A '$ip'
+ellis-'$id' '$TTL' IN A '$ip
+
+# Update our DNS server
+if [ "$(relation-get public-address)" != "" ]
+then
+  echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
+  mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
+  service dnsmasq restart
+fi
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script programmable-multiple
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-ellis/hooks/start'
--- telco/precise/clearwater-ellis/hooks/start	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/start	2014-11-10 14:55:38 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# This hook needs to be idempotent, so this could be run when ellis is
+# already running, when it's running but not monitored by monit, when
+# it's stopped but being monitored (so it's about to start), or stopped
+# and unmonitored. To cover all these cases, stop monit, start ellis, start
+# monit, then finally have monit monitor ellis
+service monit stop
+service ellis start
+service monit start
+sleep 1
+monit monitor ellis

=== added file 'telco/precise/clearwater-ellis/hooks/stop'
--- telco/precise/clearwater-ellis/hooks/stop	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/stop	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Stop ellis via monit
+sudo service monit start
+sudo monit stop ellis

=== added file 'telco/precise/clearwater-ellis/hooks/upgrade-charm'
--- telco/precise/clearwater-ellis/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/upgrade-charm	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install and
+# hooks/config-changed to ensure all updates are processed
+set -e
+
+$CHARM_DIR/hooks/install
+$CHARM_DIR/hooks/config-changed

=== added file 'telco/precise/clearwater-ellis/hooks/xdms-relation-changed'
--- telco/precise/clearwater-ellis/hooks/xdms-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/hooks/xdms-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script xdms
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-ellis/icon.svg'
--- telco/precise/clearwater-ellis/icon.svg	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/icon.svg	2014-11-10 14:55:38 +0000
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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
+AABJRU5ErkJggg==
+"
+       height="96"
+       width="96"
+       style="stroke:#000000;stroke-opacity:0.18666669" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added directory 'telco/precise/clearwater-ellis/lib'
=== added file 'telco/precise/clearwater-ellis/lib/chef_solo_install'
--- telco/precise/clearwater-ellis/lib/chef_solo_install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/chef_solo_install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This covers installing chef-solo and the Clearwater chef recipes
+# Install needed libraries
+apt-get -y install git libxml2-dev libxslt1-dev wget curl
+
+# Install chef
+install_sh="http://opscode.com/chef/install.sh"
+version_string="-v 11.6.0"
+bash <(wget  ${install_sh} -O -) ${version_string}
+
+# Pull down the Clearwater chef recipes
+if [ ! -d /home/ubuntu/chef-solo ]
+then
+  mkdir /home/ubuntu/chef-solo
+  git clone --recursive -b master git://github.com/Metaswitch/chef.git /home/ubuntu/chef-solo
+fi
+
+# Update the chef recipes
+cd /home/ubuntu/chef-solo
+git pull origin --recurse-submodules master
+
+# Create the solo.rb file
+cat > /home/ubuntu/chef-solo/solo.rb <<EOP
+file_cache_path "/var/chef-solo"
+cookbook_path  [
+    "/home/ubuntu/chef-solo/cookbooks"
+]
+data_bag_path "/home/ubuntu/chef-solo/data_bags"
+environment_path "/home/ubuntu/chef-solo/environments"
+role_path "/home/ubuntu/chef-solo/roles"
+verbose_logging true
+log_level :debug
+EOP

=== added file 'telco/precise/clearwater-ellis/lib/config_script'
--- telco/precise/clearwater-ellis/lib/config_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/config_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+relation_name=$1
+
+set -e
+
+# Defaults
+sprout_hostname=sprout.$(config-get zone)
+hs_hostname=homestead.$(config-get zone):8888
+hs_provisioning_hostname=homestead.$(config-get zone):8889
+xdms_hostname=homer.$(config-get zone):7888
+ralf_hostname=
+sas_server=0.0.0.0
+enum_server=
+ellis_cookie_key=secret
+ellis_api_key=$(hexdump -v -n 15 -e '1/1 "%02x"' /dev/random)
+
+# Import existing configuration
+[ ! -f /etc/clearwater/config ] || . /etc/clearwater/config
+
+# Apply new configuration
+home_domain=$(config-get zone)
+[ "$relation-name" != "homestead-hss" ] || [ "$(relation-get public-address)" = "" ] || sprout_hostname=$(relation-get public-address)
+[ "$relation-name" != "xdms" ] || [ "$(relation-get public-address)" = "" ] || xdms_hostname=$(relation-get public-address):9888
+sas_server=$(config-get sas)
+local_ip=$($CHARM_DIR/lib/unit-get private-address)
+public_ip=$($CHARM_DIR/lib/unit-get public-address)
+public_hostname=ellis-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone)
+smtp_smarthost=$(config-get smtp_server)
+smtp_username=$(config-get smtp_username)
+smtp_password=$(config-get smtp_password)
+email_recovery_sender=$(config-get email_sender)
+signup_key=$(config-get signup_key)
+
+# Write configuration back
+mkdir -p /etc/clearwater
+cat >/etc/clearwater/config <<EOF
+# Deployment definitions
+home_domain=$home_domain
+sprout_hostname=$sprout_hostname
+hs_hostname=$hs_hostname
+hs_provisioning_hostname=$hs_provisioning_hostname
+xdms_hostname=$xdms_hostname
+ralf_hostname=$ralf_hostname
+sas_server=$sas_server
+enum_server=$enum_server
+
+# Local IP configuration
+local_ip=$local_ip
+public_ip=$public_ip
+public_hostname=$public_hostname
+
+# Email server configuration
+smtp_smarthost=$smtp_smarthost
+smtp_username=$smtp_username
+smtp_password=$smtp_password
+email_recovery_sender=$email_recovery_sender
+
+# Keys
+signup_key=$signup_key
+ellis_cookie_key=$ellis_cookie_key
+ellis_api_key=$ellis_api_key
+EOF

=== added file 'telco/precise/clearwater-ellis/lib/node_json_script'
--- telco/precise/clearwater-ellis/lib/node_json_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/node_json_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import subprocess
+import string
+import socket
+import os
+import argparse
+
+# Create the ~/chef-solo/node.json file.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and after
+# clustering the tag 'clustered' is added (for homer/homestead)
+#
+# The node.json file is templated in lib/node_json_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--tag', action='store_true')
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(subprocess.check_output(["unit-get", "private-address"]).rstrip())
+d['MACHINE_ID'] = str(int(os.environ['JUJU_UNIT_NAME'].split('/')[1]) + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+
+node_file = "/home/ubuntu/chef-solo/node.json"
+if args.cluster or (os.path.exists(node_file) and "clustered" in open(node_file).read()):
+        d['CLUSTER'] = ",\n    \"role[clustered]\""
+        d['CLUSTERED'] = ", \"clustered\""
+        d['TAG'] = ""
+
+        if args.tag or (os.path.exists(node_file) and "tags" in open(node_file).read()):
+                d['TAG'] = ",\n  \"tags\": [\"clustered\"]"
+
+else:
+        d['CLUSTER'] = ""
+        d['CLUSTERED'] = ""
+        d['TAG'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/node.json
+with open('/home/ubuntu/chef-solo/node.json', 'w') as f:
+        f.write(result)

=== added file 'telco/precise/clearwater-ellis/lib/node_json_template'
--- telco/precise/clearwater-ellis/lib/node_json_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/node_json_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,22 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "role": "ellis",
+  "roles": ["clearwater-infrastructure", "ellis"$CLUSTERED],
+  "cloud": {
+    "local_ipv4": "$LOCAL_IP"
+  },
+  "clearwater": {
+    "index": $MACHINE_ID,
+    "repo_server": "$REPO",
+    "number_start": 0,
+    "number_count": 0,
+    "pstn_number_start": 0,
+    "pstn_number_count": 0,
+    "repo_server": "$REPO"
+  },
+  "run_list": [
+    "role[ellis]"$CLUSTER
+  ]$TAG
+}

=== added file 'telco/precise/clearwater-ellis/lib/restart'
--- telco/precise/clearwater-ellis/lib/restart	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/restart	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Restart clearwater-infrastructure, and stop ellis (to be restarted by monit)
+service clearwater-infrastructure restart
+service ellis stop

=== added file 'telco/precise/clearwater-ellis/lib/unit-get'
--- telco/precise/clearwater-ellis/lib/unit-get	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/lib/unit-get	2014-11-10 14:55:38 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -ex
+onEC2=false
+key=$1
+val=$(unit-get $1)
+
+if [ -f $CHARM_DIR/lib/provider.txt ]
+then
+    PROVIDER=`cat $CHARM_DIR/lib/provider.txt `
+else
+    #checking dirty ec2 hack will work
+    wget  -q http://169.254.169.254/latest/meta-data/public-ipv4 && onEC2=true
+    if ( "$onEC2" == true )
+    then
+	echo "EC2" >  $CHARM_DIR/lib/provider.txt
+    else
+	echo "NOTEC2" >  $CHARM_DIR/lib/provider.txt
+    fi
+fi
+
+if [ "$PROVIDER" == "EC2" ]
+then
+ if [ "$key" = "public-address" ] &&   [ -n "$(dig +short $val | head -1)" ]
+  then
+   val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+ elif [ "$key" = "private-address" ]
+ then
+   val_ip=$(dig +short $val | head -1)
+   [ -z "$val_ip" ] || val=$val_ip
+   ##if val_ip is empty getting the system IP
+   [ -z "$val_ip" ] && val=`ip route | grep src | cut -d " " -f 12`
+ fi
+fi
+
+echo $val
+

=== added file 'telco/precise/clearwater-ellis/metadata.yaml'
--- telco/precise/clearwater-ellis/metadata.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/metadata.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,17 @@
+name: clearwater-ellis
+summary: Ellis charm for Project Clearwater
+maintainer: Project Clearwater Maintainers <[e-mail]>
+description: Ellis charm for Project Clearwater
+categories:
+  - misc
+subordinate: false
+requires:
+  programmable-multiple:
+    interface: dns-multi
+  homestead-prov:
+    interface: homestead-prov-interface
+  xdms:
+    interface: 3GPP-Ut
+provides:
+  as-catalog:
+    interface: as-register

=== added file 'telco/precise/clearwater-ellis/revision'
--- telco/precise/clearwater-ellis/revision	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ellis/revision	2014-11-10 14:55:38 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'telco/precise/clearwater-homer'
=== added file 'telco/precise/clearwater-homer/README.md'
--- telco/precise/clearwater-homer/README.md	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/README.md	2014-11-10 14:55:38 +0000
@@ -0,0 +1,90 @@
+# Overview
+
+This charm supports deployment and scaling of the Homer component of a Project Clearwater system.  See http://www.projectclearwater.org for more information on Project Clearwater.
+
+# Usage
+
+The Homer service should be deployed as part of a Clearwater system.  A Clearwater system can be deployed in a Juju environment by creating a config.yaml file then running the following commands.
+
+    juju deploy --config config.yaml clearwater-route53
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-ellis
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-bono
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-sprout
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homestead
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homer
+    juju add-relation clearwater-ellis clearwater-route53:register-ellis
+    juju add-relation clearwater-bono clearwater-route53:register-bono
+    juju add-relation clearwater-sprout clearwater-route53:register-sprout
+    juju add-relation clearwater-homestead clearwater-route53:register-homestead
+    juju add-relation clearwater-homer clearwater-route53:register-homer
+    juju expose clearwater-bono
+    juju expose clearwater-ellis
+
+The config.yaml configuration file takes the following format.
+
+    clearwater-route53:
+      zone: <domain>
+      access_key: <ec2 access key>
+      secret_key: <ec2 secret access key>
+      sas: "0.0.0.0"
+
+    clearwater-ellis:
+      smtp_server: smtp.cw-ngv.com
+      smtp_username: username
+      smtp_password: password
+      email_sender: [e-mail]<mailto:[e-mail]>
+      signup_key: secret
+      base_number: "6505550000"
+      number_count: 1000
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-bono:
+      turn_workaround: password
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-sprout:
+      reg_min_expires: 400
+      session_max_expires: 900
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homestead:
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homer:
+      repo: http://repo.cw-ngv.com/stable
+
+Note that the clearwater-homer charm can only be deployed on the `amd64` architecture.
+
+## Scale out Usage
+
+## Known Limitations and Issues
+
+The only currently supported DNS service for Clearwater is clearwater-route53 (when deploying in Amazon EC2), so will currently only work on EC2.  Additional DNS services will be added for other environments in future.
+
+clearwater-homer currently only supports running as a single unit.  Clustering support will be released shortly, which will allow units to be added to and removed from a clearwater-homer deployment using juju add-unit and juju remove-unit commands.
+
+Note that this charm does not current pass charm proof because its hooks use EC2 APIs directly to obtain the public IP address rather than unit-get public-address.  This is to work around what looks like a Juju bug - unit-get public-address on EC2 returns the public hostname of the unit rather than the public IP address.  Unfortunately EC2 public hostname are actually split horizon hostnames, so if you attempt to resolve the hostname from within EC2 it actually resolved to a private IP address - it will only resolve to a public address if resolved from outside EC2.
+
+# Configuration
+
+Clearwater has a number of configuration fields which are non-defaultable.  These are as follows.
+
+clearwater-route53
+
+-  `zone:` This must be set to a DNS zone name which is managed by the AWS Route53 service.
+-  `access_key:` and `secret_key:` These must be set to the AWS access key and secret key of the AWS account which owns the DNS zone name.
+
+clearwater-ellis
+
+-  `signup_key:` This is used as a signup key on the Ellis self-provisioning portal, so should be set to a unique string for each installation.
+-  `base_number:` and `number_count:` These define the telephone number range assigned to the Clearwater system.
+
+# Contact Information
+
+## Upstream Project Name
+
+See http:www.projectclearwater.org and https://github.com/Metaswitch/clearwater-docs/wiki for information about clearwater.
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+The Clearwater mailing list is at lists.projectclearwater.org.

=== added file 'telco/precise/clearwater-homer/config.yaml'
--- telco/precise/clearwater-homer/config.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/config.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,8 @@
+options:
+  zone:
+    description: The DNS root zone for this service
+    type: string
+  repo:
+    default: http://repo.cw-ngv.com/stable
+    description: The location of the repo server
+    type: string

=== added file 'telco/precise/clearwater-homer/copyright'
--- telco/precise/clearwater-homer/copyright	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/copyright	2014-11-10 14:55:38 +0000
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2013  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at [e-mail] or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.

=== added directory 'telco/precise/clearwater-homer/hooks'
=== added file 'telco/precise/clearwater-homer/hooks/config-changed'
--- telco/precise/clearwater-homer/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/config-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Update the /etc/clearwater/config file, the node.json, and re-run
+# chef-solo
+$CHARM_DIR/lib/config_script
+$CHARM_DIR/lib/node_json_script
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-homer/hooks/homer-relation-changed'
--- telco/precise/clearwater-homer/hooks/homer-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/homer-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# Get the IP address of this unit and the remote unit
+peer_ip=$(relation-get private-address)
+this_ip=$(unit-get private-address)
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+# Re-create the node.json files in the data bags
+$CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster
+$CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster
+
+# Re-create the node.json file and re-run chef sole
+$CHARM_DIR/lib/node_json_script --cluster
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Re-create the node.json with the tag.
+$CHARM_DIR/lib/node_json_script --cluster --tag

=== added file 'telco/precise/clearwater-homer/hooks/homer-relation-departed'
--- telco/precise/clearwater-homer/hooks/homer-relation-departed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/homer-relation-departed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+if [ $this_index -gt $peer_index ]
+  then
+    # Remove this node. This relation can be called more than once, so check
+    # whether the node has already been decommissioned.
+    decommissioned=$(nodetool netstats | grep DECOMMISSIONED > /dev/null; echo $?)
+    if [[ $decommissioned == 1* ]]
+      then
+        monit stop homer
+        monit unmonitor cassandra
+        nodetool decommission
+    fi
+  else
+    # Remove the node.json in databags that corresponds to the node being removed.
+    file_name="/home/ubuntu/chef-solo/data_bags/node/"$peer_index".json"
+    rm $file_name
+    chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+fi

=== added file 'telco/precise/clearwater-homer/hooks/homer-relation-joined'
--- telco/precise/clearwater-homer/hooks/homer-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/homer-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+# Get the IP address of this unit and the remote unit
+peer_ip=$(relation-get private-address)
+this_ip=$(unit-get private-address)
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+# Re-create the node.json files in the data bags. Mark the new
+# node as joining - the new node is the one with the higher index
+if [ $this_index -gt $peer_index ]
+  then
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster --joining
+  else
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster --joining
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster
+fi
+
+# Re-create the node.json file and re-run chef solo
+$CHARM_DIR/lib/node_json_script --cluster
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Re-create the node.json with the tag. Only do this for the existing node, not the
+# joining node
+if [ $this_index -lt $peer_index ]
+  then
+  $CHARM_DIR/lib/node_json_script --cluster --tag
+fi

=== added file 'telco/precise/clearwater-homer/hooks/install'
--- telco/precise/clearwater-homer/hooks/install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+
+# This is a big hack.  Juju on EC2 returns hostnames rather than IP addresses
+# for public-address and private-address.  To work-around this, we resolve the
+# host names.  However, after we've joined to the DNSaaS charm, we can no longer
+# resolve these, so add them to /etc/hosts.
+if ! grep "# added by clearwater-*/hooks/install" /etc/hosts ; then
+  private_address=$(unit-get private-address)
+  public_address=$(unit-get public-address)
+  private_ip=$($CHARM_DIR/lib/unit-get private-address)
+  public_ip=$($CHARM_DIR/lib/unit-get public-address)
+  [ "$private_address" = "$private_ip" ] || echo "$private_ip $private_address # added by clearwater-*/hooks/install" >>/etc/hosts
+  [ "$public_address" = "$public_ip" ] || echo "$public_ip $public_address $(sed -e 's/\..*$//' <<< $public_address) # added by clearwater-*/hooks/install" >>/etc/hosts
+  echo "$private_ip homer-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone) # added by clearwater-*/hooks/install" >>/etc/hosts
+fi
+
+# Install chef solo
+$CHARM_DIR/lib/chef_solo_install
+
+# Get the ip address and machine number of this unit. The index
+# takes the form '<charm name>/<index>
+this_ip=$(unit-get private-address)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+$CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index"
+$CHARM_DIR/lib/node_json_script
+
+# Update the config file
+$CHARM_DIR/lib/config_script
+
+apt-get update
+
+# Install the node
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Expose the correct ports
+open-port 22/tcp
+open-port 123/udp
+open-port 161/udp

=== added file 'telco/precise/clearwater-homer/hooks/programmable-multiple-relation-changed'
--- telco/precise/clearwater-homer/hooks/programmable-multiple-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/programmable-multiple-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+# Set our DNS requirements
+TTL=300
+id=$(cut -d/ -f2 <<< $JUJU_UNIT_NAME)
+ip=$($CHARM_DIR/lib/unit-get private-address)
+relation-set domain=$(config-get zone)
+relation-set resources='homer '$TTL' IN A '$ip'
+homer-'$id' '$TTL' IN A '$ip
+
+# Update our DNS server
+if [ "$(relation-get public-address)" != "" ]
+then
+  echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
+  mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
+  service dnsmasq restart
+fi
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script programmable-multiple
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-homer/hooks/start'
--- telco/precise/clearwater-homer/hooks/start	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/start	2014-11-10 14:55:38 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# This hook needs to be idempotent, so this could be run when homer is
+# already running, when it's running but not monitored by monit, when
+# it's stopped but being monitored (so it's about to start), or stopped
+# and unmonitored. To cover all these cases, stop monit, start homer, start
+# monit, then finally have monit monitor homer
+service monit stop
+service homer start
+service monit start
+sleep 1
+monit monitor homer

=== added file 'telco/precise/clearwater-homer/hooks/stop'
--- telco/precise/clearwater-homer/hooks/stop	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/stop	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Stop homer via monit
+sudo service monit start
+sudo monit stop homer

=== added file 'telco/precise/clearwater-homer/hooks/upgrade-charm'
--- telco/precise/clearwater-homer/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/upgrade-charm	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install and
+# hooks/config-changed to ensure all updates are processed
+set -e
+
+$CHARM_DIR/hooks/install
+$CHARM_DIR/hooks/config-changed

=== added file 'telco/precise/clearwater-homer/hooks/xdms-user-relation-joined'
--- telco/precise/clearwater-homer/hooks/xdms-user-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/hooks/xdms-user-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+relation-set public-address=homer.$(config-get zone)

=== added file 'telco/precise/clearwater-homer/icon.svg'
--- telco/precise/clearwater-homer/icon.svg	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/icon.svg	2014-11-10 14:55:38 +0000
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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
+AABJRU5ErkJggg==
+"
+       height="96"
+       width="96"
+       style="stroke:#000000;stroke-opacity:0.18666669" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added directory 'telco/precise/clearwater-homer/lib'
=== added file 'telco/precise/clearwater-homer/lib/chef_solo_install'
--- telco/precise/clearwater-homer/lib/chef_solo_install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/chef_solo_install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This covers installing chef-solo and the Clearwater chef recipes
+# Install needed libraries
+apt-get -y install git libxml2-dev libxslt1-dev wget curl
+
+# Install chef
+install_sh="http://opscode.com/chef/install.sh"
+version_string="-v 11.6.0"
+bash <(wget  ${install_sh} -O -) ${version_string}
+
+# Pull down the Clearwater chef recipes
+if [ ! -d /home/ubuntu/chef-solo ]
+then
+  mkdir /home/ubuntu/chef-solo
+  git clone --recursive -b master git://github.com/Metaswitch/chef.git /home/ubuntu/chef-solo
+fi
+
+# Update the chef recipes
+cd /home/ubuntu/chef-solo
+git pull origin --recurse-submodules master
+
+# Create the solo.rb file
+cat > /home/ubuntu/chef-solo/solo.rb <<EOP
+file_cache_path "/var/chef-solo"
+cookbook_path  [
+    "/home/ubuntu/chef-solo/cookbooks"
+]
+data_bag_path "/home/ubuntu/chef-solo/data_bags"
+environment_path "/home/ubuntu/chef-solo/environments"
+role_path "/home/ubuntu/chef-solo/roles"
+verbose_logging true
+log_level :debug
+EOP

=== added file 'telco/precise/clearwater-homer/lib/config_script'
--- telco/precise/clearwater-homer/lib/config_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/config_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+relation_name=$1
+
+set -e
+
+# Defaults
+sprout_hostname=sprout.$(config-get zone)
+hs_hostname=homestead.$(config-get zone):8888
+hs_provisioning_hostname=homestead.$(config-get zone):8889
+xdms_hostname=homer.$(config-get zone):7888
+ralf_hostname=
+sas_server=0.0.0.0
+enum_server=
+
+# Import existing configuration
+[ ! -f /etc/clearwater/config ] || . /etc/clearwater/config
+
+# Apply new configuration
+home_domain=$(config-get zone)
+sas_server=$(config-get sas)
+local_ip=$($CHARM_DIR/lib/unit-get private-address)
+public_ip=$($CHARM_DIR/lib/unit-get public-address)
+public_hostname=homer-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone)
+
+# Write configuration back
+mkdir -p /etc/clearwater
+cat >/etc/clearwater/config <<EOF
+# Deployment definitions
+home_domain=$home_domain
+sprout_hostname=$sprout_hostname
+hs_hostname=$hs_hostname
+hs_provisioning_hostname=$hs_provisioning_hostname
+xdms_hostname=$xdms_hostname
+ralf_hostname=$ralf_hostname
+sas_server=$sas_server
+enum_server=$enum_server
+
+# Local IP configuration
+local_ip=$local_ip
+public_ip=$public_ip
+public_hostname=$public_hostname
+EOF

=== added file 'telco/precise/clearwater-homer/lib/node_json_clustered_script'
--- telco/precise/clearwater-homer/lib/node_json_clustered_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/node_json_clustered_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+import subprocess
+import string
+import socket
+import os
+import sys
+import argparse
+
+# Create the ~/chef-solo/data_bags/node/<index>.json files.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and if the
+# node is joinging the attribute 'joining' is added
+#
+# The node.json file is templated in lib/node_json_clustered_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--joining', action='store_true')
+parser.add_argument('--index', type=int, required=True)
+parser.add_argument('--ip', type=str, required=True)
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(args.ip)
+d['MACHINE_ID'] = str(args.index + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+
+if args.cluster:
+	d['CLUSTER'] = ",\n    \"role[clustered]\""
+	d['CLUSTERED'] = ", \"clustered\""
+else:
+	d['CLUSTER'] = ""
+	d['CLUSTERED'] = ""
+
+if args.joining:
+	d['JOINING'] = ",\n      \"joining\": true"
+else:
+	d['JOINING'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_clustered_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/data_bags/node/<index>.json
+node_file = str(args.index + 1) + ".json"
+with open('/home/ubuntu/chef-solo/data_bags/node/%s' % node_file, 'w') as f:
+	f.write(result)

=== added file 'telco/precise/clearwater-homer/lib/node_json_clustered_template'
--- telco/precise/clearwater-homer/lib/node_json_clustered_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/node_json_clustered_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,20 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "json_class": "Chef::Node",
+  "automatic": {
+    "role": "homer",
+    "roles": ["clearwater-infrastructure", "homer"$CLUSTERED],
+    "cloud": {
+      "local_ipv4": "$LOCAL_IP"
+    },
+    "clearwater": {
+      "index": $MACHINE_ID$JOINING
+    }
+  },
+  "chef_type": "node",
+  "run_list": [
+    "role[homer]"$CLUSTER
+  ]
+}

=== added file 'telco/precise/clearwater-homer/lib/node_json_script'
--- telco/precise/clearwater-homer/lib/node_json_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/node_json_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import subprocess
+import string
+import socket
+import os
+import argparse
+
+# Create the ~/chef-solo/node.json file.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and after
+# clustering the tag 'clustered' is added (for homer/homestead)
+#
+# The node.json file is templated in lib/node_json_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--tag', action='store_true')
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(subprocess.check_output(["unit-get", "private-address"]).rstrip())
+d['MACHINE_ID'] = str(int(os.environ['JUJU_UNIT_NAME'].split('/')[1]) + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+
+node_file = "/home/ubuntu/chef-solo/node.json"
+if args.cluster or (os.path.exists(node_file) and "clustered" in open(node_file).read()):
+        d['CLUSTER'] = ",\n    \"role[clustered]\""
+        d['CLUSTERED'] = ", \"clustered\""
+        d['TAG'] = ""
+
+        if args.tag or (os.path.exists(node_file) and "tags" in open(node_file).read()):
+                d['TAG'] = ",\n  \"tags\": [\"clustered\"]"
+
+else:
+        d['CLUSTER'] = ""
+        d['CLUSTERED'] = ""
+        d['TAG'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/node.json
+with open('/home/ubuntu/chef-solo/node.json', 'w') as f:
+        f.write(result)

=== added file 'telco/precise/clearwater-homer/lib/node_json_template'
--- telco/precise/clearwater-homer/lib/node_json_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/node_json_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,17 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "role": "homer",
+  "roles": ["clearwater-infrastructure", "homer"$CLUSTERED],
+  "cloud": {
+    "local_ipv4": "$LOCAL_IP"
+  },
+  "clearwater": {
+    "index": $MACHINE_ID,
+    "repo_server": "$REPO"
+  },
+  "run_list": [
+    "role[homer]"$CLUSTER
+  ]$TAG
+}

=== added file 'telco/precise/clearwater-homer/lib/restart'
--- telco/precise/clearwater-homer/lib/restart	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/restart	2014-11-10 14:55:38 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# Restart clearwater-infrastructure, and stop homer (to be restarted by monit)
+service clearwater-infrastructure restart
+service homer stop

=== added file 'telco/precise/clearwater-homer/lib/unit-get'
--- telco/precise/clearwater-homer/lib/unit-get	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/lib/unit-get	2014-11-10 14:55:38 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -ex
+onEC2=false
+key=$1
+val=$(unit-get $1)
+
+if [ -f $CHARM_DIR/lib/provider.txt ]
+then
+    PROVIDER=`cat $CHARM_DIR/lib/provider.txt `
+else
+    #checking dirty ec2 hack will work
+    wget  -q http://169.254.169.254/latest/meta-data/public-ipv4 && onEC2=true
+    if ( "$onEC2" == true )
+    then
+	echo "EC2" >  $CHARM_DIR/lib/provider.txt
+    else
+	echo "NOTEC2" >  $CHARM_DIR/lib/provider.txt
+    fi
+fi
+
+if [ "$PROVIDER" == "EC2" ]
+then
+ if [ "$key" = "public-address" ] &&   [ -n "$(dig +short $val | head -1)" ]
+  then
+   val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+ elif [ "$key" = "private-address" ]
+ then
+   val_ip=$(dig +short $val | head -1)
+   [ -z "$val_ip" ] || val=$val_ip
+   ##if val_ip is empty getting the system IP
+   [ -z "$val_ip" ] && val=`ip route | grep src | cut -d " " -f 12`
+ fi
+fi
+
+echo $val
+

=== added file 'telco/precise/clearwater-homer/metadata.yaml'
--- telco/precise/clearwater-homer/metadata.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/metadata.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,16 @@
+name: clearwater-homer
+summary: Homer charm for Project Clearwater
+maintainer: Project Clearwater Maintainers <[e-mail]>
+description: Homer charm for Project Clearwater
+categories:
+  - misc
+subordinate: false
+requires:
+  programmable-multiple:
+    interface: dns-multi
+provides:
+  xdms-user:
+    interface: 3GPP-Ut
+peers:
+  homer:
+    interface: homer-interface

=== added file 'telco/precise/clearwater-homer/revision'
--- telco/precise/clearwater-homer/revision	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homer/revision	2014-11-10 14:55:38 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'telco/precise/clearwater-homestead'
=== added file 'telco/precise/clearwater-homestead/README.md'
--- telco/precise/clearwater-homestead/README.md	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/README.md	2014-11-10 14:55:38 +0000
@@ -0,0 +1,90 @@
+# Overview
+
+This charm supports deployment and scaling of the Homestead component of a Project Clearwater system.  See http://www.projectclearwater.org for more information on Project Clearwater.
+
+# Usage
+
+The Homestead service should be deployed as part of a Clearwater system.  A Clearwater system can be deployed in a Juju environment by creating a config.yaml file then running the following commands.
+
+    juju deploy --config config.yaml clearwater-route53
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-ellis
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-bono
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-sprout
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homestead
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homer
+    juju add-relation clearwater-ellis clearwater-route53:register-ellis
+    juju add-relation clearwater-bono clearwater-route53:register-bono
+    juju add-relation clearwater-sprout clearwater-route53:register-sprout
+    juju add-relation clearwater-homestead clearwater-route53:register-homestead
+    juju add-relation clearwater-homer clearwater-route53:register-homer
+    juju expose clearwater-bono
+    juju expose clearwater-ellis
+
+The config.yaml configuration file takes the following format.
+
+    clearwater-route53:
+      zone: <domain>
+      access_key: <ec2 access key>
+      secret_key: <ec2 secret access key>
+      sas: "0.0.0.0"
+
+    clearwater-ellis:
+      smtp_server: smtp.cw-ngv.com
+      smtp_username: username
+      smtp_password: password
+      email_sender: [e-mail]<mailto:[e-mail]>
+      signup_key: secret
+      base_number: "6505550000"
+      number_count: 1000
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-bono:
+      turn_workaround: password
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-sprout:
+      reg_min_expires: 400
+      session_max_expires: 900
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homestead:
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homer:
+      repo: http://repo.cw-ngv.com/stable
+
+Note that the clearwater-homestead charm can only be deployed on the `amd64` architecture.
+
+## Scale out Usage
+
+## Known Limitations and Issues
+
+The only currently supported DNS service for Clearwater is clearwater-route53 (when deploying in Amazon EC2), so will currently only work on EC2.  Additional DNS services will be added for other environments in future.
+
+clearwater-homestead currently only supports running as a single unit.  Clustering support will be released shortly, which will allow units to be added to and removed from a clearwater-homestead deployment using juju add-unit and juju remove-unit commands.
+
+Note that this charm does not current pass charm proof because its hooks use EC2 APIs directly to obtain the public IP address rather than unit-get public-address.  This is to work around what looks like a Juju bug - unit-get public-address on EC2 returns the public hostname of the unit rather than the public IP address.  Unfortunately EC2 public hostname are actually split horizon hostnames, so if you attempt to resolve the hostname from within EC2 it actually resolved to a private IP address - it will only resolve to a public address if resolved from outside EC2.
+
+# Configuration
+
+Clearwater has a number of configuration fields which are non-defaultable.  These are as follows.
+
+clearwater-route53
+
+-  `zone:` This must be set to a DNS zone name which is managed by the AWS Route53 service.
+-  `access_key:` and `secret_key:` These must be set to the AWS access key and secret key of the AWS account which owns the DNS zone name.
+
+clearwater-ellis
+
+-  `signup_key:` This is used as a signup key on the Ellis self-provisioning portal, so should be set to a unique string for each installation.
+-  `base_number:` and `number_count:` These define the telephone number range assigned to the Clearwater system.
+
+# Contact Information
+
+## Upstream Project Name
+
+See http:www.projectclearwater.org and https://github.com/Metaswitch/clearwater-docs/wiki for information about clearwater.
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+The Clearwater mailing list is at lists.projectclearwater.org.

=== added file 'telco/precise/clearwater-homestead/config.yaml'
--- telco/precise/clearwater-homestead/config.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/config.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+options:
+  zone:
+    description: The DNS root zone for this service
+    type: string
+  sas:
+    default: ""
+    description: The location of the SAS server
+    type: string
+  repo:
+    default: http://repo.cw-ngv.com/stable
+    description: The location of the repo server
+    type: string

=== added file 'telco/precise/clearwater-homestead/copyright'
--- telco/precise/clearwater-homestead/copyright	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/copyright	2014-11-10 14:55:38 +0000
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2013  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at [e-mail] or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.

=== added directory 'telco/precise/clearwater-homestead/hooks'
=== added file 'telco/precise/clearwater-homestead/hooks/config-changed'
--- telco/precise/clearwater-homestead/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/config-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Update the /etc/clearwater/config file, the node.json, and re-run
+# chef-solo
+$CHARM_DIR/lib/config_script
+$CHARM_DIR/lib/node_json_script
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-homestead/hooks/homestead-cscf-relation-joined'
--- telco/precise/clearwater-homestead/hooks/homestead-cscf-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/homestead-cscf-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+relation-set public-address=homestead.$(config-get zone)

=== added file 'telco/precise/clearwater-homestead/hooks/homestead-prov-user-relation-joined'
--- telco/precise/clearwater-homestead/hooks/homestead-prov-user-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/homestead-prov-user-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+relation-set public-address=homestead.$(config-get zone)

=== added file 'telco/precise/clearwater-homestead/hooks/homestead-relation-changed'
--- telco/precise/clearwater-homestead/hooks/homestead-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/homestead-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# Get the IP address of this unit and the remote unit
+peer_ip=$(relation-get private-address)
+this_ip=$(unit-get private-address)
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+# Re-create the node.json files in the data bags
+$CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster
+$CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster
+
+# Re-create the node.json file and re-run chef sole
+$CHARM_DIR/lib/node_json_script --cluster
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Re-create the node.json with the tag.
+$CHARM_DIR/lib/node_json_script --cluster --tag

=== added file 'telco/precise/clearwater-homestead/hooks/homestead-relation-departed'
--- telco/precise/clearwater-homestead/hooks/homestead-relation-departed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/homestead-relation-departed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+if [ $this_index -gt $peer_index ]
+  then
+    # Remove this node. This relation can be called more than once, so check
+    # whether the node has already been decommissioned.
+    decommissioned=$(nodetool netstats | grep DECOMMISSIONED > /dev/null; echo $?)
+    if [[ $decommissioned == 1* ]]
+      then
+        monit stop homestead
+        monit unmonitor cassandra
+        nodetool decommission
+    fi
+  else
+    # Remove the node.json in databags that corresponds to the node being removed.
+    file_name="/home/ubuntu/chef-solo/data_bags/node/"$peer_index".json"
+    rm $file_name
+    chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+fi

=== added file 'telco/precise/clearwater-homestead/hooks/homestead-relation-joined'
--- telco/precise/clearwater-homestead/hooks/homestead-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/homestead-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+# Get the IP address of this unit and the remote unit
+peer_ip=$(relation-get private-address)
+this_ip=$(unit-get private-address)
+
+# Get the machine number of this unit and the remote unit. This
+# takes the form '<charm name>/<index>
+peer_index=$(echo $JUJU_REMOTE_UNIT | cut -d'/' -f2)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+
+# Re-create the node.json files in the data bags. Mark the new
+# node as joining - the new node is the one with the higher index
+if [ $this_index -gt $peer_index ]
+  then
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster --joining
+  else
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$peer_ip" --index "$peer_index" --cluster --joining
+    $CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index" --cluster
+fi
+
+# Re-create the node.json file and re-run chef solo
+$CHARM_DIR/lib/node_json_script --cluster
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Re-create the node.json with the tag. Only do this for the existing node, not the
+# joining node
+if [ $this_index -lt $peer_index ]
+  then
+  $CHARM_DIR/lib/node_json_script --cluster --tag
+fi

=== added file 'telco/precise/clearwater-homestead/hooks/install'
--- telco/precise/clearwater-homestead/hooks/install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+# This is a big hack.  Juju on EC2 returns hostnames rather than IP addresses
+# for public-address and private-address.  To work-around this, we resolve the
+# host names.  However, after we've joined to the DNSaaS charm, we can no longer
+# resolve these, so add them to /etc/hosts.
+if ! grep "# added by clearwater-*/hooks/install" /etc/hosts ; then
+  private_address=$(unit-get private-address)
+  public_address=$(unit-get public-address)
+  private_ip=$($CHARM_DIR/lib/unit-get private-address)
+  public_ip=$($CHARM_DIR/lib/unit-get public-address)
+  [ "$private_address" = "$private_ip" ] || echo "$private_ip $private_address # added by clearwater-*/hooks/install" >>/etc/hosts
+  [ "$public_address" = "$public_ip" ] || echo "$public_ip $public_address $(sed -e 's/\..*$//' <<< $public_address) # added by clearwater-*/hooks/install" >>/etc/hosts
+  echo "$private_ip homestead-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone) # added by clearwater-*/hooks/install" >>/etc/hosts
+fi
+
+# Install chef solo
+$CHARM_DIR/lib/chef_solo_install
+
+this_ip=$(unit-get private-address)
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+$CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index"
+$CHARM_DIR/lib/node_json_script
+
+# Update the config file
+$CHARM_DIR/lib/config_script
+
+apt-get update
+
+# Install the node
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Expose the correct ports
+open-port 22/tcp
+open-port 123/udp
+open-port 161/udp

=== added file 'telco/precise/clearwater-homestead/hooks/programmable-multiple-relation-changed'
--- telco/precise/clearwater-homestead/hooks/programmable-multiple-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/programmable-multiple-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+# Set our DNS requirements
+TTL=300
+id=$(cut -d/ -f2 <<< $JUJU_UNIT_NAME)
+ip=$($CHARM_DIR/lib/unit-get private-address)
+relation-set domain=$(config-get zone)
+relation-set resources='homestead '$TTL' IN A '$ip'
+homestead-'$id' '$TTL' IN A '$ip
+
+# Update our DNS server
+if [ "$(relation-get public-address)" != "" ]
+then
+  echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
+  mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
+  service dnsmasq restart
+fi
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script programmable-multiple
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-homestead/hooks/start'
--- telco/precise/clearwater-homestead/hooks/start	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/start	2014-11-10 14:55:38 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# This hook needs to be idempotent, so this could be run when homestead is
+# already running, when it's running but not monitored by monit, when
+# it's stopped but being monitored (so it's about to start), or stopped
+# and unmonitored. To cover all these cases, stop monit, start homestead, start
+# monit, then finally have monit monitor homestead
+service monit stop
+service homestead start
+service homestead-prov start
+service monit start
+sleep 1
+monit monitor homestead
+monit monitor homestead-prov

=== added file 'telco/precise/clearwater-homestead/hooks/stop'
--- telco/precise/clearwater-homestead/hooks/stop	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/stop	2014-11-10 14:55:38 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Stop homestead via monit
+service monit start
+monit stop homestead
+monit stop homestead-prov

=== added file 'telco/precise/clearwater-homestead/hooks/upgrade-charm'
--- telco/precise/clearwater-homestead/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/hooks/upgrade-charm	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install and
+# hooks/config-changed to ensure all updates are processed
+set -e
+
+$CHARM_DIR/hooks/install
+$CHARM_DIR/hooks/config-changed

=== added file 'telco/precise/clearwater-homestead/icon.svg'
--- telco/precise/clearwater-homestead/icon.svg	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/icon.svg	2014-11-10 14:55:38 +0000
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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
+AABJRU5ErkJggg==
+"
+       height="96"
+       width="96"
+       style="stroke:#000000;stroke-opacity:0.18666669" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added directory 'telco/precise/clearwater-homestead/lib'
=== added file 'telco/precise/clearwater-homestead/lib/chef_solo_install'
--- telco/precise/clearwater-homestead/lib/chef_solo_install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/chef_solo_install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This covers installing chef-solo and the Clearwater chef recipes
+# Install needed libraries
+apt-get -y install git libxml2-dev libxslt1-dev wget curl
+
+# Install chef
+install_sh="http://opscode.com/chef/install.sh"
+version_string="-v 11.6.0"
+bash <(wget  ${install_sh} -O -) ${version_string}
+
+# Pull down the Clearwater chef recipes
+if [ ! -d /home/ubuntu/chef-solo ]
+then
+  mkdir /home/ubuntu/chef-solo
+  git clone --recursive -b master git://github.com/Metaswitch/chef.git /home/ubuntu/chef-solo
+fi
+
+# Update the chef recipes
+cd /home/ubuntu/chef-solo
+git pull origin --recurse-submodules master
+
+# Create the solo.rb file
+cat > /home/ubuntu/chef-solo/solo.rb <<EOP
+file_cache_path "/var/chef-solo"
+cookbook_path  [
+    "/home/ubuntu/chef-solo/cookbooks"
+]
+data_bag_path "/home/ubuntu/chef-solo/data_bags"
+environment_path "/home/ubuntu/chef-solo/environments"
+role_path "/home/ubuntu/chef-solo/roles"
+verbose_logging true
+log_level :debug
+EOP

=== added file 'telco/precise/clearwater-homestead/lib/config_script'
--- telco/precise/clearwater-homestead/lib/config_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/config_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+relation_name=$1
+
+set -e
+
+# Defaults
+sprout_hostname=sprout.$(config-get zone)
+hs_hostname=homestead.$(config-get zone):8888
+hs_provisioning_hostname=homestead.$(config-get zone):8889
+xdms_hostname=homer.$(config-get zone):7888
+ralf_hostname=
+sas_server=0.0.0.0
+enum_server=
+
+# Import existing configuration
+[ ! -f /etc/clearwater/config ] || . /etc/clearwater/config
+
+# Apply new configuration
+home_domain=$(config-get zone)
+sas_server=$(config-get sas)
+local_ip=$($CHARM_DIR/lib/unit-get private-address)
+public_ip=$($CHARM_DIR/lib/unit-get public-address)
+public_hostname=homestead-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone)
+
+# Write configuration back
+mkdir -p /etc/clearwater
+cat >/etc/clearwater/config <<EOF
+# Deployment definitions
+home_domain=$home_domain
+sprout_hostname=$sprout_hostname
+hs_hostname=$hs_hostname
+hs_provisioning_hostname=$hs_provisioning_hostname
+xdms_hostname=$xdms_hostname
+ralf_hostname=$ralf_hostname
+sas_server=$sas_server
+enum_server=$enum_server
+
+# Local IP configuration
+local_ip=$local_ip
+public_ip=$public_ip
+public_hostname=$public_hostname
+EOF

=== added file 'telco/precise/clearwater-homestead/lib/node_json_clustered_script'
--- telco/precise/clearwater-homestead/lib/node_json_clustered_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/node_json_clustered_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+import subprocess
+import string
+import socket
+import os
+import sys
+import argparse
+
+# Create the ~/chef-solo/data_bags/node/<index>.json files.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and if the
+# node is joinging the attribute 'joining' is added
+#
+# The node.json file is templated in lib/node_json_clustered_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--joining', action='store_true')
+parser.add_argument('--index', type=int, required=True)
+parser.add_argument('--ip', type=str, required=True)
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(args.ip)
+d['MACHINE_ID'] = str(args.index + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+
+if args.cluster:
+	d['CLUSTER'] = ",\n    \"role[clustered]\""
+	d['CLUSTERED'] = ", \"clustered\""
+else:
+	d['CLUSTER'] = ""
+	d['CLUSTERED'] = ""
+
+if args.joining:
+	d['JOINING'] = ",\n      \"joining\": true"
+else:
+	d['JOINING'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_clustered_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/data_bags/node/<index>.json
+node_file = str(args.index + 1) + ".json"
+with open('/home/ubuntu/chef-solo/data_bags/node/%s' % node_file, 'w') as f:
+	f.write(result)

=== added file 'telco/precise/clearwater-homestead/lib/node_json_clustered_template'
--- telco/precise/clearwater-homestead/lib/node_json_clustered_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/node_json_clustered_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,20 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "json_class": "Chef::Node",
+  "automatic": {
+    "role": "homestead",
+    "roles": ["clearwater-infrastructure", "homestead"$CLUSTERED],
+    "cloud": {
+      "local_ipv4": "$LOCAL_IP"
+    },
+    "clearwater": {
+      "index": $MACHINE_ID$JOINING
+    }
+  },
+  "chef_type": "node",
+  "run_list": [
+    "role[homestead]"$CLUSTER
+  ]
+}

=== added file 'telco/precise/clearwater-homestead/lib/node_json_script'
--- telco/precise/clearwater-homestead/lib/node_json_script	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/node_json_script	2014-11-10 14:55:38 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import subprocess
+import string
+import socket
+import os
+import argparse
+
+# Create the ~/chef-solo/node.json file.
+#
+# The node.json file contains the machines IP address, the machine ID (a number)
+# and the repo server.
+#
+# If the node is being clustered, the role 'clustered' is added, and after
+# clustering the tag 'clustered' is added (for homer/homestead)
+#
+# The node.json file is templated in lib/node_json_template.
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument('--cluster', action='store_true')
+parser.add_argument('--tag', action='store_true')
+
+args = parser.parse_args()
+
+# Populate the dictionary
+d = {}
+
+d['LOCAL_IP'] = socket.gethostbyname(subprocess.check_output(["unit-get", "private-address"]).rstrip())
+d['MACHINE_ID'] = str(int(os.environ['JUJU_UNIT_NAME'].split('/')[1]) + 1)
+d['REPO'] = subprocess.check_output(["config-get", "repo"]).rstrip()
+
+node_file = "/home/ubuntu/chef-solo/node.json"
+if args.cluster or (os.path.exists(node_file) and "clustered" in open(node_file).read()):
+        d['CLUSTER'] = ",\n    \"role[clustered]\""
+        d['CLUSTERED'] = ", \"clustered\""
+        d['TAG'] = ""
+
+        if args.tag or (os.path.exists(node_file) and "tags" in open(node_file).read()):
+                d['TAG'] = ",\n  \"tags\": [\"clustered\"]"
+
+else:
+        d['CLUSTER'] = ""
+        d['CLUSTERED'] = ""
+        d['TAG'] = ""
+
+# Open template file
+charm_dir = os.environ['CHARM_DIR']
+with open( '%s/lib/node_json_template' % charm_dir ) as f:
+        src = string.Template( f.read() )
+
+# Make the substitutions
+result = src.substitute(d)
+
+# Write to ~/chef-solo/node.json
+with open('/home/ubuntu/chef-solo/node.json', 'w') as f:
+        f.write(result)

=== added file 'telco/precise/clearwater-homestead/lib/node_json_template'
--- telco/precise/clearwater-homestead/lib/node_json_template	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/node_json_template	2014-11-10 14:55:38 +0000
@@ -0,0 +1,17 @@
+{
+  "id": "$LOCAL_IP",
+  "name": "$LOCAL_IP",
+  "chef_environment": "_default",
+  "role": "homestead",
+  "roles": ["clearwater-infrastructure", "homestead"$CLUSTERED],
+  "cloud": {
+    "local_ipv4": "$LOCAL_IP"
+  },
+  "clearwater": {
+    "index": $MACHINE_ID,
+    "repo_server": "$REPO"
+  },
+  "run_list": [
+    "role[homestead]"$CLUSTER
+  ]$TAG
+}

=== added file 'telco/precise/clearwater-homestead/lib/restart'
--- telco/precise/clearwater-homestead/lib/restart	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/restart	2014-11-10 14:55:38 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+# Restart clearwater-infrastructure, and stop homestead/homestead-prov (to be restarted by monit)
+service clearwater-infrastructure restart
+service homestead stop
+service homestead-prov stop

=== added file 'telco/precise/clearwater-homestead/lib/unit-get'
--- telco/precise/clearwater-homestead/lib/unit-get	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/lib/unit-get	2014-11-10 14:55:38 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -ex
+onEC2=false
+key=$1
+val=$(unit-get $1)
+
+if [ -f $CHARM_DIR/lib/provider.txt ]
+then
+    PROVIDER=`cat $CHARM_DIR/lib/provider.txt `
+else
+    #checking dirty ec2 hack will work
+    wget  -q http://169.254.169.254/latest/meta-data/public-ipv4 && onEC2=true
+    if ( "$onEC2" == true )
+    then
+	echo "EC2" >  $CHARM_DIR/lib/provider.txt
+    else
+	echo "NOTEC2" >  $CHARM_DIR/lib/provider.txt
+    fi
+fi
+
+if [ "$PROVIDER" == "EC2" ]
+then
+ if [ "$key" = "public-address" ] &&   [ -n "$(dig +short $val | head -1)" ]
+  then
+   val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+ elif [ "$key" = "private-address" ]
+ then
+   val_ip=$(dig +short $val | head -1)
+   [ -z "$val_ip" ] || val=$val_ip
+   ##if val_ip is empty getting the system IP
+   [ -z "$val_ip" ] && val=`ip route | grep src | cut -d " " -f 12`
+ fi
+fi
+
+echo $val
+

=== added file 'telco/precise/clearwater-homestead/metadata.yaml'
--- telco/precise/clearwater-homestead/metadata.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/metadata.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,18 @@
+name: clearwater-homestead
+summary: Homestead charm for Project Clearwater
+maintainer: Project Clearwater Maintainers <[e-mail]>
+description: Homestead charm for Project Clearwater
+categories:
+  - misc
+subordinate: false
+requires:
+  programmable-multiple:
+    interface: dns-multi
+provides:
+  homestead-cscf:
+    interface: homestead-hss-interface
+  homestead-prov-user:
+    interface: homestead-prov-interface
+peers:
+  homestead:
+    interface: homestead-interface

=== added file 'telco/precise/clearwater-homestead/revision'
--- telco/precise/clearwater-homestead/revision	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-homestead/revision	2014-11-10 14:55:38 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'telco/precise/clearwater-ralf'
=== added file 'telco/precise/clearwater-ralf/README.md'
--- telco/precise/clearwater-ralf/README.md	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/README.md	2014-11-10 14:55:38 +0000
@@ -0,0 +1,90 @@
+# Overview
+
+This charm supports deployment and scaling of the Ralf component of a Project Clearwater system.  See http://www.projectclearwater.org for more information on Project Clearwater.
+
+# Usage
+
+The Ralf service should be deployed as part of a Clearwater system.  A Clearwater system can be deployed in a Juju environment by creating a config.yaml file then running the following commands.
+
+    juju deploy --config config.yaml clearwater-route53
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-ellis
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-bono
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-sprout
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homestead
+    juju deploy --config config.yaml --constraints arch=amd64 clearwater-homer
+    juju add-relation clearwater-ellis clearwater-route53:register-ellis
+    juju add-relation clearwater-bono clearwater-route53:register-bono
+    juju add-relation clearwater-sprout clearwater-route53:register-sprout
+    juju add-relation clearwater-homestead clearwater-route53:register-homestead
+    juju add-relation clearwater-homer clearwater-route53:register-homer
+    juju expose clearwater-bono
+    juju expose clearwater-ellis
+
+The config.yaml configuration file takes the following format.
+
+    clearwater-route53:
+      zone: <domain>
+      access_key: <ec2 access key>
+      secret_key: <ec2 secret access key>
+      sas: "0.0.0.0"
+
+    clearwater-ellis:
+      smtp_server: smtp.cw-ngv.com
+      smtp_username: username
+      smtp_password: password
+      email_sender: [e-mail]<mailto:[e-mail]>
+      signup_key: secret
+      base_number: "6505550000"
+      number_count: 1000
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-bono:
+      turn_workaround: password
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-sprout:
+      reg_min_expires: 400
+      session_max_expires: 900
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homestead:
+      repo: http://repo.cw-ngv.com/stable
+
+    clearwater-homer:
+      repo: http://repo.cw-ngv.com/stable
+
+Note that the clearwater-ralf charm can only be deployed on the `amd64` architecture.
+
+## Scale out Usage
+
+## Known Limitations and Issues
+
+The only currently supported DNS service for Clearwater is clearwater-route53 (when deploying in Amazon EC2), so will currently only work on EC2.  Additional DNS services will be added for other environments in future.
+
+clearwater-ralf currently only supports running as a single unit.  Clustering support will be released shortly, which will allow units to be added to and removed from a clearwater-ralf deployment using juju add-unit and juju remove-unit commands.
+
+Note that this charm does not current pass charm proof because its hooks use EC2 APIs directly to obtain the public IP address rather than unit-get public-address.  This is to work around what looks like a Juju bug - unit-get public-address on EC2 returns the public hostname of the unit rather than the public IP address.  Unfortunately EC2 public hostname are actually split horizon hostnames, so if you attempt to resolve the hostname from within EC2 it actually resolved to a private IP address - it will only resolve to a public address if resolved from outside EC2.
+
+# Configuration
+
+Clearwater has a number of configuration fields which are non-defaultable.  These are as follows.
+
+clearwater-route53
+
+-  `zone:` This must be set to a DNS zone name which is managed by the AWS Route53 service.
+-  `access_key:` and `secret_key:` These must be set to the AWS access key and secret key of the AWS account which owns the DNS zone name.
+
+clearwater-ellis
+
+-  `signup_key:` This is used as a signup key on the Ellis self-provisioning portal, so should be set to a unique string for each installation.
+-  `base_number:` and `number_count:` These define the telephone number range assigned to the Clearwater system.
+
+# Contact Information
+
+## Upstream Project Name
+
+See http:www.projectclearwater.org and https://github.com/Metaswitch/clearwater-docs/wiki for information about clearwater.
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+The Clearwater mailing list is at lists.projectclearwater.org.

=== added file 'telco/precise/clearwater-ralf/config.yaml'
--- telco/precise/clearwater-ralf/config.yaml	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/config.yaml	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+options:
+  zone:
+    description: The DNS root zone for this service
+    type: string
+  sas:
+    default: ""
+    description: The location of the SAS server
+    type: string
+  repo:
+    default: http://repo.cw-ngv.com/stable
+    description: The location of the repo server
+    type: string

=== added file 'telco/precise/clearwater-ralf/copyright'
--- telco/precise/clearwater-ralf/copyright	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/copyright	2014-11-10 14:55:38 +0000
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2013  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at [e-mail] or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.

=== added directory 'telco/precise/clearwater-ralf/hooks'
=== added file 'telco/precise/clearwater-ralf/hooks/config-changed'
--- telco/precise/clearwater-ralf/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/config-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Update the /etc/clearwater/config file, the node.json, and re-run
+# chef-solo
+$CHARM_DIR/lib/config_script
+$CHARM_DIR/lib/node_json_script
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-ralf/hooks/install'
--- telco/precise/clearwater-ralf/hooks/install	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/install	2014-11-10 14:55:38 +0000
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+# This is a big hack.  Juju on EC2 returns hostnames rather than IP addresses
+# for public-address and private-address.  To work-around this, we resolve the
+# host names.  However, after we've joined to the DNSaaS charm, we can no longer
+# resolve these, so add them to /etc/hosts.
+if ! grep "# added by clearwater-*/hooks/install" /etc/hosts ; then
+  private_address=$(unit-get private-address)
+  public_address=$(unit-get public-address)
+  private_ip=$($CHARM_DIR/lib/unit-get private-address)
+  public_ip=$($CHARM_DIR/lib/unit-get public-address)
+  [ "$private_address" = "$private_ip" ] || echo "$private_ip $private_address # added by clearwater-*/hooks/install" >>/etc/hosts
+  [ "$public_address" = "$public_ip" ] || echo "$public_ip $public_address $(sed -e 's/\..*$//' <<< $public_address) # added by clearwater-*/hooks/install" >>/etc/hosts
+  echo "$private_ip ralf-$(cut -d/ -f2 <<< $JUJU_UNIT_NAME).$(config-get zone) # added by clearwater-*/hooks/install" >>/etc/hosts
+fi
+
+# Install chef solo
+$CHARM_DIR/lib/chef_solo_install
+
+this_ip=`unit-get private-address`
+this_index=$(echo $JUJU_UNIT_NAME | cut -d'/' -f2)
+$CHARM_DIR/lib/node_json_clustered_script --ip "$this_ip" --index "$this_index"
+$CHARM_DIR/lib/node_json_script
+
+# Update the config file
+$CHARM_DIR/lib/config_script
+
+apt-get update
+
+# Install the node
+chef-solo -c /home/ubuntu/chef-solo/solo.rb -j /home/ubuntu/chef-solo/node.json
+
+# Expose the correct ports
+open-port 22/tcp
+open-port 123/udp
+open-port 161/udp

=== added file 'telco/precise/clearwater-ralf/hooks/programmable-multiple-relation-changed'
--- telco/precise/clearwater-ralf/hooks/programmable-multiple-relation-changed	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/programmable-multiple-relation-changed	2014-11-10 14:55:38 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+# Set our DNS requirements
+TTL=300
+id=$(cut -d/ -f2 <<< $JUJU_UNIT_NAME)
+ip=$($CHARM_DIR/lib/unit-get private-address)
+relation-set domain=$(config-get zone)
+relation-set resources='ralf '$TTL' IN A '$ip'
+ralf-'$id' '$TTL' IN A '$ip
+
+# Update our DNS server
+if [ "$(relation-get public-address)" != "" ]
+then
+  echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
+  mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
+  service dnsmasq restart
+fi
+
+# Update Clearwater configuration and restart
+$CHARM_DIR/lib/config_script programmable-multiple
+$CHARM_DIR/lib/restart

=== added file 'telco/precise/clearwater-ralf/hooks/ralf-cscf-relation-joined'
--- telco/precise/clearwater-ralf/hooks/ralf-cscf-relation-joined	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/ralf-cscf-relation-joined	2014-11-10 14:55:38 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+relation-set public-address=ralf.$(config-get zone)

=== added file 'telco/precise/clearwater-ralf/hooks/start'
--- telco/precise/clearwater-ralf/hooks/start	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/start	2014-11-10 14:55:38 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# This hook needs to be idempotent, so this could be run when ralf is
+# already running, when it's running but not monitored by monit, when
+# it's stopped but being monitored (so it's about to start), or stopped
+# and unmonitored. To cover all these cases, stop monit, start ralf, start
+# monit, then finally have monit monitor ralf
+service monit stop
+service ralf start
+service monit start
+sleep 1
+monit monitor ralf

=== added file 'telco/precise/clearwater-ralf/hooks/stop'
--- telco/precise/clearwater-ralf/hooks/stop	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/stop	2014-11-10 14:55:38 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Stop ralf via monit
+sudo service monit start
+sudo monit stop ralf

=== added file 'telco/precise/clearwater-ralf/hooks/upgrade-charm'
--- telco/precise/clearwater-ralf/hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/hooks/upgrade-charm	2014-11-10 14:55:38 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install and
+# hooks/config-changed to ensure all updates are processed
+set -e
+
+$CHARM_DIR/hooks/install
+$CHARM_DIR/hooks/config-changed

=== added file 'telco/precise/clearwater-ralf/icon.svg'
--- telco/precise/clearwater-ralf/icon.svg	1970-01-01 00:00:00 +0000
+++ telco/precise/clearwater-ralf/icon.svg	2014-11-10 14:55:38 +0000
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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