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

[Nicolas Thomas]

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

42. By Darryl Weaver on 2014-10-23

Removed telco-bundle.yaml in preference to the newer version.
Added Openstack Juno Bundle for testing.
Added Cloudfoundry bundle for testing.
Added openmrs as example Tomcat app, but needs bug fixing.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-10-21 10:24:08 +0000
@@ -0,0 +1,3 @@
+precise
+telco/precise
+telco/trusty

=== modified file 'telco/01-deploy.sh'
--- telco/01-deploy.sh	2014-08-07 15:14:28 +0000
+++ telco/01-deploy.sh	2014-10-21 10:24:08 +0000
@@ -8,4 +8,9 @@
 
 set -e
 
-juju-deployer -c telco-bundle.yaml
+if [[ -d precise/  &&  -d trusty/ ]]
+then
+    juju-deployer -c bundle-telco.yaml
+else
+    echo "Run ./bzr-sync-local-charms before running this script"
+fi

=== modified file 'telco/README'
--- telco/README	2014-09-23 19:13:00 +0000
+++ telco/README	2014-10-21 10:24:08 +0000
@@ -1,9 +1,10 @@
 Telco demo deployment
 
-Works on Amazon EC2.
-Does not currently deploy correctly on the OB, due to a charm error with DNS.
-
-Run commands in order:
-00-bootstrap.sh
-01-deploy.sh
-99-cleanup.sh
+Works on Amazon EC2 and OpenStack 
+
+Doing a local copy to be able to have the images as it comes from a personnal namespace.
+
+TODO: 
+      automate users creation
+      script document integration with zabbix
+

=== added file 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml	1970-01-01 00:00:00 +0000
+++ telco/bundle-telco.yaml	2014-10-21 10:24:08 +0000
@@ -0,0 +1,122 @@
+phone-network: 
+  services: 
+    "clearwater-bono": 
+      charm: "local: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: "local: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: "local: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: "local: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: "local:precise/clearwater-sprout"
+      num_units: 1
+      options: 
+        zone: clearwater.local
+      constraints: arch=amd64
+      expose: true
+      annotations: 
+        "gui-x": "400"
+        "gui-y": "600"
+    dns: 
+      charm: "local: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/bzr-sync-local-charms'
--- telco/bzr-sync-local-charms	1970-01-01 00:00:00 +0000
+++ telco/bzr-sync-local-charms	2014-10-21 10:24:08 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash 
+
+
+set -e
+
+ROOT=$PWD
+mkdir -p precise
+cd precise
+for f in clearwater-bono/   clearwater-homer/      clearwater-ralf/    dns/ clearwater-ellis/  clearwater-homestead/  clearwater-sprout/
+do
+    if [ -d $f ] 
+    then
+	cd $f
+	bzr pull
+	cd ..
+    else
+	bzr branch lp:~thomnico/charms/precise/$f/trunk $f
+    fi
+    
+done
+
+cd $ROOT
+mkdir -p trusty
+cd trusty
+for f in sipml5
+do
+    if [ -d $f ] 
+    then
+	cd $f
+	bzr pull
+	cd ..
+    else
+	bzr branch lp:~thomnico/charms/trusty/$f/trunk $f
+    fi
+done

=== renamed file 'telco/telco-bundle.yaml' => 'telco/telco-bundle.yaml.THIS'