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

[Nicolas Thomas]

[Nicolas Thomas (thomnico)]

review: Approve

[Nicolas Thomas (thomnico)]

review: Approve

=== removed directory 'openstack/ha/icehouse'
=== removed file 'openstack/ha/icehouse/trusty-icehouse-ra-ha.sh'
--- openstack/ha/icehouse/trusty-icehouse-ra-ha.sh	2015-03-24 21:54:55 +0000
+++ openstack/ha/icehouse/trusty-icehouse-ra-ha.sh	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-CONFIG_FILE="./trusty-icehouse-ra.yaml"
-DEPLOYER_OPTIONS="-s 600 -w 1200 -t 9999"
-WAIT_TIME="600"
-
-# Bootstrap the environment
-juju status || juju bootstrap
-#sleep "${WAIT_TIME}"
-juju-deployer -c "${CONFIG_FILE}" -d trusty-icehouse-baremetal-services $DEPLOYER_OPTIONS
-sleep "${WAIT_TIME}"
-juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-haclusters $DEPLOYER_OPTIONS
-sleep "${WAIT_TIME}"
-juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-lxc-services $DEPLOYER_OPTIONS
-sleep "${WAIT_TIME}"
-juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-base-relations $DEPLOYER_OPTIONS
-sleep "${WAIT_TIME}"
-juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-ha-relations $DEPLOYER_OPTIONS

