orange-box-examples

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

  1. restcomm-changes
  2. Merge into trunk
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
1=== modified file 'telco/bundle-telco.yaml'
2--- telco/bundle-telco.yaml 2015-01-26 21:59:10 +0000
3+++ telco/bundle-telco.yaml 2015-02-18 16:47:18 +0000
4@@ -64,7 +64,7 @@
5 "gui-x": "1000"
6 "gui-y": "450"
7 "telscale-load-balancer":
8- charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"
9+ charm: "cs:~thomnico/trusty/telscale-load-balancer"
10 num_units: 1
11 expose: true
12 constraints: arch=amd64 mem=2G
13@@ -86,7 +86,7 @@
14 "gui-x": "1383.4697265625"
15 "gui-y": "423.10858154296875"
16 "telscale-restcomm":
17- charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"
18+ charm: "cs:~thomnico/trusty/telscale-restcomm"
19 num_units: 1
20 constraints: arch=amd64 mem=2G
21 expose: true
22
23=== modified file 'telco/mydomain-bundle.sh'
24--- telco/mydomain-bundle.sh 2015-02-05 09:00:13 +0000
25+++ telco/mydomain-bundle.sh 2015-02-18 16:47:18 +0000
26@@ -69,7 +69,7 @@
27 "gui-x": "1000"
28 "gui-y": "450"
29 "telscale-load-balancer":
30- charm: "cs:~gvagenas-g/trusty/telscale-load-balancer-0"
31+ charm: "cs:~thomnico/trusty/telscale-load-balancer"
32 num_units: 1
33 expose: true
34 constraints: arch=amd64 mem=2G
35@@ -91,7 +91,7 @@
36 "gui-x": "1383.4697265625"
37 "gui-y": "423.10858154296875"
38 "telscale-restcomm":
39- charm: "cs:~gvagenas-g/trusty/telscale-restcomm-0"
40+ charm: "cs:~thomnico/trusty/telscale-restcomm"
41 num_units: 1
42 constraints: arch=amd64 mem=2G
43 expose: true
44@@ -131,3 +131,7 @@
45 - "clearwater-sprout:as"
46 series: trusty
47 EOF
48+
49+echo "You can know drag/drop bundle-$mydomain.yaml"
50+echo "Or juju-quickstart bundle-$mydomain.yaml"
51+echo " "

Subscribers

People subscribed via source and target branches