orange-box-examples

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

  1. telco-cleanup
  2. Merge into trunk
Proposed by Nicolas Thomas
Status: Merged
Approved by: Darryl Weaver
Approved revision: 77
Merge reported by: Darryl Weaver
Merged at revision: not available
Proposed branch: lp:~thomnico/orange-box-examples/telco-cleanup
Merge into: lp:orange-box-examples
Diff against target: 346 lines (+181/-52)
8 files modified
.bzrignore (+0/-2)
telco/01-deploy.sh (+3/-7)
telco/BulkUsersCreation.sh (+21/-0)
telco/README (+14/-4)
telco/bundle-telco.yaml (+10/-9)
telco/fix-missing-link (+0/-10)
telco/mydomain-bundle.sh (+133/-0)
telco/sync-local-charms (+0/-20)
To merge this branch: bzr merge lp:~thomnico/orange-box-examples/telco-cleanup
Reviewer Review Type Date Requested Status
Darryl Weaver (community) Approve
Review via email: mp+248129@code.launchpad.net

Description of the change

Cleaning the Example branch as icons are now available from personnal namespace

Code stays in the store.

To post a comment you must log in.
lp:~thomnico/orange-box-examples/telco-cleanup updated
75. By Nicolas Thomas

modified:
  bin/orange-box-import-SA-keys
pending merges:
  Darryl Weaver 2015-02-04 Added Rafael O. Gonzalez ssh key
    Darryl Weaver 2015-02-03 Added Scott Croft's SSH key

76. By Nicolas Thomas

Bundle creation if having your own domain

added:
  telco/mydomain-bundle.sh

77. By Nicolas Thomas

Typo/better document fixes

modified:
  telco/README

