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

[Nicolas Thomas]

Changes to adapt to using the charms in the store

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2014-10-28 18:40:11 +0000
+++ .bzrignore	2015-01-26 22:18:28 +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	2015-01-26 22:18:28 +0000
@@ -8,10 +8,6 @@
 
 set -e
 
-if [[ -d precise/  &&  -d trusty/ ]]
-then
-    export JUJU_REPOSITORY=$PWD
-    juju-deployer -c bundle-telco.yaml
-else
-    echo "Run ./bzr-sync-local-charms before running this script"
-fi
+export JUJU_REPOSITORY=$PWD
+juju-deployer -r 3 -c bundle-telco.yaml
+
 
=== added file 'telco/BulkUsersCreation.sh'
--- telco/BulkUsersCreation.sh	1970-01-01 00:00:00 +0000
+++ telco/BulkUsersCreation.sh	2015-01-26 22:18:28 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+## Try ping homer and homestead from ellis before adding user to check dns resolution
+
+juju ssh clearwater-homestead/0 '. /etc/clearwater/config; for DN in {0000..0099} ; do echo sip:$DN@$home_domain,$DN@$home_domain,$home_domain,7kkzTyGW ; done > users.csv'
+
+juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_autocomplete.py users.csv"
+juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_create.py users.auto.csv"
+
+juju ssh clearwater-homestead/0 "./users.auto.create_homestead.sh"
+
+TMP=`mktemp -d`
+juju scp clearwater-homestead/0:~/*xdm* $TMP/
+juju scp $TMP/*xdm* clearwater-homer/0:~/ 
+juju ssh clearwater-homer/0 "./users.auto.create_xdm.sh"
+
+DOMAIN=`juju ssh  clearwater-homestead/0 '. /etc/clearwater/config; echo $home_domain'`
+echo 'users range from 0000@'$DOMAIN
+echo 'to  0099@'$DOMAIN
+echo ' with password 7kkzTyGW created'
+echo "See clearwater doc to configure your clients"
 
=== modified file 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml	2014-11-10 00:33:48 +0000
+++ telco/bundle-telco.yaml	2015-01-26 22:18:28 +0000
@@ -1,7 +1,7 @@
 phone-network: 
   services: 
     "clearwater-bono": 
-      charm: "local:precise/clearwater-bono"
+      charm: "cs:~thomnico/precise/clearwater-bono"
       num_units: 1
       options: 
         zone: clearwater.local
@@ -11,7 +11,7 @@
         "gui-x": "400"
         "gui-y": "900"
     "clearwater-ellis": 
-      charm: "local:precise/clearwater-ellis"
+      charm: "cs:~thomnico/precise/clearwater-ellis"
       num_units: 1
       options: 
         base_number: "1234567000"
@@ -24,7 +24,7 @@
         "gui-x": "400"
         "gui-y": "0"
     "clearwater-homer": 
-      charm: "local:precise/clearwater-homer"
+      charm: "cs:~thomnico/precise/clearwater-homer"
       num_units: 1
       options: 
         zone: clearwater.local
@@ -34,7 +34,7 @@
         "gui-x": "600"
         "gui-y": "300"
     "clearwater-homestead": 
-      charm: "local:precise/clearwater-homestead"
+      charm: "cs:~thomnico/precise/clearwater-homestead"
       num_units: 1
       options: 
         zone: clearwater.local
@@ -44,7 +44,7 @@
         "gui-x": "200"
         "gui-y": "300"
     "clearwater-sprout": 
-      charm: "local:precise/clearwater-sprout"
+      charm: "cs:~thomnico/precise/clearwater-sprout"
       num_units: 1
       options: 
         zone: clearwater.local
@@ -54,9 +54,10 @@
         "gui-x": "400"
         "gui-y": "600"
     dns: 
-      charm: "local:precise/dns"
+      charm: "cs:~thomnico/precise/dns"
       num_units: 1
       constraints: arch=amd64 mem=2G
+      expose: true
       options: 
         domain: clearwater.local
       annotations: 
@@ -68,17 +69,17 @@
       expose: true
       constraints: arch=amd64 mem=2G
       annotations: 
-        "gui-x": "-78.2210693359375"
+        "gui-x": "-500.2210693359375"
         "gui-y": "412.7301025390625"
     mysql: 
       charm: "cs:trusty/mysql-5"
       num_units: 1
       constraints: arch=amd64 mem=2G
       annotations: 
-        "gui-x": "-857.8215242215981"
+        "gui-x": "-500.8215242215981"
         "gui-y": "698.5485784445332"
     sipml5: 
-      charm: "local:trusty/sipml5"
+      charm: "cs:~thomnico/trusty/sipml5"
       num_units: 1
       expose: true
       annotations: 
 
=== removed file 'telco/fix-missing-link'
--- telco/fix-missing-link	2015-01-07 01:46:11 +0000
+++ telco/fix-missing-link	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-for s in ellis homer homestead sprout bono
-do
-	juju ssh clearwater-$s/0 sudo ln -s /etc/init.d/clearwater-monit /etc/init.d/monit
-	juju resolved -r clearwater-$s/0
-done
-
 
=== removed file 'telco/sync-local-charms'
--- telco/sync-local-charms	2014-11-10 11:12:05 +0000
+++ telco/sync-local-charms	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/bash 
-
-
-set -e
-
-echo "You must have bzr launchpad-login set to your Launchpad username and your key available via ssh agent (logged in using ssh -A ubuntu@hostname), otherwise this will fail"
-
-
-ROOT=$PWD
-
-if [ -d clearwater-juju/charms/precise   ] 
-    then
-	cd clearwater-juju
-	git pull 
-	cd ..
-    else
-    git clone https://github.com/Metaswitch/clearwater-juju.git
-    ln -sf clearwater-juju/charms/precise/ .
-fi
-