Merge lp:~thomnico/orange-box-examples/restcomm-changes into lp:orange-box-examples

Proposed by Nicolas Thomas
Status: Merged
Merged at revision: 78
Proposed branch: lp:~thomnico/orange-box-examples/restcomm-changes
Merge into: lp:orange-box-examples
Diff against target: 51 lines (+8/-4)
2 files modified
telco/bundle-telco.yaml (+2/-2)
telco/mydomain-bundle.sh (+6/-2)
To merge this branch: bzr merge lp:~thomnico/orange-box-examples/restcomm-changes
Reviewer Review Type Date Requested Status
Darryl Weaver (community) Approve
Review via email: mp+250166@code.launchpad.net
To post a comment you must log in.
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 'telco/bundle-telco.yaml'
--- telco/bundle-telco.yaml 2015-01-26 21:59:10 +0000
+++ telco/bundle-telco.yaml 2015-02-18 16:47:18 +0000
@@ -64,7 +64,7 @@
64 "gui-x": "1000"64 "gui-x": "1000"
65 "gui-y": "450"65 "gui-y": "450"
66 "telscale-load-balancer": 66 "telscale-load-balancer":
67 charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"67 charm: "cs:~thomnico/trusty/telscale-load-balancer"
68 num_units: 168 num_units: 1
69 expose: true69 expose: true
70 constraints: arch=amd64 mem=2G70 constraints: arch=amd64 mem=2G
@@ -86,7 +86,7 @@
86 "gui-x": "1383.4697265625"86 "gui-x": "1383.4697265625"
87 "gui-y": "423.10858154296875"87 "gui-y": "423.10858154296875"
88 "telscale-restcomm": 88 "telscale-restcomm":
89 charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"89 charm: "cs:~thomnico/trusty/telscale-restcomm"
90 num_units: 190 num_units: 1
91 constraints: arch=amd64 mem=2G91 constraints: arch=amd64 mem=2G
92 expose: true92 expose: true
9393
=== modified file 'telco/mydomain-bundle.sh'
--- telco/mydomain-bundle.sh 2015-02-05 09:00:13 +0000
+++ telco/mydomain-bundle.sh 2015-02-18 16:47:18 +0000
@@ -69,7 +69,7 @@
69 "gui-x": "1000"69 "gui-x": "1000"
70 "gui-y": "450"70 "gui-y": "450"
71 "telscale-load-balancer": 71 "telscale-load-balancer":
72 charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"72 charm: "cs:~thomnico/trusty/telscale-load-balancer"
73 num_units: 173 num_units: 1
74 expose: true74 expose: true
75 constraints: arch=amd64 mem=2G75 constraints: arch=amd64 mem=2G
@@ -91,7 +91,7 @@
91 "gui-x": "1383.4697265625"91 "gui-x": "1383.4697265625"
92 "gui-y": "423.10858154296875"92 "gui-y": "423.10858154296875"
93 "telscale-restcomm": 93 "telscale-restcomm":
94 charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"94 charm: "cs:~thomnico/trusty/telscale-restcomm"
95 num_units: 195 num_units: 1
96 constraints: arch=amd64 mem=2G96 constraints: arch=amd64 mem=2G
97 expose: true97 expose: true
@@ -131,3 +131,7 @@
131 - "clearwater-sprout:as"131 - "clearwater-sprout:as"
132 series: trusty132 series: trusty
133EOF133EOF
134
135echo "You can know drag/drop bundle-$mydomain.yaml"
136echo "Or juju-quickstart bundle-$mydomain.yaml"
137echo " "

Subscribers

People subscribed via source and target branches