Revision history for this message
Darryl Weaver (dweaver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2014-10-28 18:40:11 +0000
+++ .bzrignore 2015-02-05 10:04:57 +0000
@@ -1,4 +1,2 @@
1precise1precise
2telco/precise
3telco/trusty
4cloudfoundry/trusty2cloudfoundry/trusty
53
=== modified file 'telco/01-deploy.sh'
--- telco/01-deploy.sh 2014-10-27 15:23:26 +0000
+++ telco/01-deploy.sh 2015-02-05 10:04:57 +0000
@@ -8,10 +8,6 @@
88
9set -e9set -e
1010
11if [[ -d precise/ && -d trusty/ ]]11export JUJU_REPOSITORY=$PWD
12then12juju-deployer -r 3 -c bundle-telco.yaml
13 export JUJU_REPOSITORY=$PWD13
14 juju-deployer -c bundle-telco.yaml
15else
16 echo "Run ./bzr-sync-local-charms before running this script"
17fi
1814
=== added file 'telco/BulkUsersCreation.sh'
--- telco/BulkUsersCreation.sh 1970-01-01 00:00:00 +0000
+++ telco/BulkUsersCreation.sh 2015-02-05 10:04:57 +0000
@@ -0,0 +1,21 @@
1#!/bin/bash -e
2
3## Try ping homer and homestead from ellis before adding user to check dns resolution
4
5juju 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'
6
7juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_autocomplete.py users.csv"
8juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_create.py users.auto.csv"
9
10juju ssh clearwater-homestead/0 "./users.auto.create_homestead.sh"
11
12TMP=`mktemp -d`
13juju scp clearwater-homestead/0:~/*xdm* $TMP/
14juju scp $TMP/*xdm* clearwater-homer/0:~/
15juju ssh clearwater-homer/0 "./users.auto.create_xdm.sh"
16
17DOMAIN=`juju ssh clearwater-homestead/0 '. /etc/clearwater/config; echo $home_domain'`
18echo 'users range from 0000@'$DOMAIN
19echo 'to 0099@'$DOMAIN
20echo ' with password 7kkzTyGW created'
21echo "See clearwater doc to configure your clients"
022
=== modified file 'telco/README'
--- telco/README 2014-11-10 00:33:48 +0000
+++ telco/README 2015-02-05 10:04:57 +0000
@@ -15,15 +15,25 @@
15#Or drag and drop the only drawback is not having the logos on the gui.15#Or drag and drop the only drawback is not having the logos on the gui.
1616
17Use clearwater by using the login at:17Use clearwater by using the login at:
18Show: http://www.projectclearwater.org/wp-content/uploads/2013/05/project-clearwater-architecture-april-2014-2.png
19Architecture
20
18http://ellis-IP/21http://ellis-IP/
19signup key: signup22Go to signup page:
23e-mail/name: your choice.
24signup code : signup
25password suggestion: AAbbCCdd
26
27
28Run: BulkUsersCreation.sh
2029
21Use restcomm using the login at:30Use restcomm using the login at:
22http://restcomm-IP:2080/restcomm-management31http://restcomm-IP:8080/restcomm-management
23email: administrator@company.com32email: administrator@company.com
24pass: RestComm33pass: RestComm
2534
26TODO: 35Show the designer:
27 automate users creation36http://www.restcomm.com/developers/
37
2838
2939
3040
=== modified file 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml 2014-11-10 00:33:48 +0000
+++ telco/bundle-telco.yaml 2015-02-05 10:04:57 +0000
@@ -1,7 +1,7 @@
1phone-network: 1phone-network:
2 services: 2 services:
3 "clearwater-bono": 3 "clearwater-bono":
4 charm: "local:precise/clearwater-bono"4 charm: "cs:~thomnico/precise/clearwater-bono"
5 num_units: 15 num_units: 1
6 options: 6 options:
7 zone: clearwater.local7 zone: clearwater.local
@@ -11,7 +11,7 @@
11 "gui-x": "400"11 "gui-x": "400"
12 "gui-y": "900"12 "gui-y": "900"
13 "clearwater-ellis": 13 "clearwater-ellis":
14 charm: "local:precise/clearwater-ellis"14 charm: "cs:~thomnico/precise/clearwater-ellis"
15 num_units: 115 num_units: 1
16 options: 16 options:
17 base_number: "1234567000"17 base_number: "1234567000"
@@ -24,7 +24,7 @@
24 "gui-x": "400"24 "gui-x": "400"
25 "gui-y": "0"25 "gui-y": "0"
26 "clearwater-homer": 26 "clearwater-homer":
27 charm: "local:precise/clearwater-homer"27 charm: "cs:~thomnico/precise/clearwater-homer"
28 num_units: 128 num_units: 1
29 options: 29 options:
30 zone: clearwater.local30 zone: clearwater.local
@@ -34,7 +34,7 @@
34 "gui-x": "600"34 "gui-x": "600"
35 "gui-y": "300"35 "gui-y": "300"
36 "clearwater-homestead": 36 "clearwater-homestead":
37 charm: "local:precise/clearwater-homestead"37 charm: "cs:~thomnico/precise/clearwater-homestead"
38 num_units: 138 num_units: 1
39 options: 39 options:
40 zone: clearwater.local40 zone: clearwater.local
@@ -44,7 +44,7 @@
44 "gui-x": "200"44 "gui-x": "200"
45 "gui-y": "300"45 "gui-y": "300"
46 "clearwater-sprout": 46 "clearwater-sprout":
47 charm: "local:precise/clearwater-sprout"47 charm: "cs:~thomnico/precise/clearwater-sprout"
48 num_units: 148 num_units: 1
49 options: 49 options:
50 zone: clearwater.local50 zone: clearwater.local
@@ -54,9 +54,10 @@
54 "gui-x": "400"54 "gui-x": "400"
55 "gui-y": "600"55 "gui-y": "600"
56 dns: 56 dns:
57 charm: "local:precise/dns"57 charm: "cs:~thomnico/precise/dns"
58 num_units: 158 num_units: 1
59 constraints: arch=amd64 mem=2G59 constraints: arch=amd64 mem=2G
60 expose: true
60 options: 61 options:
61 domain: clearwater.local62 domain: clearwater.local
62 annotations: 63 annotations:
@@ -68,17 +69,17 @@
68 expose: true69 expose: true
69 constraints: arch=amd64 mem=2G70 constraints: arch=amd64 mem=2G
70 annotations: 71 annotations:
71 "gui-x": "-78.2210693359375"72 "gui-x": "-500.2210693359375"
72 "gui-y": "412.7301025390625"73 "gui-y": "412.7301025390625"
73 mysql: 74 mysql:
74 charm: "cs:trusty/mysql-5"75 charm: "cs:trusty/mysql-5"
75 num_units: 176 num_units: 1
76 constraints: arch=amd64 mem=2G77 constraints: arch=amd64 mem=2G
77 annotations: 78 annotations:
78 "gui-x": "-857.8215242215981"79 "gui-x": "-500.8215242215981"
79 "gui-y": "698.5485784445332"80 "gui-y": "698.5485784445332"
80 sipml5: 81 sipml5:
81 charm: "local:trusty/sipml5"82 charm: "cs:~thomnico/trusty/sipml5"
82 num_units: 183 num_units: 1
83 expose: true84 expose: true
84 annotations: 85 annotations:
8586
=== 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 @@
1#!/bin/bash
2
3set -e
4
5for s in ellis homer homestead sprout bono
6do
7 juju ssh clearwater-$s/0 sudo ln -s /etc/init.d/clearwater-monit /etc/init.d/monit
8 juju resolved -r clearwater-$s/0
9done
10
110
=== added file 'telco/mydomain-bundle.sh'
--- telco/mydomain-bundle.sh 1970-01-01 00:00:00 +0000
+++ telco/mydomain-bundle.sh 2015-02-05 10:04:57 +0000
@@ -0,0 +1,133 @@
1#!/bin/bash -e
2
3
4mydomain=$1
5cat > bundle-$mydomain.yaml <<EOF
6phone-network:
7 services:
8 "clearwater-bono":
9 charm: "cs:~thomnico/precise/clearwater-bono"
10 num_units: 1
11 options:
12 zone: $mydomain
13 constraints: arch=amd64 mem=2G
14 expose: true
15 annotations:
16 "gui-x": "400"
17 "gui-y": "900"
18 "clearwater-ellis":
19 charm: "cs:~thomnico/precise/clearwater-ellis"
20 num_units: 1
21 options:
22 base_number: "1234567000"
23 number_count: 1000
24 signup_key: signup
25 zone: $mydomain
26 constraints: arch=amd64 mem=2G
27 expose: true
28 annotations:
29 "gui-x": "400"
30 "gui-y": "0"
31 "clearwater-homer":
32 charm: "cs:~thomnico/precise/clearwater-homer"
33 num_units: 1
34 options:
35 zone: $mydomain
36 constraints: arch=amd64 mem=2G
37 expose: true
38 annotations:
39 "gui-x": "600"
40 "gui-y": "300"
41 "clearwater-homestead":
42 charm: "cs:~thomnico/precise/clearwater-homestead"
43 num_units: 1
44 options:
45 zone: $mydomain
46 constraints: arch=amd64 mem=2G
47 expose: true
48 annotations:
49 "gui-x": "200"
50 "gui-y": "300"
51 "clearwater-sprout":
52 charm: "cs:~thomnico/precise/clearwater-sprout"
53 num_units: 1
54 options:
55 zone: $mydomain
56 constraints: arch=amd64 mem=2G
57 expose: true
58 annotations:
59 "gui-x": "400"
60 "gui-y": "600"
61 dns:
62 charm: "cs:~thomnico/precise/dns"
63 num_units: 1
64 constraints: arch=amd64 mem=2G
65 expose: true
66 options:
67 domain: $mydomain
68 annotations:
69 "gui-x": "1000"
70 "gui-y": "450"
71 "telscale-load-balancer":
72 charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"
73 num_units: 1
74 expose: true
75 constraints: arch=amd64 mem=2G
76 annotations:
77 "gui-x": "-500.2210693359375"
78 "gui-y": "412.7301025390625"
79 mysql:
80 charm: "cs:trusty/mysql-5"
81 num_units: 1
82 constraints: arch=amd64 mem=2G
83 annotations:
84 "gui-x": "-500.8215242215981"
85 "gui-y": "698.5485784445332"
86 sipml5:
87 charm: "cs:~thomnico/trusty/sipml5"
88 num_units: 1
89 expose: true
90 annotations:
91 "gui-x": "1383.4697265625"
92 "gui-y": "423.10858154296875"
93 "telscale-restcomm":
94 charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"
95 num_units: 1
96 constraints: arch=amd64 mem=2G
97 expose: true
98 annotations:
99 "gui-x": "-500.625244140625"
100 "gui-y": "547.9537963867188"
101 relations:
102 - - "clearwater-bono:scscf"
103 - "clearwater-sprout:pcscf"
104 - - "clearwater-homestead:homestead-cscf"
105 - "clearwater-sprout:homestead-hss"
106 - - "clearwater-homer:xdms-user"
107 - "clearwater-sprout:xdms"
108 - - "clearwater-ellis:homestead-prov"
109 - "clearwater-homestead:homestead-prov-user"
110 - - "clearwater-ellis:xdms"
111 - "clearwater-homer:xdms-user"
112 - - "clearwater-ellis:programmable-multiple"
113 - "dns:programmable-multiple"
114 - - "clearwater-homer:programmable-multiple"
115 - "dns:programmable-multiple"
116 - - "clearwater-bono:programmable-multiple"
117 - "dns:programmable-multiple"
118 - - "clearwater-sprout:programmable-multiple"
119 - "dns:programmable-multiple"
120 - - "clearwater-homestead:programmable-multiple"
121 - "dns:programmable-multiple"
122 - - "sipml5:dns-client"
123 - "dns:dns-client"
124 - - "mysql:db"
125 - "telscale-restcomm:database"
126 - - "telscale-restcomm:load-balancer"
127 - "telscale-load-balancer:load-balancer"
128 - - "telscale-load-balancer:clearwater-ellis"
129 - "clearwater-ellis:as-catalog"
130 - - "telscale-restcomm:cscf"
131 - "clearwater-sprout:as"
132 series: trusty
133EOF
0134
=== 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 @@
1#!/bin/bash
2
3
4set -e
5
6echo "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"
7
8
9ROOT=$PWD
10
11if [ -d clearwater-juju/charms/precise ]
12 then
13 cd clearwater-juju
14 git pull
15 cd ..
16 else
17 git clone https://github.com/Metaswitch/clearwater-juju.git
18 ln -sf clearwater-juju/charms/precise/ .
19fi
20

Subscribers

People subscribed via source and target branches