=== removed file 'openstack/ha/icehouse/trusty-icehouse-ra.yaml'
--- openstack/ha/icehouse/trusty-icehouse-ra.yaml	2015-03-24 21:54:55 +0000
+++ openstack/ha/icehouse/trusty-icehouse-ra.yaml	1970-01-01 00:00:00 +0000
@@ -1,288 +0,0 @@
-trusty-icehouse-baremetal-services:
-  series: trusty
-  services:
-    nova-compute:
-      charm: nova-compute
-      branch: lp:charms/trusty/nova-compute
-      num_units: 7
-      options:
-        config-flags: "auto_assign_floating_ip=False"
-        enable-live-migration: True
-        enable-resize: True
-        virt-type: qemu
-    ceph-osd:
-      charm: ceph-osd
-      branch: lp:charms/trusty/ceph-osd
-      num_units: 7
-      to:
-      - nova-compute=0
-      - nova-compute=1
-      - nova-compute=2
-      - nova-compute=3
-      - nova-compute=4
-      - nova-compute=5
-      - nova-compute=6
-      options:
-        osd-devices: /dev/sdb
-        osd-reformat: "yes"
-    neutron-gateway:
-      charm: quantum-gateway
-      branch: lp:charms/trusty/quantum-gateway
-      num_units: 1
-      options:
-        instance-mtu: 1350
-        ext-port: eth1
-        plugin: ovs
-      to: 0
-    neutron-openvswitch:
-      charm: neutron-openvswitch
-      branch: lp:charms/trusty/neutron-openvswitch
-    ceilometer-agent:
-      charm: ceilometer-agent
-      branch: lp:charms/trusty/ceilometer-agent
-
-trusty-icehouse-lxc-services:
-  inherits: trusty-icehouse-baremetal-services
-  series: trusty
-  services:
-    mysql:
-      charm: percona-cluster
-      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
-      num_units: 3
-      options:
-        vip: 192.168.1.95
-        root-password: ubuntu
-        sst-password: ubuntu
-        ha-bindiface: eth0
-        access-network: "192.168.1.0/24"
-      to:
-      - lxc:nova-compute=3
-      - lxc:nova-compute=4
-      - lxc:nova-compute=5
-    rabbitmq-server:
-      charm: rabbitmq-server
-      branch: lp:charms/trusty/rabbitmq-server
-      num_units: 3
-      to:
-      - lxc:nova-compute=6
-      - lxc:nova-compute=0
-      - lxc:nova-compute=1
-    keystone:
-      charm: keystone
-      branch: lp:charms/trusty/keystone
-      num_units: 3
-      options:
-        enable-pki: "false"
-        admin-password: openstack
-        admin-token: openstacktesting
-        debug: 'True'
-        log-level: DEBUG
-        vip: 192.168.1.90
-        ha-bindiface: eth0
-      to:
-      - lxc:nova-compute=2
-      - lxc:nova-compute=3
-      - lxc:nova-compute=4
-    openstack-dashboard:
-      charm: openstack-dashboard
-      branch: lp:charms/trusty/openstack-dashboard
-      num_units: 3
-      options:
-        vip: 192.168.1.93
-        ha-bindiface: eth0
-      to:
-      - lxc:nova-compute=5
-      - lxc:nova-compute=6
-      - lxc:nova-compute=0
-    nova-cloud-controller:
-      charm: nova-cloud-controller
-      branch: lp:charms/trusty/nova-cloud-controller
-      num_units: 3
-      options:
-        vip: 192.168.1.97
-        ha-bindiface: eth0
-        network-manager: Quantum
-        quantum-security-groups: "yes"
-        neutron-external-network: Public_Network
-      to:
-      - lxc:nova-compute=1
-      - lxc:nova-compute=2
-      - lxc:nova-compute=3
-    neutron-api:
-      charm: neutron-api
-      branch: lp:charms/trusty/neutron-api
-      num_units: 3
-      options:
-        neutron-security-groups: True
-        neutron-external-network: Public_Network
-        l2-population: False
-        vip: 192.168.1.96
-      to:
-      - lxc:nova-compute=4
-      - lxc:nova-compute=5
-      - lxc:nova-compute=6
-    cinder:
-      charm: cinder
-      branch: lp:charms/trusty/cinder
-      num_units: 3
-      options:
-        block-device: "None"
-        ceph-osd-replication-count: 3
-        glance-api-version: 2
-        vip: 192.168.1.94
-      to:
-      - lxc:nova-compute=0
-      - lxc:nova-compute=1
-      - lxc:nova-compute=2
-    glance:
-      charm: glance
-      branch: lp:charms/trusty/glance
-      num_units: 3
-      options:
-        ceph-osd-replication-count: 3
-        vip: 192.168.1.92
-        ha-bindiface: eth0
-      to:
-      - lxc:nova-compute=3
-      - lxc:nova-compute=4
-      - lxc:nova-compute=5
-    ceph:
-      charm: ceph
-      branch: lp:charms/trusty/ceph
-      num_units: 3
-      options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/sdb
-        osd-reformat: "yes"
-      to:
-      - lxc:nova-compute=6
-      - lxc:nova-compute=0
-      - lxc:nova-compute=1
-    ceilometer:
-      charm: ceilometer
-      branch: lp:charms/trusty/ceilometer
-      to:
-      - lxc:nova-compute=2
-    mongodb:
-      charm: mongodb
-      branch: lp:charms/mongodb
-      to:
-      - lxc:nova-compute=3
-    heat:
-      charm: heat
-      branch: lp:charms/trusty/heat
-      to:
-      - lxc:nova-compute=4
-
-trusty-icehouse-haclusters:
-  series: trusty
-  services:
-    mysql-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.1
-        corosync_key: "3r8Y1zILzqADvJB7eLJGPrCI4g5Tg+uZ0+qq1kXNe0273yZlee9k2VT1twsyaSx3tNDDIcfuM/ykQNFRLw6dOWdXPbzgqIM5M5FExYQlXv2+s3kowRL0xuanVWXucaKu+t3jDDxmVnhj0SY/ixl3Gg0XrW4qXFoK05uMoIhK8Js="
-    keystone-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.5
-        corosync_key: "6aVson6XvaprzAppLB6UA4OUgZIyNtW+qVwbanQta0aLMagwbPNomTniLr3ZyVGtEL7A0c48tJvaA+lafL2HzGq+43/aKnUbG5k7d4sKaQXP/sKLhCpyj+04DddBRAVsBJ6r9tG45CGF+H+qUykL1rOT0EesZhDqBiBGrV+DXes="
-    dashboard-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.9
-        corosync_key: "9aNUFk+o0Hqt/6i46ltcycMogHm+bgOkhsIwBwuXX3YQZfvioZZZqggi9R9Ccj1OqIrxLA+GTstghYcc/hjULhIl3BIX6HAdePhX7sI8khTCiPTN/w4MIy3nW1CjFaeWW31CIhrXnTcq11l0MEB3vKNlN5/b7/kqvagB6oSjw4s="
-    ncc-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.6
-        corosync_key: "xZP7GDWV0e8Qs0GxWThXirNNYlScgi3sRTdZk/IXKDqkNFcwdCWfRQnqrHU/6mb6sz6OIoZzX2MtfMQIDcXuPqQyvKuv7YbRyGHmQwAWDUA4ed759VWAO39kHkfWp9y5RRk/wcHakTcWYMwm70upDGJEP00YT3xem3NQy27AC1w="
-    neutron-api-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.7
-        corosync_key: "7ys/duGU2j/gGcRnKVLGSiWF8zIYQG9yy0MPMwfLtHaGQ3pYnGnMbXQD8o2HbVuzY/YPHHeAO2gQ
-/oS+7XGmNqPwiTyavlPBDVEfCx8nYIhXLntngIbeoa2VW9C63cYLmsnI4fn3Lo/S9UuEWilV295O
-wO0v+er33MVR/6Qy+Ik="
-    cinder-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.8
-        corosync_key: "wllBMGAfdCsotmXGbCbJ0LhAuOPQ9ZEIIAXIWWeNLwrmC7C9jmm92RSL1kYGCRRWaL7W7AziA6aBy//rZxeZ3z0YkM0QFD+4Vg7vtM6JaBoOFlJgVd6mbYUfVbI6IMqGiUDJ8hh5sKmN7kwQLNNwASGlJiMo5s9ErWviVM6/OrQ="
-    glance-hacluster:
-      charm: hacluster
-      branch: lp:charms/trusty/hacluster
-      options:
-        corosync_mcastaddr: 226.94.1.7
-        corosync_key: "eO34WuxbQ/FaQvYb/ffTtX+0phNfNZlmhRrC8gLYJMf/b52Ny3cRXjgp5P1lEfZFHjrhQ3lWQOqENuBVcejS1OYt574Xq2l1XLEHoEPbktovDhaS9yxIU7SYULdlx7j/BNtW7evY0pRBr23MYWEI3hETHVdtOeqgW1IB3zgoyco="
-
-trusty-icehouse-base-relations:
-  inherits:
-    - trusty-icehouse-baremetal-services
-    - trusty-icehouse-lxc-services
-    - trusty-icehouse-haclusters
-  relations:
-    - [ ceph-osd, ceph ]
-    - [ mysql, mysql-hacluster ]
-    - [ keystone, keystone-hacluster ]
-    - [ nova-cloud-controller, ncc-hacluster ]
-    - [ glance, glance-hacluster ]
-    - [ cinder, cinder-hacluster ]
-    - [ openstack-dashboard, dashboard-hacluster ]
-    - [ neutron-api, neutron-api-hacluster ]
-
-trusty-icehouse-ha-relations:
-  inherits:
-    - trusty-icehouse-baremetal-services
-    - trusty-icehouse-lxc-services
-    - trusty-icehouse-haclusters
-    - trusty-icehouse-base-relations
-  relations:
-    - [ keystone, mysql ]
-    - [ nova-cloud-controller, mysql ]
-    - [ nova-cloud-controller, rabbitmq-server ]
-    - [ nova-cloud-controller, glance ]
-    - [ nova-cloud-controller, keystone ]
-    - [ nova-compute, nova-cloud-controller ]
-    - [ 'nova-compute:shared-db', 'mysql:shared-db' ]
-    - [ nova-compute, 'rabbitmq-server:amqp' ]
-    - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ glance, ceph ]
-    - [ glance, cinder ]
-    - [ glance, rabbitmq-server ]
-    - [ cinder, mysql ]
-    - [ cinder, rabbitmq-server ]
-    - [ cinder, nova-cloud-controller ]
-    - [ cinder, keystone ]
-    - [ cinder, ceph ]
-    - [ neutron-gateway, mysql ]
-    - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
-    - [ neutron-gateway, nova-cloud-controller ]
-    - [ openstack-dashboard, keystone ]
-    - [ ceilometer, keystone ]
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
-    - [ heat, mysql ]
-    - [ heat, keystone ]
-    - [ heat, rabbitmq-server ]
-    - [ neutron-api, rabbitmq-server ]
-    - [ neutron-api, mysql ]
-    - [ neutron-api, nova-cloud-controller ]
-    - [ neutron-api, keystone ]
-    - [ neutron-api, neutron-gateway ]
-    - [ neutron-api, neutron-openvswitch ]
-    - [ neutron-openvswitch, rabbitmq-server ]
-    - [ neutron-openvswitch, nova-compute ]

