Merge lp:~thomnico/orange-box-examples/remove-telco-demo into lp:orange-box-examples
- remove-telco-demo
- Merge into trunk
Proposed by
Nicolas Thomas
Status: | Merged |
---|---|
Approved by: | Nicolas Thomas |
Approved revision: | 136 |
Merge reported by: | Scott Croft |
Merged at revision: | not available |
Proposed branch: | lp:~thomnico/orange-box-examples/remove-telco-demo |
Merge into: | lp:orange-box-examples |
Diff against target: |
899 lines (+0/-840) 10 files modified
openstack/ha/icehouse/trusty-icehouse-ra-ha.sh (+0/-20) openstack/ha/icehouse/trusty-icehouse-ra.yaml (+0/-288) telco/01-deploy.sh (+0/-13) telco/BulkUsersCreation.sh (+0/-21) telco/README (+0/-39) telco/bundle-telco-store.yaml (+0/-126) telco/bundle-telco.yaml (+0/-127) telco/integrate-with-ext-zabbix (+0/-59) telco/mydomain-bundle.sh (+0/-144) telco/redirect-google-dns-to-ob (+0/-3) |
To merge this branch: | bzr merge lp:~thomnico/orange-box-examples/remove-telco-demo |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nicolas Thomas (community) | Approve | ||
Review via email: mp+272083@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Nicolas Thomas (thomnico) : | # |
review:
Approve
Revision history for this message
Nicolas Thomas (thomnico) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory 'openstack/ha/icehouse' | |||
2 | === removed file 'openstack/ha/icehouse/trusty-icehouse-ra-ha.sh' | |||
3 | --- openstack/ha/icehouse/trusty-icehouse-ra-ha.sh 2015-03-24 21:54:55 +0000 | |||
4 | +++ openstack/ha/icehouse/trusty-icehouse-ra-ha.sh 1970-01-01 00:00:00 +0000 | |||
5 | @@ -1,20 +0,0 @@ | |||
6 | 1 | #!/bin/bash | ||
7 | 2 | |||
8 | 3 | set -eux | ||
9 | 4 | |||
10 | 5 | CONFIG_FILE="./trusty-icehouse-ra.yaml" | ||
11 | 6 | DEPLOYER_OPTIONS="-s 600 -w 1200 -t 9999" | ||
12 | 7 | WAIT_TIME="600" | ||
13 | 8 | |||
14 | 9 | # Bootstrap the environment | ||
15 | 10 | juju status || juju bootstrap | ||
16 | 11 | #sleep "${WAIT_TIME}" | ||
17 | 12 | juju-deployer -c "${CONFIG_FILE}" -d trusty-icehouse-baremetal-services $DEPLOYER_OPTIONS | ||
18 | 13 | sleep "${WAIT_TIME}" | ||
19 | 14 | juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-haclusters $DEPLOYER_OPTIONS | ||
20 | 15 | sleep "${WAIT_TIME}" | ||
21 | 16 | juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-lxc-services $DEPLOYER_OPTIONS | ||
22 | 17 | sleep "${WAIT_TIME}" | ||
23 | 18 | juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-base-relations $DEPLOYER_OPTIONS | ||
24 | 19 | sleep "${WAIT_TIME}" | ||
25 | 20 | juju-deployer -c ./trusty-icehouse-ra.yaml -d trusty-icehouse-ha-relations $DEPLOYER_OPTIONS | ||
26 | 21 | 0 | ||
27 | === removed file 'openstack/ha/icehouse/trusty-icehouse-ra.yaml' | |||
28 | --- openstack/ha/icehouse/trusty-icehouse-ra.yaml 2015-03-24 21:54:55 +0000 | |||
29 | +++ openstack/ha/icehouse/trusty-icehouse-ra.yaml 1970-01-01 00:00:00 +0000 | |||
30 | @@ -1,288 +0,0 @@ | |||
31 | 1 | trusty-icehouse-baremetal-services: | ||
32 | 2 | series: trusty | ||
33 | 3 | services: | ||
34 | 4 | nova-compute: | ||
35 | 5 | charm: nova-compute | ||
36 | 6 | branch: lp:charms/trusty/nova-compute | ||
37 | 7 | num_units: 7 | ||
38 | 8 | options: | ||
39 | 9 | config-flags: "auto_assign_floating_ip=False" | ||
40 | 10 | enable-live-migration: True | ||
41 | 11 | enable-resize: True | ||
42 | 12 | virt-type: qemu | ||
43 | 13 | ceph-osd: | ||
44 | 14 | charm: ceph-osd | ||
45 | 15 | branch: lp:charms/trusty/ceph-osd | ||
46 | 16 | num_units: 7 | ||
47 | 17 | to: | ||
48 | 18 | - nova-compute=0 | ||
49 | 19 | - nova-compute=1 | ||
50 | 20 | - nova-compute=2 | ||
51 | 21 | - nova-compute=3 | ||
52 | 22 | - nova-compute=4 | ||
53 | 23 | - nova-compute=5 | ||
54 | 24 | - nova-compute=6 | ||
55 | 25 | options: | ||
56 | 26 | osd-devices: /dev/sdb | ||
57 | 27 | osd-reformat: "yes" | ||
58 | 28 | neutron-gateway: | ||
59 | 29 | charm: quantum-gateway | ||
60 | 30 | branch: lp:charms/trusty/quantum-gateway | ||
61 | 31 | num_units: 1 | ||
62 | 32 | options: | ||
63 | 33 | instance-mtu: 1350 | ||
64 | 34 | ext-port: eth1 | ||
65 | 35 | plugin: ovs | ||
66 | 36 | to: 0 | ||
67 | 37 | neutron-openvswitch: | ||
68 | 38 | charm: neutron-openvswitch | ||
69 | 39 | branch: lp:charms/trusty/neutron-openvswitch | ||
70 | 40 | ceilometer-agent: | ||
71 | 41 | charm: ceilometer-agent | ||
72 | 42 | branch: lp:charms/trusty/ceilometer-agent | ||
73 | 43 | |||
74 | 44 | trusty-icehouse-lxc-services: | ||
75 | 45 | inherits: trusty-icehouse-baremetal-services | ||
76 | 46 | series: trusty | ||
77 | 47 | services: | ||
78 | 48 | mysql: | ||
79 | 49 | charm: percona-cluster | ||
80 | 50 | branch: lp:~openstack-charmers/charms/trusty/percona-cluster/trunk | ||
81 | 51 | num_units: 3 | ||
82 | 52 | options: | ||
83 | 53 | vip: 192.168.1.95 | ||
84 | 54 | root-password: ubuntu | ||
85 | 55 | sst-password: ubuntu | ||
86 | 56 | ha-bindiface: eth0 | ||
87 | 57 | access-network: "192.168.1.0/24" | ||
88 | 58 | to: | ||
89 | 59 | - lxc:nova-compute=3 | ||
90 | 60 | - lxc:nova-compute=4 | ||
91 | 61 | - lxc:nova-compute=5 | ||
92 | 62 | rabbitmq-server: | ||
93 | 63 | charm: rabbitmq-server | ||
94 | 64 | branch: lp:charms/trusty/rabbitmq-server | ||
95 | 65 | num_units: 3 | ||
96 | 66 | to: | ||
97 | 67 | - lxc:nova-compute=6 | ||
98 | 68 | - lxc:nova-compute=0 | ||
99 | 69 | - lxc:nova-compute=1 | ||
100 | 70 | keystone: | ||
101 | 71 | charm: keystone | ||
102 | 72 | branch: lp:charms/trusty/keystone | ||
103 | 73 | num_units: 3 | ||
104 | 74 | options: | ||
105 | 75 | enable-pki: "false" | ||
106 | 76 | admin-password: openstack | ||
107 | 77 | admin-token: openstacktesting | ||
108 | 78 | debug: 'True' | ||
109 | 79 | log-level: DEBUG | ||
110 | 80 | vip: 192.168.1.90 | ||
111 | 81 | ha-bindiface: eth0 | ||
112 | 82 | to: | ||
113 | 83 | - lxc:nova-compute=2 | ||
114 | 84 | - lxc:nova-compute=3 | ||
115 | 85 | - lxc:nova-compute=4 | ||
116 | 86 | openstack-dashboard: | ||
117 | 87 | charm: openstack-dashboard | ||
118 | 88 | branch: lp:charms/trusty/openstack-dashboard | ||
119 | 89 | num_units: 3 | ||
120 | 90 | options: | ||
121 | 91 | vip: 192.168.1.93 | ||
122 | 92 | ha-bindiface: eth0 | ||
123 | 93 | to: | ||
124 | 94 | - lxc:nova-compute=5 | ||
125 | 95 | - lxc:nova-compute=6 | ||
126 | 96 | - lxc:nova-compute=0 | ||
127 | 97 | nova-cloud-controller: | ||
128 | 98 | charm: nova-cloud-controller | ||
129 | 99 | branch: lp:charms/trusty/nova-cloud-controller | ||
130 | 100 | num_units: 3 | ||
131 | 101 | options: | ||
132 | 102 | vip: 192.168.1.97 | ||
133 | 103 | ha-bindiface: eth0 | ||
134 | 104 | network-manager: Quantum | ||
135 | 105 | quantum-security-groups: "yes" | ||
136 | 106 | neutron-external-network: Public_Network | ||
137 | 107 | to: | ||
138 | 108 | - lxc:nova-compute=1 | ||
139 | 109 | - lxc:nova-compute=2 | ||
140 | 110 | - lxc:nova-compute=3 | ||
141 | 111 | neutron-api: | ||
142 | 112 | charm: neutron-api | ||
143 | 113 | branch: lp:charms/trusty/neutron-api | ||
144 | 114 | num_units: 3 | ||
145 | 115 | options: | ||
146 | 116 | neutron-security-groups: True | ||
147 | 117 | neutron-external-network: Public_Network | ||
148 | 118 | l2-population: False | ||
149 | 119 | vip: 192.168.1.96 | ||
150 | 120 | to: | ||
151 | 121 | - lxc:nova-compute=4 | ||
152 | 122 | - lxc:nova-compute=5 | ||
153 | 123 | - lxc:nova-compute=6 | ||
154 | 124 | cinder: | ||
155 | 125 | charm: cinder | ||
156 | 126 | branch: lp:charms/trusty/cinder | ||
157 | 127 | num_units: 3 | ||
158 | 128 | options: | ||
159 | 129 | block-device: "None" | ||
160 | 130 | ceph-osd-replication-count: 3 | ||
161 | 131 | glance-api-version: 2 | ||
162 | 132 | vip: 192.168.1.94 | ||
163 | 133 | to: | ||
164 | 134 | - lxc:nova-compute=0 | ||
165 | 135 | - lxc:nova-compute=1 | ||
166 | 136 | - lxc:nova-compute=2 | ||
167 | 137 | glance: | ||
168 | 138 | charm: glance | ||
169 | 139 | branch: lp:charms/trusty/glance | ||
170 | 140 | num_units: 3 | ||
171 | 141 | options: | ||
172 | 142 | ceph-osd-replication-count: 3 | ||
173 | 143 | vip: 192.168.1.92 | ||
174 | 144 | ha-bindiface: eth0 | ||
175 | 145 | to: | ||
176 | 146 | - lxc:nova-compute=3 | ||
177 | 147 | - lxc:nova-compute=4 | ||
178 | 148 | - lxc:nova-compute=5 | ||
179 | 149 | ceph: | ||
180 | 150 | charm: ceph | ||
181 | 151 | branch: lp:charms/trusty/ceph | ||
182 | 152 | num_units: 3 | ||
183 | 153 | options: | ||
184 | 154 | monitor-count: 3 | ||
185 | 155 | fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc | ||
186 | 156 | monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== | ||
187 | 157 | osd-devices: /dev/sdb | ||
188 | 158 | osd-reformat: "yes" | ||
189 | 159 | to: | ||
190 | 160 | - lxc:nova-compute=6 | ||
191 | 161 | - lxc:nova-compute=0 | ||
192 | 162 | - lxc:nova-compute=1 | ||
193 | 163 | ceilometer: | ||
194 | 164 | charm: ceilometer | ||
195 | 165 | branch: lp:charms/trusty/ceilometer | ||
196 | 166 | to: | ||
197 | 167 | - lxc:nova-compute=2 | ||
198 | 168 | mongodb: | ||
199 | 169 | charm: mongodb | ||
200 | 170 | branch: lp:charms/mongodb | ||
201 | 171 | to: | ||
202 | 172 | - lxc:nova-compute=3 | ||
203 | 173 | heat: | ||
204 | 174 | charm: heat | ||
205 | 175 | branch: lp:charms/trusty/heat | ||
206 | 176 | to: | ||
207 | 177 | - lxc:nova-compute=4 | ||
208 | 178 | |||
209 | 179 | trusty-icehouse-haclusters: | ||
210 | 180 | series: trusty | ||
211 | 181 | services: | ||
212 | 182 | mysql-hacluster: | ||
213 | 183 | charm: hacluster | ||
214 | 184 | branch: lp:charms/trusty/hacluster | ||
215 | 185 | options: | ||
216 | 186 | corosync_mcastaddr: 226.94.1.1 | ||
217 | 187 | corosync_key: "3r8Y1zILzqADvJB7eLJGPrCI4g5Tg+uZ0+qq1kXNe0273yZlee9k2VT1twsyaSx3tNDDIcfuM/ykQNFRLw6dOWdXPbzgqIM5M5FExYQlXv2+s3kowRL0xuanVWXucaKu+t3jDDxmVnhj0SY/ixl3Gg0XrW4qXFoK05uMoIhK8Js=" | ||
218 | 188 | keystone-hacluster: | ||
219 | 189 | charm: hacluster | ||
220 | 190 | branch: lp:charms/trusty/hacluster | ||
221 | 191 | options: | ||
222 | 192 | corosync_mcastaddr: 226.94.1.5 | ||
223 | 193 | corosync_key: "6aVson6XvaprzAppLB6UA4OUgZIyNtW+qVwbanQta0aLMagwbPNomTniLr3ZyVGtEL7A0c48tJvaA+lafL2HzGq+43/aKnUbG5k7d4sKaQXP/sKLhCpyj+04DddBRAVsBJ6r9tG45CGF+H+qUykL1rOT0EesZhDqBiBGrV+DXes=" | ||
224 | 194 | dashboard-hacluster: | ||
225 | 195 | charm: hacluster | ||
226 | 196 | branch: lp:charms/trusty/hacluster | ||
227 | 197 | options: | ||
228 | 198 | corosync_mcastaddr: 226.94.1.9 | ||
229 | 199 | corosync_key: "9aNUFk+o0Hqt/6i46ltcycMogHm+bgOkhsIwBwuXX3YQZfvioZZZqggi9R9Ccj1OqIrxLA+GTstghYcc/hjULhIl3BIX6HAdePhX7sI8khTCiPTN/w4MIy3nW1CjFaeWW31CIhrXnTcq11l0MEB3vKNlN5/b7/kqvagB6oSjw4s=" | ||
230 | 200 | ncc-hacluster: | ||
231 | 201 | charm: hacluster | ||
232 | 202 | branch: lp:charms/trusty/hacluster | ||
233 | 203 | options: | ||
234 | 204 | corosync_mcastaddr: 226.94.1.6 | ||
235 | 205 | corosync_key: "xZP7GDWV0e8Qs0GxWThXirNNYlScgi3sRTdZk/IXKDqkNFcwdCWfRQnqrHU/6mb6sz6OIoZzX2MtfMQIDcXuPqQyvKuv7YbRyGHmQwAWDUA4ed759VWAO39kHkfWp9y5RRk/wcHakTcWYMwm70upDGJEP00YT3xem3NQy27AC1w=" | ||
236 | 206 | neutron-api-hacluster: | ||
237 | 207 | charm: hacluster | ||
238 | 208 | branch: lp:charms/trusty/hacluster | ||
239 | 209 | options: | ||
240 | 210 | corosync_mcastaddr: 226.94.1.7 | ||
241 | 211 | corosync_key: "7ys/duGU2j/gGcRnKVLGSiWF8zIYQG9yy0MPMwfLtHaGQ3pYnGnMbXQD8o2HbVuzY/YPHHeAO2gQ | ||
242 | 212 | /oS+7XGmNqPwiTyavlPBDVEfCx8nYIhXLntngIbeoa2VW9C63cYLmsnI4fn3Lo/S9UuEWilV295O | ||
243 | 213 | wO0v+er33MVR/6Qy+Ik=" | ||
244 | 214 | cinder-hacluster: | ||
245 | 215 | charm: hacluster | ||
246 | 216 | branch: lp:charms/trusty/hacluster | ||
247 | 217 | options: | ||
248 | 218 | corosync_mcastaddr: 226.94.1.8 | ||
249 | 219 | corosync_key: "wllBMGAfdCsotmXGbCbJ0LhAuOPQ9ZEIIAXIWWeNLwrmC7C9jmm92RSL1kYGCRRWaL7W7AziA6aBy//rZxeZ3z0YkM0QFD+4Vg7vtM6JaBoOFlJgVd6mbYUfVbI6IMqGiUDJ8hh5sKmN7kwQLNNwASGlJiMo5s9ErWviVM6/OrQ=" | ||
250 | 220 | glance-hacluster: | ||
251 | 221 | charm: hacluster | ||
252 | 222 | branch: lp:charms/trusty/hacluster | ||
253 | 223 | options: | ||
254 | 224 | corosync_mcastaddr: 226.94.1.7 | ||
255 | 225 | corosync_key: "eO34WuxbQ/FaQvYb/ffTtX+0phNfNZlmhRrC8gLYJMf/b52Ny3cRXjgp5P1lEfZFHjrhQ3lWQOqENuBVcejS1OYt574Xq2l1XLEHoEPbktovDhaS9yxIU7SYULdlx7j/BNtW7evY0pRBr23MYWEI3hETHVdtOeqgW1IB3zgoyco=" | ||
256 | 226 | |||
257 | 227 | trusty-icehouse-base-relations: | ||
258 | 228 | inherits: | ||
259 | 229 | - trusty-icehouse-baremetal-services | ||
260 | 230 | - trusty-icehouse-lxc-services | ||
261 | 231 | - trusty-icehouse-haclusters | ||
262 | 232 | relations: | ||
263 | 233 | - [ ceph-osd, ceph ] | ||
264 | 234 | - [ mysql, mysql-hacluster ] | ||
265 | 235 | - [ keystone, keystone-hacluster ] | ||
266 | 236 | - [ nova-cloud-controller, ncc-hacluster ] | ||
267 | 237 | - [ glance, glance-hacluster ] | ||
268 | 238 | - [ cinder, cinder-hacluster ] | ||
269 | 239 | - [ openstack-dashboard, dashboard-hacluster ] | ||
270 | 240 | - [ neutron-api, neutron-api-hacluster ] | ||
271 | 241 | |||
272 | 242 | trusty-icehouse-ha-relations: | ||
273 | 243 | inherits: | ||
274 | 244 | - trusty-icehouse-baremetal-services | ||
275 | 245 | - trusty-icehouse-lxc-services | ||
276 | 246 | - trusty-icehouse-haclusters | ||
277 | 247 | - trusty-icehouse-base-relations | ||
278 | 248 | relations: | ||
279 | 249 | - [ keystone, mysql ] | ||
280 | 250 | - [ nova-cloud-controller, mysql ] | ||
281 | 251 | - [ nova-cloud-controller, rabbitmq-server ] | ||
282 | 252 | - [ nova-cloud-controller, glance ] | ||
283 | 253 | - [ nova-cloud-controller, keystone ] | ||
284 | 254 | - [ nova-compute, nova-cloud-controller ] | ||
285 | 255 | - [ 'nova-compute:shared-db', 'mysql:shared-db' ] | ||
286 | 256 | - [ nova-compute, 'rabbitmq-server:amqp' ] | ||
287 | 257 | - [ nova-compute, glance ] | ||
288 | 258 | - [ nova-compute, ceph ] | ||
289 | 259 | - [ glance, mysql ] | ||
290 | 260 | - [ glance, keystone ] | ||
291 | 261 | - [ glance, ceph ] | ||
292 | 262 | - [ glance, cinder ] | ||
293 | 263 | - [ glance, rabbitmq-server ] | ||
294 | 264 | - [ cinder, mysql ] | ||
295 | 265 | - [ cinder, rabbitmq-server ] | ||
296 | 266 | - [ cinder, nova-cloud-controller ] | ||
297 | 267 | - [ cinder, keystone ] | ||
298 | 268 | - [ cinder, ceph ] | ||
299 | 269 | - [ neutron-gateway, mysql ] | ||
300 | 270 | - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ] | ||
301 | 271 | - [ neutron-gateway, nova-cloud-controller ] | ||
302 | 272 | - [ openstack-dashboard, keystone ] | ||
303 | 273 | - [ ceilometer, keystone ] | ||
304 | 274 | - [ ceilometer, rabbitmq-server ] | ||
305 | 275 | - [ ceilometer, mongodb ] | ||
306 | 276 | - [ ceilometer-agent, nova-compute ] | ||
307 | 277 | - [ ceilometer-agent, ceilometer ] | ||
308 | 278 | - [ heat, mysql ] | ||
309 | 279 | - [ heat, keystone ] | ||
310 | 280 | - [ heat, rabbitmq-server ] | ||
311 | 281 | - [ neutron-api, rabbitmq-server ] | ||
312 | 282 | - [ neutron-api, mysql ] | ||
313 | 283 | - [ neutron-api, nova-cloud-controller ] | ||
314 | 284 | - [ neutron-api, keystone ] | ||
315 | 285 | - [ neutron-api, neutron-gateway ] | ||
316 | 286 | - [ neutron-api, neutron-openvswitch ] | ||
317 | 287 | - [ neutron-openvswitch, rabbitmq-server ] | ||
318 | 288 | - [ neutron-openvswitch, nova-compute ] | ||
319 | 289 | 0 | ||
320 | === removed file 'telco/01-deploy.sh' | |||
321 | --- telco/01-deploy.sh 2015-01-26 21:59:10 +0000 | |||
322 | +++ telco/01-deploy.sh 1970-01-01 00:00:00 +0000 | |||
323 | @@ -1,13 +0,0 @@ | |||
324 | 1 | #!/bin/bash | ||
325 | 2 | |||
326 | 3 | #Install juju-deployer package | ||
327 | 4 | #sudo apt-get install -y juju-deployer | ||
328 | 5 | |||
329 | 6 | #Deploy the bundle | ||
330 | 7 | #TODO: soft link to bundle to stable and bleeding edge charm revisions | ||
331 | 8 | |||
332 | 9 | set -e | ||
333 | 10 | |||
334 | 11 | export JUJU_REPOSITORY=$PWD | ||
335 | 12 | juju-deployer -r 3 -c bundle-telco.yaml | ||
336 | 13 | |||
337 | 14 | 0 | ||
338 | === removed file 'telco/BulkUsersCreation.sh' | |||
339 | --- telco/BulkUsersCreation.sh 2015-01-26 13:48:58 +0000 | |||
340 | +++ telco/BulkUsersCreation.sh 1970-01-01 00:00:00 +0000 | |||
341 | @@ -1,21 +0,0 @@ | |||
342 | 1 | #!/bin/bash -e | ||
343 | 2 | |||
344 | 3 | ## Try ping homer and homestead from ellis before adding user to check dns resolution | ||
345 | 4 | |||
346 | 5 | 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' | ||
347 | 6 | |||
348 | 7 | juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_autocomplete.py users.csv" | ||
349 | 8 | juju ssh clearwater-homestead/0 "/usr/share/clearwater/homestead/src/metaswitch/crest/tools/bulk_create.py users.auto.csv" | ||
350 | 9 | |||
351 | 10 | juju ssh clearwater-homestead/0 "./users.auto.create_homestead.sh" | ||
352 | 11 | |||
353 | 12 | TMP=`mktemp -d` | ||
354 | 13 | juju scp clearwater-homestead/0:~/*xdm* $TMP/ | ||
355 | 14 | juju scp $TMP/*xdm* clearwater-homer/0:~/ | ||
356 | 15 | juju ssh clearwater-homer/0 "./users.auto.create_xdm.sh" | ||
357 | 16 | |||
358 | 17 | DOMAIN=`juju ssh clearwater-homestead/0 '. /etc/clearwater/config; echo $home_domain'` | ||
359 | 18 | echo 'users range from 0000@'$DOMAIN | ||
360 | 19 | echo 'to 0099@'$DOMAIN | ||
361 | 20 | echo ' with password 7kkzTyGW created' | ||
362 | 21 | echo "See clearwater doc to configure your clients" | ||
363 | 22 | 0 | ||
364 | === added file 'telco/README' | |||
365 | --- telco/README 1970-01-01 00:00:00 +0000 | |||
366 | +++ telco/README 2015-09-23 10:59:49 +0000 | |||
367 | @@ -0,0 +1,3 @@ | |||
368 | 1 | This is deprecated in favor of a shareable example | ||
369 | 2 | Go to : https://github.com/thomnico/juju-nfv-clearwater-restcomm | ||
370 | 3 | And enjoy/contribute to the magic | ||
371 | 0 | \ No newline at end of file | 4 | \ No newline at end of file |
372 | 1 | 5 | ||
373 | === removed file 'telco/README' | |||
374 | --- telco/README 2015-02-05 10:03:07 +0000 | |||
375 | +++ telco/README 1970-01-01 00:00:00 +0000 | |||
376 | @@ -1,39 +0,0 @@ | |||
377 | 1 | Telco demo deployment | ||
378 | 2 | |||
379 | 3 | Works on Amazon EC2 and OpenStack | ||
380 | 4 | |||
381 | 5 | Doing a local copy to be able to have the images as it comes from a personnal namespace. | ||
382 | 6 | |||
383 | 7 | Once started and if you create a zabbix machine run: | ||
384 | 8 | |||
385 | 9 | integrate-with-ext-zabbix <IP of the zabbix machine> | ||
386 | 10 | |||
387 | 11 | |||
388 | 12 | If bzr-sync-local-charms failed do this : | ||
389 | 13 | juju-deployer -c bundle-telco-store.yaml | ||
390 | 14 | |||
391 | 15 | #Or drag and drop the only drawback is not having the logos on the gui. | ||
392 | 16 | |||
393 | 17 | Use clearwater by using the login at: | ||
394 | 18 | Show: http://www.projectclearwater.org/wp-content/uploads/2013/05/project-clearwater-architecture-april-2014-2.png | ||
395 | 19 | Architecture | ||
396 | 20 | |||
397 | 21 | http://ellis-IP/ | ||
398 | 22 | Go to signup page: | ||
399 | 23 | e-mail/name: your choice. | ||
400 | 24 | signup code : signup | ||
401 | 25 | password suggestion: AAbbCCdd | ||
402 | 26 | |||
403 | 27 | |||
404 | 28 | Run: BulkUsersCreation.sh | ||
405 | 29 | |||
406 | 30 | Use restcomm using the login at: | ||
407 | 31 | http://restcomm-IP:8080/restcomm-management | ||
408 | 32 | email: administrator@company.com | ||
409 | 33 | pass: RestComm | ||
410 | 34 | |||
411 | 35 | Show the designer: | ||
412 | 36 | http://www.restcomm.com/developers/ | ||
413 | 37 | |||
414 | 38 | |||
415 | 39 | |||
416 | 40 | 0 | ||
417 | === removed file 'telco/bundle-telco-store.yaml' | |||
418 | --- telco/bundle-telco-store.yaml 2015-01-26 15:01:14 +0000 | |||
419 | +++ telco/bundle-telco-store.yaml 1970-01-01 00:00:00 +0000 | |||
420 | @@ -1,126 +0,0 @@ | |||
421 | 1 | phone-network: | ||
422 | 2 | services: | ||
423 | 3 | "clearwater-bono": | ||
424 | 4 | charm: "cs:~thomnico/precise/clearwater-bono" | ||
425 | 5 | num_units: 1 | ||
426 | 6 | options: | ||
427 | 7 | zone: clearwater.local | ||
428 | 8 | constraints: arch=amd64 mem=2G | ||
429 | 9 | expose: true | ||
430 | 10 | annotations: | ||
431 | 11 | "gui-x": "400" | ||
432 | 12 | "gui-y": "900" | ||
433 | 13 | "clearwater-ellis": | ||
434 | 14 | charm: "cs:~thomnico/precise/clearwater-ellis" | ||
435 | 15 | num_units: 1 | ||
436 | 16 | options: | ||
437 | 17 | base_number: "1234567000" | ||
438 | 18 | number_count: 1000 | ||
439 | 19 | signup_key: signup | ||
440 | 20 | zone: clearwater.local | ||
441 | 21 | constraints: arch=amd64 mem=2G | ||
442 | 22 | expose: true | ||
443 | 23 | annotations: | ||
444 | 24 | "gui-x": "400" | ||
445 | 25 | "gui-y": "0" | ||
446 | 26 | "clearwater-homer": | ||
447 | 27 | charm: "cs:~thomnico/precise/clearwater-homer" | ||
448 | 28 | num_units: 1 | ||
449 | 29 | options: | ||
450 | 30 | zone: clearwater.local | ||
451 | 31 | constraints: arch=amd64 mem=2G | ||
452 | 32 | expose: true | ||
453 | 33 | annotations: | ||
454 | 34 | "gui-x": "600" | ||
455 | 35 | "gui-y": "300" | ||
456 | 36 | "clearwater-homestead": | ||
457 | 37 | charm: "cs:~thomnico/precise/clearwater-homestead" | ||
458 | 38 | num_units: 1 | ||
459 | 39 | options: | ||
460 | 40 | zone: clearwater.local | ||
461 | 41 | constraints: arch=amd64 mem=2G | ||
462 | 42 | expose: true | ||
463 | 43 | annotations: | ||
464 | 44 | "gui-x": "200" | ||
465 | 45 | "gui-y": "300" | ||
466 | 46 | "clearwater-sprout": | ||
467 | 47 | charm: "cs:~thomnico/precise/clearwater-sprout" | ||
468 | 48 | num_units: 1 | ||
469 | 49 | options: | ||
470 | 50 | zone: clearwater.local | ||
471 | 51 | constraints: arch=amd64 mem=2G | ||
472 | 52 | expose: true | ||
473 | 53 | annotations: | ||
474 | 54 | "gui-x": "400" | ||
475 | 55 | "gui-y": "600" | ||
476 | 56 | dns: | ||
477 | 57 | charm: "cs:~thomnico/precise/dns" | ||
478 | 58 | num_units: 1 | ||
479 | 59 | constraints: arch=amd64 mem=2G | ||
480 | 60 | options: | ||
481 | 61 | domain: clearwater.local | ||
482 | 62 | annotations: | ||
483 | 63 | "gui-x": "1000" | ||
484 | 64 | "gui-y": "450" | ||
485 | 65 | "telscale-load-balancer": | ||
486 | 66 | charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0" | ||
487 | 67 | num_units: 1 | ||
488 | 68 | constraints: arch=amd64 mem=2G | ||
489 | 69 | expose: true | ||
490 | 70 | annotations: | ||
491 | 71 | "gui-x": "-78.2210693359375" | ||
492 | 72 | "gui-y": "412.7301025390625" | ||
493 | 73 | mysql: | ||
494 | 74 | charm: "cs:trusty/mysql-5" | ||
495 | 75 | num_units: 1 | ||
496 | 76 | constraints: arch=amd64 mem=2G | ||
497 | 77 | annotations: | ||
498 | 78 | "gui-x": "-857.8215242215981" | ||
499 | 79 | "gui-y": "698.5485784445332" | ||
500 | 80 | sipml5: | ||
501 | 81 | charm: "cs:~thomnico/trusty/sipml5-1" | ||
502 | 82 | num_units: 1 | ||
503 | 83 | expose: true | ||
504 | 84 | annotations: | ||
505 | 85 | "gui-x": "1383.4697265625" | ||
506 | 86 | "gui-y": "423.10858154296875" | ||
507 | 87 | "telscale-restcomm": | ||
508 | 88 | charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0" | ||
509 | 89 | num_units: 1 | ||
510 | 90 | constraints: arch=amd64 mem=2G | ||
511 | 91 | expose: true | ||
512 | 92 | annotations: | ||
513 | 93 | "gui-x": "-500.625244140625" | ||
514 | 94 | "gui-y": "547.9537963867188" | ||
515 | 95 | relations: | ||
516 | 96 | - - "clearwater-bono:scscf" | ||
517 | 97 | - "clearwater-sprout:pcscf" | ||
518 | 98 | - - "clearwater-homestead:homestead-cscf" | ||
519 | 99 | - "clearwater-sprout:homestead-hss" | ||
520 | 100 | - - "clearwater-homer:xdms-user" | ||
521 | 101 | - "clearwater-sprout:xdms" | ||
522 | 102 | - - "clearwater-ellis:homestead-prov" | ||
523 | 103 | - "clearwater-homestead:homestead-prov-user" | ||
524 | 104 | - - "clearwater-ellis:xdms" | ||
525 | 105 | - "clearwater-homer:xdms-user" | ||
526 | 106 | - - "clearwater-ellis:programmable-multiple" | ||
527 | 107 | - "dns:programmable-multiple" | ||
528 | 108 | - - "clearwater-homer:programmable-multiple" | ||
529 | 109 | - "dns:programmable-multiple" | ||
530 | 110 | - - "clearwater-bono:programmable-multiple" | ||
531 | 111 | - "dns:programmable-multiple" | ||
532 | 112 | - - "clearwater-sprout:programmable-multiple" | ||
533 | 113 | - "dns:programmable-multiple" | ||
534 | 114 | - - "clearwater-homestead:programmable-multiple" | ||
535 | 115 | - "dns:programmable-multiple" | ||
536 | 116 | - - "sipml5:dns-client" | ||
537 | 117 | - "dns:dns-client" | ||
538 | 118 | - - "mysql:db" | ||
539 | 119 | - "telscale-restcomm:database" | ||
540 | 120 | - - "telscale-restcomm:load-balancer" | ||
541 | 121 | - "telscale-load-balancer:load-balancer" | ||
542 | 122 | - - "telscale-load-balancer:clearwater-ellis" | ||
543 | 123 | - "clearwater-ellis:as-catalog" | ||
544 | 124 | - - "telscale-restcomm:cscf" | ||
545 | 125 | - "clearwater-sprout:as" | ||
546 | 126 | series: trusty | ||
547 | 127 | 0 | ||
548 | === removed file 'telco/bundle-telco.yaml' | |||
549 | --- telco/bundle-telco.yaml 2015-02-18 16:44:51 +0000 | |||
550 | +++ telco/bundle-telco.yaml 1970-01-01 00:00:00 +0000 | |||
551 | @@ -1,127 +0,0 @@ | |||
552 | 1 | phone-network: | ||
553 | 2 | services: | ||
554 | 3 | "clearwater-bono": | ||
555 | 4 | charm: "cs:~thomnico/precise/clearwater-bono" | ||
556 | 5 | num_units: 1 | ||
557 | 6 | options: | ||
558 | 7 | zone: clearwater.local | ||
559 | 8 | constraints: arch=amd64 mem=2G | ||
560 | 9 | expose: true | ||
561 | 10 | annotations: | ||
562 | 11 | "gui-x": "400" | ||
563 | 12 | "gui-y": "900" | ||
564 | 13 | "clearwater-ellis": | ||
565 | 14 | charm: "cs:~thomnico/precise/clearwater-ellis" | ||
566 | 15 | num_units: 1 | ||
567 | 16 | options: | ||
568 | 17 | base_number: "1234567000" | ||
569 | 18 | number_count: 1000 | ||
570 | 19 | signup_key: signup | ||
571 | 20 | zone: clearwater.local | ||
572 | 21 | constraints: arch=amd64 mem=2G | ||
573 | 22 | expose: true | ||
574 | 23 | annotations: | ||
575 | 24 | "gui-x": "400" | ||
576 | 25 | "gui-y": "0" | ||
577 | 26 | "clearwater-homer": | ||
578 | 27 | charm: "cs:~thomnico/precise/clearwater-homer" | ||
579 | 28 | num_units: 1 | ||
580 | 29 | options: | ||
581 | 30 | zone: clearwater.local | ||
582 | 31 | constraints: arch=amd64 mem=2G | ||
583 | 32 | expose: true | ||
584 | 33 | annotations: | ||
585 | 34 | "gui-x": "600" | ||
586 | 35 | "gui-y": "300" | ||
587 | 36 | "clearwater-homestead": | ||
588 | 37 | charm: "cs:~thomnico/precise/clearwater-homestead" | ||
589 | 38 | num_units: 1 | ||
590 | 39 | options: | ||
591 | 40 | zone: clearwater.local | ||
592 | 41 | constraints: arch=amd64 mem=2G | ||
593 | 42 | expose: true | ||
594 | 43 | annotations: | ||
595 | 44 | "gui-x": "200" | ||
596 | 45 | "gui-y": "300" | ||
597 | 46 | "clearwater-sprout": | ||
598 | 47 | charm: "cs:~thomnico/precise/clearwater-sprout" | ||
599 | 48 | num_units: 1 | ||
600 | 49 | options: | ||
601 | 50 | zone: clearwater.local | ||
602 | 51 | constraints: arch=amd64 mem=2G | ||
603 | 52 | expose: true | ||
604 | 53 | annotations: | ||
605 | 54 | "gui-x": "400" | ||
606 | 55 | "gui-y": "600" | ||
607 | 56 | dns: | ||
608 | 57 | charm: "cs:~thomnico/precise/dns" | ||
609 | 58 | num_units: 1 | ||
610 | 59 | constraints: arch=amd64 mem=2G | ||
611 | 60 | expose: true | ||
612 | 61 | options: | ||
613 | 62 | domain: clearwater.local | ||
614 | 63 | annotations: | ||
615 | 64 | "gui-x": "1000" | ||
616 | 65 | "gui-y": "450" | ||
617 | 66 | "telscale-load-balancer": | ||
618 | 67 | charm: "cs:~thomnico/trusty/telscale-load-balancer" | ||
619 | 68 | num_units: 1 | ||
620 | 69 | expose: true | ||
621 | 70 | constraints: arch=amd64 mem=2G | ||
622 | 71 | annotations: | ||
623 | 72 | "gui-x": "-500.2210693359375" | ||
624 | 73 | "gui-y": "412.7301025390625" | ||
625 | 74 | mysql: | ||
626 | 75 | charm: "cs:trusty/mysql-5" | ||
627 | 76 | num_units: 1 | ||
628 | 77 | constraints: arch=amd64 mem=2G | ||
629 | 78 | annotations: | ||
630 | 79 | "gui-x": "-500.8215242215981" | ||
631 | 80 | "gui-y": "698.5485784445332" | ||
632 | 81 | sipml5: | ||
633 | 82 | charm: "cs:~thomnico/trusty/sipml5" | ||
634 | 83 | num_units: 1 | ||
635 | 84 | expose: true | ||
636 | 85 | annotations: | ||
637 | 86 | "gui-x": "1383.4697265625" | ||
638 | 87 | "gui-y": "423.10858154296875" | ||
639 | 88 | "telscale-restcomm": | ||
640 | 89 | charm: "cs:~thomnico/trusty/telscale-restcomm" | ||
641 | 90 | num_units: 1 | ||
642 | 91 | constraints: arch=amd64 mem=2G | ||
643 | 92 | expose: true | ||
644 | 93 | annotations: | ||
645 | 94 | "gui-x": "-500.625244140625" | ||
646 | 95 | "gui-y": "547.9537963867188" | ||
647 | 96 | relations: | ||
648 | 97 | - - "clearwater-bono:scscf" | ||
649 | 98 | - "clearwater-sprout:pcscf" | ||
650 | 99 | - - "clearwater-homestead:homestead-cscf" | ||
651 | 100 | - "clearwater-sprout:homestead-hss" | ||
652 | 101 | - - "clearwater-homer:xdms-user" | ||
653 | 102 | - "clearwater-sprout:xdms" | ||
654 | 103 | - - "clearwater-ellis:homestead-prov" | ||
655 | 104 | - "clearwater-homestead:homestead-prov-user" | ||
656 | 105 | - - "clearwater-ellis:xdms" | ||
657 | 106 | - "clearwater-homer:xdms-user" | ||
658 | 107 | - - "clearwater-ellis:programmable-multiple" | ||
659 | 108 | - "dns:programmable-multiple" | ||
660 | 109 | - - "clearwater-homer:programmable-multiple" | ||
661 | 110 | - "dns:programmable-multiple" | ||
662 | 111 | - - "clearwater-bono:programmable-multiple" | ||
663 | 112 | - "dns:programmable-multiple" | ||
664 | 113 | - - "clearwater-sprout:programmable-multiple" | ||
665 | 114 | - "dns:programmable-multiple" | ||
666 | 115 | - - "clearwater-homestead:programmable-multiple" | ||
667 | 116 | - "dns:programmable-multiple" | ||
668 | 117 | - - "sipml5:dns-client" | ||
669 | 118 | - "dns:dns-client" | ||
670 | 119 | - - "mysql:db" | ||
671 | 120 | - "telscale-restcomm:database" | ||
672 | 121 | - - "telscale-restcomm:load-balancer" | ||
673 | 122 | - "telscale-load-balancer:load-balancer" | ||
674 | 123 | - - "telscale-load-balancer:clearwater-ellis" | ||
675 | 124 | - "clearwater-ellis:as-catalog" | ||
676 | 125 | - - "telscale-restcomm:cscf" | ||
677 | 126 | - "clearwater-sprout:as" | ||
678 | 127 | series: trusty | ||
679 | 128 | 0 | ||
680 | === removed file 'telco/integrate-with-ext-zabbix' | |||
681 | --- telco/integrate-with-ext-zabbix 2014-10-29 14:48:40 +0000 | |||
682 | +++ telco/integrate-with-ext-zabbix 1970-01-01 00:00:00 +0000 | |||
683 | @@ -1,59 +0,0 @@ | |||
684 | 1 | #!/bin/bash | ||
685 | 2 | # | ||
686 | 3 | # integrate with an external zabbix on a machine | ||
687 | 4 | # Copyright (C) 2014 Canonical Ltd. | ||
688 | 5 | # | ||
689 | 6 | # Authors: nicolas.thomas@canonical.com | ||
690 | 7 | # | ||
691 | 8 | # This program is free software: you can redistribute it and/or modify | ||
692 | 9 | # it under the terms of the GNU General Public License as published by | ||
693 | 10 | # the Free Software Foundation, version 3 of the License. | ||
694 | 11 | # | ||
695 | 12 | # This program is distributed in the hope that it will be useful, | ||
696 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
697 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
698 | 15 | # GNU General Public License for more details. | ||
699 | 16 | # | ||
700 | 17 | # You should have received a copy of the GNU General Public License | ||
701 | 18 | |||
702 | 19 | set -ex | ||
703 | 20 | |||
704 | 21 | VM_IP=$1 | ||
705 | 22 | |||
706 | 23 | if [[ -z "$VM_IP" ]] | ||
707 | 24 | then | ||
708 | 25 | echo "must give name/ip of the system to configure on" | ||
709 | 26 | exit 2 | ||
710 | 27 | fi | ||
711 | 28 | |||
712 | 29 | SSH="ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP " | ||
713 | 30 | |||
714 | 31 | export JUJU_ENDPOINT=`juju api-endpoints` | ||
715 | 32 | export ADMIN_PASS=`cat ${JUJU_HOME:-~/.juju}/environments/$(juju switch).jenv|grep admin-secret|awk '{print $2;}'` | ||
716 | 33 | |||
717 | 34 | |||
718 | 35 | ## Connect to zabbix to juju API | ||
719 | 36 | |||
720 | 37 | TMP=`mktemp ` | ||
721 | 38 | cat > $TMP <<EOF | ||
722 | 39 | juju-api: | ||
723 | 40 | endpoint: "wss://$JUJU_ENDPOINT" | ||
724 | 41 | admin-secret: $ADMIN_PASS | ||
725 | 42 | EOF | ||
726 | 43 | #echo 'juju-api:'; echo ' endpoint: "'$JUJU_ENDPOINT'"'; echo ' admin-secret: '$ADMIN_PASS > $TMP | ||
727 | 44 | |||
728 | 45 | scp -o StrictHostKeyChecking=no $TMP ubuntu@$VM_IP:/tmp/.jujuapi.yaml | ||
729 | 46 | |||
730 | 47 | $SSH "sudo mv /tmp/.jujuapi.yaml /usr/lib/zabbix/externalscripts/.jujuapi.yaml" | ||
731 | 48 | $SSH "sudo chown zabbix:zabbix /usr/lib/zabbix/externalscripts/.jujuapi.yaml" | ||
732 | 49 | $SSH "sudo chmod 644 /usr/lib/zabbix/externalscripts/.jujuapi.yaml" | ||
733 | 50 | |||
734 | 51 | ##usr/lib/zabbix/externalscripts/.jujuapi.yaml " | ||
735 | 52 | |||
736 | 53 | juju deploy cs:~samuel-cozannet/precise/zabbix-agent || echo "already deployed keep going" | ||
737 | 54 | juju set zabbix-agent server-host=$VM_IP | ||
738 | 55 | |||
739 | 56 | juju add-relation clearwater-ellis zabbix-agent || echo "already related to ellis keep going" | ||
740 | 57 | |||
741 | 58 | echo "You can now connect Got to th gui and connect clearwater services to zabbix-agent" | ||
742 | 59 | |||
743 | 60 | 0 | ||
744 | === removed file 'telco/mydomain-bundle.sh' | |||
745 | --- telco/mydomain-bundle.sh 2015-05-27 14:51:22 +0000 | |||
746 | +++ telco/mydomain-bundle.sh 1970-01-01 00:00:00 +0000 | |||
747 | @@ -1,144 +0,0 @@ | |||
748 | 1 | #!/bin/bash -e | ||
749 | 2 | |||
750 | 3 | |||
751 | 4 | mydomain=$1 | ||
752 | 5 | cat > bundle-$mydomain.yaml <<EOF | ||
753 | 6 | phone-network: | ||
754 | 7 | services: | ||
755 | 8 | "clearwater-bono": | ||
756 | 9 | charm: "cs:~thomnico/precise/clearwater-bono" | ||
757 | 10 | num_units: 1 | ||
758 | 11 | options: | ||
759 | 12 | zone: $mydomain | ||
760 | 13 | constraints: arch=amd64 mem=2G | ||
761 | 14 | expose: true | ||
762 | 15 | annotations: | ||
763 | 16 | "gui-x": "400" | ||
764 | 17 | "gui-y": "900" | ||
765 | 18 | "clearwater-ellis": | ||
766 | 19 | charm: "cs:~thomnico/precise/clearwater-ellis" | ||
767 | 20 | num_units: 1 | ||
768 | 21 | options: | ||
769 | 22 | base_number: "1234567000" | ||
770 | 23 | number_count: 1000 | ||
771 | 24 | signup_key: signup | ||
772 | 25 | zone: $mydomain | ||
773 | 26 | constraints: arch=amd64 mem=2G | ||
774 | 27 | expose: true | ||
775 | 28 | annotations: | ||
776 | 29 | "gui-x": "400" | ||
777 | 30 | "gui-y": "0" | ||
778 | 31 | to: | ||
779 | 32 | - lxc:clearwater-bono=0 | ||
780 | 33 | clearwater-homer: | ||
781 | 34 | charm: "cs:~thomnico/precise/clearwater-homer" | ||
782 | 35 | num_units: 1 | ||
783 | 36 | options: | ||
784 | 37 | zone: $mydomain | ||
785 | 38 | constraints: arch=amd64 mem=2G | ||
786 | 39 | expose: true | ||
787 | 40 | annotations: | ||
788 | 41 | "gui-x": "600" | ||
789 | 42 | "gui-y": "300" | ||
790 | 43 | "clearwater-homestead": | ||
791 | 44 | charm: "cs:~thomnico/precise/clearwater-homestead" | ||
792 | 45 | num_units: 1 | ||
793 | 46 | options: | ||
794 | 47 | zone: $mydomain | ||
795 | 48 | constraints: arch=amd64 mem=2G | ||
796 | 49 | expose: true | ||
797 | 50 | annotations: | ||
798 | 51 | "gui-x": "200" | ||
799 | 52 | "gui-y": "300" | ||
800 | 53 | to: lxc:clearwater-homer=0 | ||
801 | 54 | clearwater-sprout: | ||
802 | 55 | charm: "cs:~thomnico/precise/clearwater-sprout" | ||
803 | 56 | num_units: 1 | ||
804 | 57 | options: | ||
805 | 58 | zone: $mydomain | ||
806 | 59 | constraints: arch=amd64 mem=2G | ||
807 | 60 | expose: true | ||
808 | 61 | annotations: | ||
809 | 62 | "gui-x": "400" | ||
810 | 63 | "gui-y": "600" | ||
811 | 64 | dns: | ||
812 | 65 | charm: "cs:~thomnico/precise/dns" | ||
813 | 66 | num_units: 1 | ||
814 | 67 | constraints: arch=amd64 mem=2G | ||
815 | 68 | expose: true | ||
816 | 69 | options: | ||
817 | 70 | domain: $mydomain | ||
818 | 71 | annotations: | ||
819 | 72 | "gui-x": "1000" | ||
820 | 73 | "gui-y": "450" | ||
821 | 74 | to: lxc:clearwater-bono=0 | ||
822 | 75 | telscale-load-balancer: | ||
823 | 76 | charm: "cs:~thomnico/trusty/telscale-load-balancer" | ||
824 | 77 | num_units: 1 | ||
825 | 78 | expose: true | ||
826 | 79 | constraints: arch=amd64 mem=2G | ||
827 | 80 | annotations: | ||
828 | 81 | "gui-x": "-500.2210693359375" | ||
829 | 82 | "gui-y": "412.7301025390625" | ||
830 | 83 | mysql: | ||
831 | 84 | charm: "cs:trusty/mysql-5" | ||
832 | 85 | num_units: 1 | ||
833 | 86 | constraints: arch=amd64 mem=2G | ||
834 | 87 | annotations: | ||
835 | 88 | "gui-x": "-500.8215242215981" | ||
836 | 89 | "gui-y": "698.5485784445332" | ||
837 | 90 | to: lxc:telscale-load-balancer=0 | ||
838 | 91 | sipml5: | ||
839 | 92 | charm: "cs:~thomnico/trusty/sipml5" | ||
840 | 93 | num_units: 1 | ||
841 | 94 | expose: true | ||
842 | 95 | annotations: | ||
843 | 96 | "gui-x": "1383.4697265625" | ||
844 | 97 | "gui-y": "423.10858154296875" | ||
845 | 98 | to: lxc:clearwater-bono=0 | ||
846 | 99 | telscale-restcomm: | ||
847 | 100 | charm: "cs:~thomnico/trusty/telscale-restcomm" | ||
848 | 101 | num_units: 1 | ||
849 | 102 | constraints: arch=amd64 mem=2G | ||
850 | 103 | expose: true | ||
851 | 104 | annotations: | ||
852 | 105 | "gui-x": "-500.625244140625" | ||
853 | 106 | "gui-y": "547.9537963867188" | ||
854 | 107 | to: lxc:telscale-load-balancer=0 | ||
855 | 108 | relations: | ||
856 | 109 | - - "clearwater-bono:scscf" | ||
857 | 110 | - "clearwater-sprout:pcscf" | ||
858 | 111 | - - "clearwater-homestead:homestead-cscf" | ||
859 | 112 | - "clearwater-sprout:homestead-hss" | ||
860 | 113 | - - "clearwater-homer:xdms-user" | ||
861 | 114 | - "clearwater-sprout:xdms" | ||
862 | 115 | - - "clearwater-ellis:homestead-prov" | ||
863 | 116 | - "clearwater-homestead:homestead-prov-user" | ||
864 | 117 | - - "clearwater-ellis:xdms" | ||
865 | 118 | - "clearwater-homer:xdms-user" | ||
866 | 119 | - - "clearwater-ellis:programmable-multiple" | ||
867 | 120 | - "dns:programmable-multiple" | ||
868 | 121 | - - "clearwater-homer:programmable-multiple" | ||
869 | 122 | - "dns:programmable-multiple" | ||
870 | 123 | - - "clearwater-bono:programmable-multiple" | ||
871 | 124 | - "dns:programmable-multiple" | ||
872 | 125 | - - "clearwater-sprout:programmable-multiple" | ||
873 | 126 | - "dns:programmable-multiple" | ||
874 | 127 | - - "clearwater-homestead:programmable-multiple" | ||
875 | 128 | - "dns:programmable-multiple" | ||
876 | 129 | - - "sipml5:dns-client" | ||
877 | 130 | - "dns:dns-client" | ||
878 | 131 | - - "mysql:db" | ||
879 | 132 | - "telscale-restcomm:database" | ||
880 | 133 | - - "telscale-restcomm:load-balancer" | ||
881 | 134 | - "telscale-load-balancer:load-balancer" | ||
882 | 135 | - - "telscale-load-balancer:clearwater-ellis" | ||
883 | 136 | - "clearwater-ellis:as-catalog" | ||
884 | 137 | - - "telscale-restcomm:cscf" | ||
885 | 138 | - "clearwater-sprout:as" | ||
886 | 139 | series: trusty | ||
887 | 140 | EOF | ||
888 | 141 | |||
889 | 142 | echo "You can know drag/drop bundle-$mydomain.yaml" | ||
890 | 143 | echo "Or juju-quickstart bundle-$mydomain.yaml" | ||
891 | 144 | echo " " | ||
892 | 145 | 0 | ||
893 | === removed file 'telco/redirect-google-dns-to-ob' | |||
894 | --- telco/redirect-google-dns-to-ob 2015-01-07 02:09:22 +0000 | |||
895 | +++ telco/redirect-google-dns-to-ob 1970-01-01 00:00:00 +0000 | |||
896 | @@ -1,3 +0,0 @@ | |||
897 | 1 | #!/bin/bash | ||
898 | 2 | |||
899 | 3 | sudo iptables -t nat -A PREROUTING -i br0 -d 8.8.8.8 -j DNAT --to-destination 10.14.4.1 |