Merge lp:~thomnico/orange-box-examples/serie-of-small-bugfixes into lp:orange-box-examples
- serie-of-small-bugfixes
- Merge into trunk
Proposed by
Nicolas Thomas
Status: | Merged |
---|---|
Approved by: | Nicolas Thomas |
Approved revision: | 99 |
Merged at revision: | 96 |
Proposed branch: | lp:~thomnico/orange-box-examples/serie-of-small-bugfixes |
Merge into: | lp:orange-box-examples |
Diff against target: |
337 lines (+118/-26) 5 files modified
bin/bundle2local.sh (+82/-0) bin/orange-box-import-SA-keys (+1/-1) contrail/contrail.yaml (+2/-1) openstack/icehouse/trusty/icehouseOB-local.yaml (+21/-19) telco/mydomain-bundle.sh (+12/-5) |
To merge this branch: | bzr merge lp:~thomnico/orange-box-examples/serie-of-small-bugfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nicolas Thomas (community) | Approve | ||
Review via email: mp+265489@code.launchpad.net |
This proposal supersedes a proposal from 2015-07-22.
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Nicolas Thomas (thomnico) : Posted in a previous version of this proposal | # |
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 | === added file 'bin/bundle2local.sh' | |||
2 | --- bin/bundle2local.sh 1970-01-01 00:00:00 +0000 | |||
3 | +++ bin/bundle2local.sh 2015-07-22 09:07:53 +0000 | |||
4 | @@ -0,0 +1,82 @@ | |||
5 | 1 | #!/bin/bash | ||
6 | 2 | # | ||
7 | 3 | # bundle2local | ||
8 | 4 | # Copyright (C) 2014 Canonical Ltd. | ||
9 | 5 | # | ||
10 | 6 | # Authors: Nicolas Thomas <nicolas.thomas@canonical.com> | ||
11 | 7 | # | ||
12 | 8 | # This program is free software: you can redistribute it and/or modify | ||
13 | 9 | # it under the terms of the GNU General Public License as published by | ||
14 | 10 | # the Free Software Foundation, version 3 of the License. | ||
15 | 11 | # | ||
16 | 12 | # This program is distributed in the hope that it will be useful, | ||
17 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
19 | 15 | # GNU General Public License for more details. | ||
20 | 16 | # | ||
21 | 17 | # You should have received a copy of the GNU General Public License | ||
22 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
23 | 19 | |||
24 | 20 | ## TODO start from juju-deployer to do the same but more beautifully .. | ||
25 | 21 | set -ex | ||
26 | 22 | |||
27 | 23 | |||
28 | 24 | bundle2local() | ||
29 | 25 | { | ||
30 | 26 | |||
31 | 27 | [ -d charmstore/trusty ] || mkdir -p charmstore/trusty | ||
32 | 28 | [ -d charmstore/precise ] || mkdir -p charmstore/precise | ||
33 | 29 | TMPFILE=`mktemp` | ||
34 | 30 | CACHEDIRS=`mktemp` | ||
35 | 31 | ROOTDIR=$PWD | ||
36 | 32 | |||
37 | 33 | ### this is THE biggest hack deployer know how to match charmstore to specific version reuse that and turn it into local charms. bonus it is super fast | ||
38 | 34 | juju-deployer -vbu -c $1 2>&1 | grep "Cache dir" |awk '{print $5}' > $CACHEDIRS | ||
39 | 35 | |||
40 | 36 | ## regex to get serie and charm name. | ||
41 | 37 | grep "charm:" $1 | sed -r 's!.*charm\s*.*.*(trusty|precise)\/(.*)!\1:\2!' > $TMPFILE | ||
42 | 38 | #normalise if there is " or ' some bundle don't have them | ||
43 | 39 | sed -ie 's|["'\'']||g' $TMPFILE | ||
44 | 40 | while IFS=: read serie charm | ||
45 | 41 | do | ||
46 | 42 | canonicalcharm=`echo $charm | sed -r 's!(.*)-.*[0-9]$!\1!'` | ||
47 | 43 | CHARMDIR=`grep $serie_$charm $CACHEDIRS` | ||
48 | 44 | [ -d charmstore/$serie/$charm ] || mkdir -p charmstore/$serie/$charm | ||
49 | 45 | cp -rf $CHARMDIR/* charmstore/$serie/$charm/ | ||
50 | 46 | cd $ROOTDIR | ||
51 | 47 | done <$TMPFILE | ||
52 | 48 | ## Now create a -local version of the bundle: | ||
53 | 49 | BASEFILE=`basename $1 .yaml` | ||
54 | 50 | cat $1 | sed -r 's!(^.*\s)charm:\s*(.*)*(trusty|precise)\/(.*)*"$!\1charm: local:\3/\4!' > ${BASEFILE}-local.yaml | ||
55 | 51 | cat <<EOF | ||
56 | 52 | You can now do: | ||
57 | 53 | export JUJU_REPOSITORY=$ROOTDIR/charmstore | ||
58 | 54 | juju-deployer -c ${BASEFILE}-local.yaml | ||
59 | 55 | |||
60 | 56 | To use your locally copied charms | ||
61 | 57 | If your bundle was already using some local charms you will have to copy them in $ROOTDIR/charmstore | ||
62 | 58 | EOF | ||
63 | 59 | |||
64 | 60 | } | ||
65 | 61 | |||
66 | 62 | usage() | ||
67 | 63 | { | ||
68 | 64 | cat << EOF | ||
69 | 65 | |||
70 | 66 | bundle2local - create a local usable copy of charms and create a local version of the bundle | ||
71 | 67 | |||
72 | 68 | USAGE: bundle2local mybundle.yaml | ||
73 | 69 | Be sure to have charm-tools installed | ||
74 | 70 | If already downloaded a pull request will be done. | ||
75 | 71 | the charmstore will be local to the directory you run the script in. | ||
76 | 72 | EOF | ||
77 | 73 | exit 0 | ||
78 | 74 | } | ||
79 | 75 | |||
80 | 76 | |||
81 | 77 | [ $# -lt 1 ] && usage | ||
82 | 78 | [ -f $1 ] || usage | ||
83 | 79 | BUNDLE=$1 | ||
84 | 80 | |||
85 | 81 | bundle2local $1 | ||
86 | 82 | |||
87 | 0 | 83 | ||
88 | === modified file 'bin/orange-box-import-SA-keys' | |||
89 | --- bin/orange-box-import-SA-keys 2015-05-12 23:30:15 +0000 | |||
90 | +++ bin/orange-box-import-SA-keys 2015-07-22 09:07:53 +0000 | |||
91 | @@ -4,7 +4,7 @@ | |||
92 | 4 | mv ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old | 4 | mv ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old |
93 | 5 | 5 | ||
94 | 6 | #copy maas user's ssh key | 6 | #copy maas user's ssh key |
96 | 7 | sudo cat /home/maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys | 7 | sudo cat ~maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys |
97 | 8 | 8 | ||
98 | 9 | #sabdfl | 9 | #sabdfl |
99 | 10 | ssh-import-id sabdfl | 10 | ssh-import-id sabdfl |
100 | 11 | 11 | ||
101 | === modified file 'contrail/contrail.yaml' | |||
102 | --- contrail/contrail.yaml 2015-05-12 22:13:31 +0000 | |||
103 | +++ contrail/contrail.yaml 2015-07-22 09:07:53 +0000 | |||
104 | @@ -118,7 +118,8 @@ | |||
105 | 118 | - [ contrail-control, contrail-configuration ] | 118 | - [ contrail-control, contrail-configuration ] |
106 | 119 | - [ nova-compute, neutron-contrail ] | 119 | - [ nova-compute, neutron-contrail ] |
107 | 120 | - [ contrail-webui, keystone ] | 120 | - [ contrail-webui, keystone ] |
109 | 121 | - [ contrail-webui, contrail-configuration ] | 121 | - - "contrail-webui:contrail_discovery" |
110 | 122 | - "contrail-configuration:contrail-discovery" | ||
111 | 122 | - [ neutron-contrail, contrail-control ] | 123 | - [ neutron-contrail, contrail-control ] |
112 | 123 | - [ neutron-contrail, neutron-gateway ] | 124 | - [ neutron-contrail, neutron-gateway ] |
113 | 124 | - [ neutron-contrail, contrail-configuration ] | 125 | - [ neutron-contrail, contrail-configuration ] |
114 | 125 | 126 | ||
115 | === modified file 'openstack/icehouse/trusty/icehouseOB-local.yaml' | |||
116 | --- openstack/icehouse/trusty/icehouseOB-local.yaml 2015-02-07 17:59:14 +0000 | |||
117 | +++ openstack/icehouse/trusty/icehouseOB-local.yaml 2015-07-22 09:07:53 +0000 | |||
118 | @@ -1,25 +1,26 @@ | |||
119 | 1 | icehouse: | 1 | icehouse: |
120 | 2 | overrides: | 2 | overrides: |
121 | 3 | openstack-origin: "cloud:trusty-icehouse" | 3 | openstack-origin: "cloud:trusty-icehouse" |
122 | 4 | source: "distro" | ||
123 | 4 | services: | 5 | services: |
124 | 5 | ceph: | 6 | ceph: |
126 | 6 | branch: "lp:charms/ceph" | 7 | charm: "local:trusty/ceph-27" |
127 | 7 | num_units: 3 | 8 | num_units: 3 |
128 | 8 | constraints: tags=physical | 9 | constraints: tags=physical |
129 | 9 | options: | 10 | options: |
130 | 10 | fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c" | 11 | fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c" |
131 | 11 | "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q== | 12 | "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q== |
133 | 12 | "osd-devices": "/srv" | 13 | "osd-devices": "/srv /dev/sdb" |
134 | 13 | "osd-reformat": "yes" | 14 | "osd-reformat": "yes" |
135 | 14 | annotations: | 15 | annotations: |
136 | 15 | "gui-x": "2648.6688842773438" | 16 | "gui-x": "2648.6688842773438" |
137 | 16 | "gui-y": "708.3873901367188" | 17 | "gui-y": "708.3873901367188" |
138 | 17 | ubuntu: | 18 | ubuntu: |
140 | 18 | branch: "lp:charms/ubuntu" | 19 | charm: "local:trusty/ubuntu" |
141 | 19 | num_units: 1 | 20 | num_units: 1 |
142 | 20 | constraints: tags=physical | 21 | constraints: tags=physical |
143 | 21 | keystone: | 22 | keystone: |
145 | 22 | branch: "lp:charms/keystone" | 23 | charm: "local:trusty/keystone-5" |
146 | 23 | num_units: 1 | 24 | num_units: 1 |
147 | 24 | to: lxc:ubuntu=0 | 25 | to: lxc:ubuntu=0 |
148 | 25 | options: | 26 | options: |
149 | @@ -29,7 +30,7 @@ | |||
150 | 29 | "gui-x": "2013.905517578125" | 30 | "gui-x": "2013.905517578125" |
151 | 30 | "gui-y": "75.58013916015625" | 31 | "gui-y": "75.58013916015625" |
152 | 31 | "nova-compute": | 32 | "nova-compute": |
154 | 32 | branch: "lp:charms/nova-compute" | 33 | charm: "local:trusty/nova-compute-11" |
155 | 33 | num_units: 3 | 34 | num_units: 3 |
156 | 34 | to: [ceph=0, ceph=1, ceph=2] | 35 | to: [ceph=0, ceph=1, ceph=2] |
157 | 35 | options: | 36 | options: |
158 | @@ -38,7 +39,7 @@ | |||
159 | 38 | "gui-x": "776.1040649414062" | 39 | "gui-x": "776.1040649414062" |
160 | 39 | "gui-y": "-81.22811031341553" | 40 | "gui-y": "-81.22811031341553" |
161 | 40 | "neutron-gateway": | 41 | "neutron-gateway": |
163 | 41 | branch: "lp:charms/quantum-gateway" | 42 | charm: "local:trusty/quantum-gateway-3" |
164 | 42 | num_units: 1 | 43 | num_units: 1 |
165 | 43 | constraints: tags=virtual | 44 | constraints: tags=virtual |
166 | 44 | options: | 45 | options: |
167 | @@ -48,30 +49,31 @@ | |||
168 | 48 | "gui-x": "329.0572509765625" | 49 | "gui-x": "329.0572509765625" |
169 | 49 | "gui-y": "46.4658203125" | 50 | "gui-y": "46.4658203125" |
170 | 50 | "nova-cloud-controller": | 51 | "nova-cloud-controller": |
172 | 51 | branch: "lp:charms/nova-cloud-controller" | 52 | charm: "local:trusty/nova-cloud-controller-50" |
173 | 52 | num_units: 1 | 53 | num_units: 1 |
174 | 53 | to: lxc:ubuntu=0 | 54 | to: lxc:ubuntu=0 |
175 | 54 | options: | 55 | options: |
176 | 55 | "network-manager": Neutron | 56 | "network-manager": Neutron |
177 | 57 | "console-access-protocol": novnc | ||
178 | 56 | annotations: | 58 | annotations: |
179 | 57 | "gui-x": "1388.40185546875" | 59 | "gui-x": "1388.40185546875" |
180 | 58 | "gui-y": "-118.01156234741211" | 60 | "gui-y": "-118.01156234741211" |
181 | 59 | rabbitmq: | 61 | rabbitmq: |
183 | 60 | branch: "lp:charms/rabbitmq-server" | 62 | charm: "local:trusty/rabbitmq-server-4" |
184 | 61 | num_units: 1 | 63 | num_units: 1 |
185 | 62 | to: lxc:ubuntu=0 | 64 | to: lxc:ubuntu=0 |
186 | 63 | annotations: | 65 | annotations: |
187 | 64 | "gui-x": "633.8120727539062" | 66 | "gui-x": "633.8120727539062" |
188 | 65 | "gui-y": "862.6530151367188" | 67 | "gui-y": "862.6530151367188" |
189 | 66 | glance: | 68 | glance: |
191 | 67 | branch: "lp:charms/glance" | 69 | charm: "local:trusty/glance-3" |
192 | 68 | num_units: 1 | 70 | num_units: 1 |
193 | 69 | to: lxc:ubuntu=0 | 71 | to: lxc:ubuntu=0 |
194 | 70 | annotations: | 72 | annotations: |
195 | 71 | "gui-x": "1147.3269653320312" | 73 | "gui-x": "1147.3269653320312" |
196 | 72 | "gui-y": "1389.5643157958984" | 74 | "gui-y": "1389.5643157958984" |
197 | 73 | cinder: | 75 | cinder: |
199 | 74 | branch: "lp:charms/cinder" | 76 | charm: "local:trusty/cinder-4" |
200 | 75 | num_units: 1 | 77 | num_units: 1 |
201 | 76 | to: lxc:ubuntu=0 | 78 | to: lxc:ubuntu=0 |
202 | 77 | options: | 79 | options: |
203 | @@ -80,20 +82,20 @@ | |||
204 | 80 | "gui-x": "1752.32568359375" | 82 | "gui-x": "1752.32568359375" |
205 | 81 | "gui-y": "1365.716194152832" | 83 | "gui-y": "1365.716194152832" |
206 | 82 | "ceph-radosgw": | 84 | "ceph-radosgw": |
208 | 83 | branch: "lp:charms/ceph-radosgw" | 85 | charm: "local:trusty/ceph-radosgw-3" |
209 | 84 | num_units: 1 | 86 | num_units: 1 |
210 | 85 | to: lxc:ubuntu=0 | 87 | to: lxc:ubuntu=0 |
211 | 86 | annotations: | 88 | annotations: |
212 | 87 | "gui-x": "2216.68212890625" | 89 | "gui-x": "2216.68212890625" |
213 | 88 | "gui-y": "697.16796875" | 90 | "gui-y": "697.16796875" |
214 | 89 | cinder-ceph: | 91 | cinder-ceph: |
216 | 90 | branch: "lp:charms/cinder-ceph" | 92 | charm: "local:trusty/cinder-ceph-1" |
217 | 91 | num_units: 0 | 93 | num_units: 0 |
218 | 92 | annotations: | 94 | annotations: |
219 | 93 | "gui-x": "2257.5515747070312" | 95 | "gui-x": "2257.5515747070312" |
220 | 94 | "gui-y": "1231.2130126953125" | 96 | "gui-y": "1231.2130126953125" |
221 | 95 | "openstack-dashboard": | 97 | "openstack-dashboard": |
223 | 96 | branch: "lp:charms/openstack-dashboard" | 98 | charm: "local:trusty/openstack-dashboard-4" |
224 | 97 | num_units: 1 | 99 | num_units: 1 |
225 | 98 | to: lxc:ubuntu=0 | 100 | to: lxc:ubuntu=0 |
226 | 99 | options: | 101 | options: |
227 | @@ -102,7 +104,7 @@ | |||
228 | 102 | "gui-x": "2353.6898193359375" | 104 | "gui-x": "2353.6898193359375" |
229 | 103 | "gui-y": "-94.2642593383789" | 105 | "gui-y": "-94.2642593383789" |
230 | 104 | mysql: | 106 | mysql: |
232 | 105 | branch: "lp:charms/mysql" | 107 | charm: "local:trusty/mysql-1" |
233 | 106 | num_units: 1 | 108 | num_units: 1 |
234 | 107 | to: lxc:ubuntu=0 | 109 | to: lxc:ubuntu=0 |
235 | 108 | options: | 110 | options: |
236 | @@ -111,34 +113,34 @@ | |||
237 | 111 | "gui-x": "364.4567565917969" | 113 | "gui-x": "364.4567565917969" |
238 | 112 | "gui-y": "1067.5167846679688" | 114 | "gui-y": "1067.5167846679688" |
239 | 113 | mongodb: | 115 | mongodb: |
241 | 114 | branch: "lp:charms/mongodb" | 116 | charm: "local:trusty/mongodb-0" |
242 | 115 | num_units: 1 | 117 | num_units: 1 |
243 | 116 | to: lxc:ubuntu=0 | 118 | to: lxc:ubuntu=0 |
244 | 117 | annotations: | 119 | annotations: |
245 | 118 | "gui-x": "-70.0399979352951" | 120 | "gui-x": "-70.0399979352951" |
246 | 119 | "gui-y": "1282.8224487304688" | 121 | "gui-y": "1282.8224487304688" |
247 | 120 | ceilometer: | 122 | ceilometer: |
249 | 121 | branch: "lp:charms/ceilometer" | 123 | charm: "local:trusty/ceilometer-0" |
250 | 122 | num_units: 1 | 124 | num_units: 1 |
251 | 123 | to: lxc:ubuntu=0 | 125 | to: lxc:ubuntu=0 |
252 | 124 | annotations: | 126 | annotations: |
253 | 125 | "gui-x": "-78.13333225250244" | 127 | "gui-x": "-78.13333225250244" |
254 | 126 | "gui-y": "919.3128051757812" | 128 | "gui-y": "919.3128051757812" |
255 | 127 | ceilometer-agent: | 129 | ceilometer-agent: |
257 | 128 | branch: "lp:charms/ceilometer-agent" | 130 | charm: "local:trusty/ceilometer-agent-0" |
258 | 129 | num_units: 0 | 131 | num_units: 0 |
259 | 130 | annotations: | 132 | annotations: |
260 | 131 | "gui-x": "-90.9158582687378" | 133 | "gui-x": "-90.9158582687378" |
261 | 132 | "gui-y": "562.5347595214844" | 134 | "gui-y": "562.5347595214844" |
262 | 133 | heat: | 135 | heat: |
264 | 134 | branch: "lp:charms/heat" | 136 | charm: "local:trusty/heat-0" |
265 | 135 | num_units: 1 | 137 | num_units: 1 |
266 | 136 | to: lxc:ubuntu=0 | 138 | to: lxc:ubuntu=0 |
267 | 137 | annotations: | 139 | annotations: |
268 | 138 | "gui-x": "494.94012451171875" | 140 | "gui-x": "494.94012451171875" |
269 | 139 | "gui-y": "1363.6024169921875" | 141 | "gui-y": "1363.6024169921875" |
270 | 140 | ntp: | 142 | ntp: |
272 | 141 | branch: "lp:charms/ntp" | 143 | charm: "local:trusty/ntp-4" |
273 | 142 | num_units: 0 | 144 | num_units: 0 |
274 | 143 | annotations: | 145 | annotations: |
275 | 144 | "gui-x": "-104.57728099822998" | 146 | "gui-x": "-104.57728099822998" |
276 | 145 | 147 | ||
277 | === modified file 'telco/mydomain-bundle.sh' | |||
278 | --- telco/mydomain-bundle.sh 2015-02-18 16:44:51 +0000 | |||
279 | +++ telco/mydomain-bundle.sh 2015-07-22 09:07:53 +0000 | |||
280 | @@ -28,7 +28,9 @@ | |||
281 | 28 | annotations: | 28 | annotations: |
282 | 29 | "gui-x": "400" | 29 | "gui-x": "400" |
283 | 30 | "gui-y": "0" | 30 | "gui-y": "0" |
285 | 31 | "clearwater-homer": | 31 | to: |
286 | 32 | - lxc:clearwater-bono=0 | ||
287 | 33 | clearwater-homer: | ||
288 | 32 | charm: "cs:~thomnico/precise/clearwater-homer" | 34 | charm: "cs:~thomnico/precise/clearwater-homer" |
289 | 33 | num_units: 1 | 35 | num_units: 1 |
290 | 34 | options: | 36 | options: |
291 | @@ -48,7 +50,8 @@ | |||
292 | 48 | annotations: | 50 | annotations: |
293 | 49 | "gui-x": "200" | 51 | "gui-x": "200" |
294 | 50 | "gui-y": "300" | 52 | "gui-y": "300" |
296 | 51 | "clearwater-sprout": | 53 | to: lxc:clearwater-homer=0 |
297 | 54 | clearwater-sprout: | ||
298 | 52 | charm: "cs:~thomnico/precise/clearwater-sprout" | 55 | charm: "cs:~thomnico/precise/clearwater-sprout" |
299 | 53 | num_units: 1 | 56 | num_units: 1 |
300 | 54 | options: | 57 | options: |
301 | @@ -68,7 +71,8 @@ | |||
302 | 68 | annotations: | 71 | annotations: |
303 | 69 | "gui-x": "1000" | 72 | "gui-x": "1000" |
304 | 70 | "gui-y": "450" | 73 | "gui-y": "450" |
306 | 71 | "telscale-load-balancer": | 74 | to: lxc:clearwater-bono=0 |
307 | 75 | telscale-load-balancer: | ||
308 | 72 | charm: "cs:~thomnico/trusty/telscale-load-balancer" | 76 | charm: "cs:~thomnico/trusty/telscale-load-balancer" |
309 | 73 | num_units: 1 | 77 | num_units: 1 |
310 | 74 | expose: true | 78 | expose: true |
311 | @@ -83,14 +87,16 @@ | |||
312 | 83 | annotations: | 87 | annotations: |
313 | 84 | "gui-x": "-500.8215242215981" | 88 | "gui-x": "-500.8215242215981" |
314 | 85 | "gui-y": "698.5485784445332" | 89 | "gui-y": "698.5485784445332" |
316 | 86 | sipml5: | 90 | to: lxc:telscale-load-balancer=0 |
317 | 91 | sipml5: | ||
318 | 87 | charm: "cs:~thomnico/trusty/sipml5" | 92 | charm: "cs:~thomnico/trusty/sipml5" |
319 | 88 | num_units: 1 | 93 | num_units: 1 |
320 | 89 | expose: true | 94 | expose: true |
321 | 90 | annotations: | 95 | annotations: |
322 | 91 | "gui-x": "1383.4697265625" | 96 | "gui-x": "1383.4697265625" |
323 | 92 | "gui-y": "423.10858154296875" | 97 | "gui-y": "423.10858154296875" |
325 | 93 | "telscale-restcomm": | 98 | to: lxc:clearwater-bono=0 |
326 | 99 | telscale-restcomm: | ||
327 | 94 | charm: "cs:~thomnico/trusty/telscale-restcomm" | 100 | charm: "cs:~thomnico/trusty/telscale-restcomm" |
328 | 95 | num_units: 1 | 101 | num_units: 1 |
329 | 96 | constraints: arch=amd64 mem=2G | 102 | constraints: arch=amd64 mem=2G |
330 | @@ -98,6 +104,7 @@ | |||
331 | 98 | annotations: | 104 | annotations: |
332 | 99 | "gui-x": "-500.625244140625" | 105 | "gui-x": "-500.625244140625" |
333 | 100 | "gui-y": "547.9537963867188" | 106 | "gui-y": "547.9537963867188" |
334 | 107 | to: lxc:telscale-load-balancer=0 | ||
335 | 101 | relations: | 108 | relations: |
336 | 102 | - - "clearwater-bono:scscf" | 109 | - - "clearwater-bono:scscf" |
337 | 103 | - "clearwater-sprout:pcscf" | 110 | - "clearwater-sprout:pcscf" |