=== removed file 'telco/01-deploy.sh'
--- telco/01-deploy.sh	2015-01-26 21:59:10 +0000
+++ telco/01-deploy.sh	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-#Install juju-deployer package
-#sudo apt-get install -y juju-deployer
-
-#Deploy the bundle
-#TODO: soft link to bundle to stable and bleeding edge charm revisions
-
-set -e
-
-export JUJU_REPOSITORY=$PWD
-juju-deployer -r 3 -c bundle-telco.yaml
-

=== removed file 'telco/BulkUsersCreation.sh'
--- telco/BulkUsersCreation.sh	2015-01-26 13:48:58 +0000
+++ telco/BulkUsersCreation.sh	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/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"

=== added file 'telco/README'
--- telco/README	1970-01-01 00:00:00 +0000
+++ telco/README	2015-09-23 10:59:49 +0000
@@ -0,0 +1,3 @@
+This is deprecated in favor of a shareable example 
+Go to : https://github.com/thomnico/juju-nfv-clearwater-restcomm 
+And enjoy/contribute to the magic
\ No newline at end of file

=== removed file 'telco/README'
--- telco/README	2015-02-05 10:03:07 +0000
+++ telco/README	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-Telco demo deployment
-
-Works on Amazon EC2 and OpenStack 
-
-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.
-
-Use clearwater by using the login at:
-Show: http://www.projectclearwater.org/wp-content/uploads/2013/05/project-clearwater-architecture-april-2014-2.png
-Architecture
-
-http://ellis-IP/
-Go to signup page:
-e-mail/name: your choice.
-signup code : signup
-password suggestion: AAbbCCdd
-
-
-Run:  BulkUsersCreation.sh 
-
-Use restcomm using the login at:
-http://restcomm-IP:8080/restcomm-management
-email: [e-mail]
-pass: RestComm
-
-Show the designer: 
-http://www.restcomm.com/developers/
-
-
-

