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

[Nicolas Thomas]

=== added file 'bin/orange-box-resetproxy'
--- bin/orange-box-resetproxy	1970-01-01 00:00:00 +0000
+++ bin/orange-box-resetproxy	2014-10-29 15:02:22 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+#    orange-box-resetproxy
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Nicolas Thomas <[e-mail]>
+#
+#    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, version 3 of the License.
+#
+#    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/>.
+
+set -ex
+# Only run this as root
+if [ $EUID -ne 0 ]
+then
+        echo Execute as root or with \"sudo $0\"
+        exit 1
+fi
+
+
+
+service maas-proxy stop
+rm -rf  /var/spool/maas-proxy/*
+squid3 -z -f /etc/maas/maas-proxy.conf 
+sleep 20
+service maas-proxy start

=== modified file 'telco/README'
--- telco/README	2014-10-21 10:16:11 +0000
+++ telco/README	2014-10-29 15:02:22 +0000
@@ -4,7 +4,18 @@
 
 Doing a local copy to be able to have the images as it comes from a personnal namespace.
 
+Once started and if you create a zabbix machine run:
+ 
+integrate-with-ext-zabbix <IP of the zabbix machine>
+
+
+If bzr-sync-local-charms failed do this :
+juju-deployer -c bundle-telco-store.yaml 
+
+#Or drag and drop the only drawback is not having the logos on the gui.
+
+
 TODO: 
       automate users creation
-      script document integration with zabbix
+
 

=== added file 'telco/bundle-telco-store.yaml'
--- telco/bundle-telco-store.yaml	1970-01-01 00:00:00 +0000
+++ telco/bundle-telco-store.yaml	2014-10-29 15:02:22 +0000
@@ -0,0 +1,122 @@
+phone-network: 
+  services: 
+    "clearwater-bono": 
+      charm: "cs:~thomnico/precise/clearwater-bono"
+      num_units: 1
+      options: 
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "400"
+        "gui-y": "900"
+    "clearwater-ellis": 
+      charm: "cs:~thomnico/precise/clearwater-ellis"
+      num_units: 1
+      options: 
+        base_number: "1234567000"
+        number_count: 1000
+        signup_key: signup
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "400"
+        "gui-y": "0"
+    "clearwater-homer": 
+      charm: "cs:~thomnico/precise/clearwater-homer"
+      num_units: 1
+      options: 
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "600"
+        "gui-y": "300"
+    "clearwater-homestead": 
+      charm: "cs:~thomnico/precise/clearwater-homestead"
+      num_units: 1
+      options: 
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "200"
+        "gui-y": "300"
+    "clearwater-sprout": 
+      charm: "cs:~thomnico/precise/clearwater-sprout"
+      num_units: 1
+      options: 
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "400"
+        "gui-y": "600"
+    dns: 
+      charm: "cs:~thomnico/precise/dns"
+      num_units: 1
+      options: 
+        domain: clearwater.local
+      annotations: 
+        "gui-x": "1000"
+        "gui-y": "450"
+    "telscale-load-balancer": 
+      charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"
+      num_units: 1
+      expose: true
+      annotations: 
+        "gui-x": "-78.2210693359375"
+        "gui-y": "412.7301025390625"
+    mysql: 
+      charm: "cs:trusty/mysql-5"
+      num_units: 1
+      annotations: 
+        "gui-x": "-857.8215242215981"
+        "gui-y": "698.5485784445332"
+    sipml5: 
+      charm: "local:trusty/sipml5"
+      num_units: 1
+      expose: true
+      annotations: 
+        "gui-x": "1383.4697265625"
+        "gui-y": "423.10858154296875"
+    "telscale-restcomm": 
+      charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"
+      num_units: 1
+      expose: true
+      annotations: 
+        "gui-x": "-500.625244140625"
+        "gui-y": "547.9537963867188"
+  relations: 
+    - - "clearwater-bono:scscf"
+      - "clearwater-sprout:pcscf"
+    - - "clearwater-homestead:homestead-cscf"
+      - "clearwater-sprout:homestead-hss"
+    - - "clearwater-homer:xdms-user"
+      - "clearwater-sprout:xdms"
+    - - "clearwater-ellis:homestead-prov"
+      - "clearwater-homestead:homestead-prov-user"
+    - - "clearwater-ellis:xdms"
+      - "clearwater-homer:xdms-user"
+    - - "clearwater-ellis:programmable-multiple"
+      - "dns:programmable-multiple"
+    - - "clearwater-homer:programmable-multiple"
+      - "dns:programmable-multiple"
+    - - "clearwater-bono:programmable-multiple"
+      - "dns:programmable-multiple"
+    - - "clearwater-sprout:programmable-multiple"
+      - "dns:programmable-multiple"
+    - - "clearwater-homestead:programmable-multiple"
+      - "dns:programmable-multiple"
+    - - "sipml5:dns-client"
+      - "dns:dns-client"
+    - - "mysql:db"
+      - "telscale-restcomm:database"
+    - - "telscale-restcomm:load-balancer"
+      - "telscale-load-balancer:load-balancer"
+    - - "telscale-load-balancer:clearwater-ellis"
+      - "clearwater-ellis:as-catalog"
+    - - "telscale-restcomm:cscf"
+      - "clearwater-sprout:as"
+  series: trusty

=== added file 'telco/integrate-with-ext-zabbix'
--- telco/integrate-with-ext-zabbix	1970-01-01 00:00:00 +0000
+++ telco/integrate-with-ext-zabbix	2014-10-29 15:02:22 +0000
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+#    integrate with an external zabbix on a machine
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: [e-mail]
+#
+#    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, version 3 of the License.
+#
+#    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
+
+set -ex
+
+VM_IP=$1
+
+if [[ -z "$VM_IP" ]] 
+then
+    echo "must give name/ip of the system to configure on"
+    exit 2
+fi
+
+SSH="ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP " 
+
+export JUJU_ENDPOINT=`juju api-endpoints`
+export ADMIN_PASS=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep admin-secret|awk '{print $2;}'`
+
+
+## Connect to zabbix to juju API 
+
+TMP=`mktemp `
+cat > $TMP <<EOF
+juju-api:
+  endpoint: "wss://$JUJU_ENDPOINT"
+  admin-secret: $ADMIN_PASS
+EOF
+#echo 'juju-api:'; echo '  endpoint: "'$JUJU_ENDPOINT'"'; echo '  admin-secret: '$ADMIN_PASS > $TMP
+
+scp -o StrictHostKeyChecking=no $TMP ubuntu@$VM_IP:/tmp/.jujuapi.yaml
+
+$SSH "sudo mv /tmp/.jujuapi.yaml /usr/lib/zabbix/externalscripts/.jujuapi.yaml"
+$SSH "sudo chown zabbix:zabbix /usr/lib/zabbix/externalscripts/.jujuapi.yaml"
+$SSH "sudo chmod 644  /usr/lib/zabbix/externalscripts/.jujuapi.yaml"
+
+##usr/lib/zabbix/externalscripts/.jujuapi.yaml "
+
+juju deploy  cs:~samuel-cozannet/precise/zabbix-agent || echo "already deployed keep going"
+juju set zabbix-agent server-host=$VM_IP
+
+juju add-relation clearwater-ellis zabbix-agent || echo "already related to ellis keep going"
+
+echo "You can now connect Got to th gui and connect clearwater services to zabbix-agent"
+

=== modified file 'zabbix/install-on-machine'
--- zabbix/install-on-machine	2014-10-16 15:35:39 +0000
+++ zabbix/install-on-machine	2014-10-29 15:02:22 +0000
@@ -28,7 +28,7 @@
 ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP sudo apt-get update
 
 #SSH into the instance and install git
-ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP sudo apt-get -y install git
+ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP sudo apt-get -y install git python-jujuclient
 
 #Get Zabbix code from SamNCo 
 ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP "[[ -d zabbix/ ]] || git clone https://github.com/SaMnCo/ob-zabbix.git zabbix"