=== removed file 'telco/bundle-telco-store.yaml'
--- telco/bundle-telco-store.yaml	2015-01-26 15:01:14 +0000
+++ telco/bundle-telco-store.yaml	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-phone-network: 
-  services: 
-    "clearwater-bono": 
-      charm: "cs:~thomnico/precise/clearwater-bono"
-      num_units: 1
-      options: 
-        zone: clearwater.local
-      constraints: arch=amd64 mem=2G
-      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 mem=2G
-      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 mem=2G
-      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 mem=2G
-      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 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "400"
-        "gui-y": "600"
-    dns: 
-      charm: "cs:~thomnico/precise/dns"
-      num_units: 1
-      constraints: arch=amd64 mem=2G
-      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
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "-78.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-y": "698.5485784445332"
-    sipml5: 
-      charm: "cs:~thomnico/trusty/sipml5-1"
-      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
-      constraints: arch=amd64 mem=2G
-      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

=== removed file 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml	2015-02-18 16:44:51 +0000
+++ telco/bundle-telco.yaml	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-phone-network: 
-  services: 
-    "clearwater-bono": 
-      charm: "cs:~thomnico/precise/clearwater-bono"
-      num_units: 1
-      options: 
-        zone: clearwater.local
-      constraints: arch=amd64 mem=2G
-      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 mem=2G
-      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 mem=2G
-      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 mem=2G
-      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 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "400"
-        "gui-y": "600"
-    dns: 
-      charm: "cs:~thomnico/precise/dns"
-      num_units: 1
-      constraints: arch=amd64 mem=2G
-      expose: true
-      options: 
-        domain: clearwater.local
-      annotations: 
-        "gui-x": "1000"
-        "gui-y": "450"
-    "telscale-load-balancer": 
-      charm: "cs:~thomnico/trusty/telscale-load-balancer"
-      num_units: 1
-      expose: true
-      constraints: arch=amd64 mem=2G
-      annotations: 
-        "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": "-500.8215242215981"
-        "gui-y": "698.5485784445332"
-    sipml5: 
-      charm: "cs:~thomnico/trusty/sipml5"
-      num_units: 1
-      expose: true
-      annotations: 
-        "gui-x": "1383.4697265625"
-        "gui-y": "423.10858154296875"
-    "telscale-restcomm": 
-      charm: "cs:~thomnico/trusty/telscale-restcomm"
-      num_units: 1
-      constraints: arch=amd64 mem=2G
-      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

=== removed file 'telco/integrate-with-ext-zabbix'
--- telco/integrate-with-ext-zabbix	2014-10-29 14:48:40 +0000
+++ telco/integrate-with-ext-zabbix	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-#!/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"
-

=== removed file 'telco/mydomain-bundle.sh'
--- telco/mydomain-bundle.sh	2015-05-27 14:51:22 +0000
+++ telco/mydomain-bundle.sh	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-#!/bin/bash -e
-
-
-mydomain=$1
-cat > bundle-$mydomain.yaml <<EOF
-phone-network: 
-  services: 
-    "clearwater-bono": 
-      charm: "cs:~thomnico/precise/clearwater-bono"
-      num_units: 1
-      options: 
-        zone: $mydomain
-      constraints: arch=amd64 mem=2G
-      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: $mydomain
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "400"
-        "gui-y": "0"
-      to: 
-        - lxc:clearwater-bono=0
-    clearwater-homer: 
-      charm: "cs:~thomnico/precise/clearwater-homer"
-      num_units: 1
-      options: 
-        zone: $mydomain
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "600"
-        "gui-y": "300"
-    "clearwater-homestead": 
-      charm: "cs:~thomnico/precise/clearwater-homestead"
-      num_units: 1
-      options: 
-        zone: $mydomain
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "200"
-        "gui-y": "300"
-      to: lxc:clearwater-homer=0
-    clearwater-sprout: 
-      charm: "cs:~thomnico/precise/clearwater-sprout"
-      num_units: 1
-      options: 
-        zone: $mydomain
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "400"
-        "gui-y": "600"
-    dns: 
-      charm: "cs:~thomnico/precise/dns"
-      num_units: 1
-      constraints: arch=amd64 mem=2G
-      expose: true
-      options: 
-        domain: $mydomain
-      annotations: 
-        "gui-x": "1000"
-        "gui-y": "450"
-      to: lxc:clearwater-bono=0
-    telscale-load-balancer: 
-      charm: "cs:~thomnico/trusty/telscale-load-balancer"
-      num_units: 1
-      expose: true
-      constraints: arch=amd64 mem=2G
-      annotations: 
-        "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": "-500.8215242215981"
-        "gui-y": "698.5485784445332"
-      to: lxc:telscale-load-balancer=0
-    sipml5:
-      charm: "cs:~thomnico/trusty/sipml5"
-      num_units: 1
-      expose: true
-      annotations: 
-        "gui-x": "1383.4697265625"
-        "gui-y": "423.10858154296875"
-      to: lxc:clearwater-bono=0
-    telscale-restcomm: 
-      charm: "cs:~thomnico/trusty/telscale-restcomm"
-      num_units: 1
-      constraints: arch=amd64 mem=2G
-      expose: true
-      annotations: 
-        "gui-x": "-500.625244140625"
-        "gui-y": "547.9537963867188"
-      to: lxc:telscale-load-balancer=0
-  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
-EOF
-
-echo "You can know drag/drop bundle-$mydomain.yaml"
-echo "Or juju-quickstart bundle-$mydomain.yaml"
-echo " "

=== removed file 'telco/redirect-google-dns-to-ob'
--- telco/redirect-google-dns-to-ob	2015-01-07 02:09:22 +0000
+++ telco/redirect-google-dns-to-ob	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo iptables -t nat -A PREROUTING -i br0 -d 8.8.8.8 -j DNAT --to-destination 10.14.4.1