orange-box-examples

Merge lp:~thomnico/orange-box-examples/resync into lp:orange-box-examples

  1. resync
  2. Merge into trunk
Proposed by Nicolas Thomas
Status: Merged
Approved by: Nicolas Thomas
Approved revision: 96
Merged at revision: 99
Proposed branch: lp:~thomnico/orange-box-examples/resync
Merge into: lp:orange-box-examples
Diff against target: 250 lines (+36/-26)
4 files modified
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/resync
Reviewer Review Type Date Requested Status
Nicolas Thomas (community) Approve
Review via email: mp+265497@code.launchpad.net

This proposal supersedes a proposal from 2015-07-22.

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
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=== modified file 'bin/orange-box-import-SA-keys'
2--- bin/orange-box-import-SA-keys 2015-05-12 23:30:15 +0000
3+++ bin/orange-box-import-SA-keys 2015-07-22 09:50:53 +0000
4@@ -4,7 +4,7 @@
5 mv ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old
6
7 #copy maas user's ssh key
8-sudo cat /home/maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
9+sudo cat ~maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
10
11 #sabdfl
12 ssh-import-id sabdfl
13
14=== modified file 'contrail/contrail.yaml'
15--- contrail/contrail.yaml 2015-05-12 22:13:31 +0000
16+++ contrail/contrail.yaml 2015-07-22 09:50:53 +0000
17@@ -118,7 +118,8 @@
18 - [ contrail-control, contrail-configuration ]
19 - [ nova-compute, neutron-contrail ]
20 - [ contrail-webui, keystone ]
21- - [ contrail-webui, contrail-configuration ]
22+ - - "contrail-webui:contrail_discovery"
23+ - "contrail-configuration:contrail-discovery"
24 - [ neutron-contrail, contrail-control ]
25 - [ neutron-contrail, neutron-gateway ]
26 - [ neutron-contrail, contrail-configuration ]
27
28=== modified file 'openstack/icehouse/trusty/icehouseOB-local.yaml'
29--- openstack/icehouse/trusty/icehouseOB-local.yaml 2015-02-07 17:59:14 +0000
30+++ openstack/icehouse/trusty/icehouseOB-local.yaml 2015-07-22 09:50:53 +0000
31@@ -1,25 +1,26 @@
32 icehouse:
33 overrides:
34 openstack-origin: "cloud:trusty-icehouse"
35+ source: "distro"
36 services:
37 ceph:
38- branch: "lp:charms/ceph"
39+ charm: "local:trusty/ceph-27"
40 num_units: 3
41 constraints: tags=physical
42 options:
43 fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c"
44 "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
45- "osd-devices": "/srv"
46+ "osd-devices": "/srv /dev/sdb"
47 "osd-reformat": "yes"
48 annotations:
49 "gui-x": "2648.6688842773438"
50 "gui-y": "708.3873901367188"
51 ubuntu:
52- branch: "lp:charms/ubuntu"
53+ charm: "local:trusty/ubuntu"
54 num_units: 1
55 constraints: tags=physical
56 keystone:
57- branch: "lp:charms/keystone"
58+ charm: "local:trusty/keystone-5"
59 num_units: 1
60 to: lxc:ubuntu=0
61 options:
62@@ -29,7 +30,7 @@
63 "gui-x": "2013.905517578125"
64 "gui-y": "75.58013916015625"
65 "nova-compute":
66- branch: "lp:charms/nova-compute"
67+ charm: "local:trusty/nova-compute-11"
68 num_units: 3
69 to: [ceph=0, ceph=1, ceph=2]
70 options:
71@@ -38,7 +39,7 @@
72 "gui-x": "776.1040649414062"
73 "gui-y": "-81.22811031341553"
74 "neutron-gateway":
75- branch: "lp:charms/quantum-gateway"
76+ charm: "local:trusty/quantum-gateway-3"
77 num_units: 1
78 constraints: tags=virtual
79 options:
80@@ -48,30 +49,31 @@
81 "gui-x": "329.0572509765625"
82 "gui-y": "46.4658203125"
83 "nova-cloud-controller":
84- branch: "lp:charms/nova-cloud-controller"
85+ charm: "local:trusty/nova-cloud-controller-50"
86 num_units: 1
87 to: lxc:ubuntu=0
88 options:
89 "network-manager": Neutron
90+ "console-access-protocol": novnc
91 annotations:
92 "gui-x": "1388.40185546875"
93 "gui-y": "-118.01156234741211"
94 rabbitmq:
95- branch: "lp:charms/rabbitmq-server"
96+ charm: "local:trusty/rabbitmq-server-4"
97 num_units: 1
98 to: lxc:ubuntu=0
99 annotations:
100 "gui-x": "633.8120727539062"
101 "gui-y": "862.6530151367188"
102 glance:
103- branch: "lp:charms/glance"
104+ charm: "local:trusty/glance-3"
105 num_units: 1
106 to: lxc:ubuntu=0
107 annotations:
108 "gui-x": "1147.3269653320312"
109 "gui-y": "1389.5643157958984"
110 cinder:
111- branch: "lp:charms/cinder"
112+ charm: "local:trusty/cinder-4"
113 num_units: 1
114 to: lxc:ubuntu=0
115 options:
116@@ -80,20 +82,20 @@
117 "gui-x": "1752.32568359375"
118 "gui-y": "1365.716194152832"
119 "ceph-radosgw":
120- branch: "lp:charms/ceph-radosgw"
121+ charm: "local:trusty/ceph-radosgw-3"
122 num_units: 1
123 to: lxc:ubuntu=0
124 annotations:
125 "gui-x": "2216.68212890625"
126 "gui-y": "697.16796875"
127 cinder-ceph:
128- branch: "lp:charms/cinder-ceph"
129+ charm: "local:trusty/cinder-ceph-1"
130 num_units: 0
131 annotations:
132 "gui-x": "2257.5515747070312"
133 "gui-y": "1231.2130126953125"
134 "openstack-dashboard":
135- branch: "lp:charms/openstack-dashboard"
136+ charm: "local:trusty/openstack-dashboard-4"
137 num_units: 1
138 to: lxc:ubuntu=0
139 options:
140@@ -102,7 +104,7 @@
141 "gui-x": "2353.6898193359375"
142 "gui-y": "-94.2642593383789"
143 mysql:
144- branch: "lp:charms/mysql"
145+ charm: "local:trusty/mysql-1"
146 num_units: 1
147 to: lxc:ubuntu=0
148 options:
149@@ -111,34 +113,34 @@
150 "gui-x": "364.4567565917969"
151 "gui-y": "1067.5167846679688"
152 mongodb:
153- branch: "lp:charms/mongodb"
154+ charm: "local:trusty/mongodb-0"
155 num_units: 1
156 to: lxc:ubuntu=0
157 annotations:
158 "gui-x": "-70.0399979352951"
159 "gui-y": "1282.8224487304688"
160 ceilometer:
161- branch: "lp:charms/ceilometer"
162+ charm: "local:trusty/ceilometer-0"
163 num_units: 1
164 to: lxc:ubuntu=0
165 annotations:
166 "gui-x": "-78.13333225250244"
167 "gui-y": "919.3128051757812"
168 ceilometer-agent:
169- branch: "lp:charms/ceilometer-agent"
170+ charm: "local:trusty/ceilometer-agent-0"
171 num_units: 0
172 annotations:
173 "gui-x": "-90.9158582687378"
174 "gui-y": "562.5347595214844"
175 heat:
176- branch: "lp:charms/heat"
177+ charm: "local:trusty/heat-0"
178 num_units: 1
179 to: lxc:ubuntu=0
180 annotations:
181 "gui-x": "494.94012451171875"
182 "gui-y": "1363.6024169921875"
183 ntp:
184- branch: "lp:charms/ntp"
185+ charm: "local:trusty/ntp-4"
186 num_units: 0
187 annotations:
188 "gui-x": "-104.57728099822998"
189
190=== modified file 'telco/mydomain-bundle.sh'
191--- telco/mydomain-bundle.sh 2015-02-18 16:44:51 +0000
192+++ telco/mydomain-bundle.sh 2015-07-22 09:50:53 +0000
193@@ -28,7 +28,9 @@
194 annotations:
195 "gui-x": "400"
196 "gui-y": "0"
197- "clearwater-homer":
198+ to:
199+ - lxc:clearwater-bono=0
200+ clearwater-homer:
201 charm: "cs:~thomnico/precise/clearwater-homer"
202 num_units: 1
203 options:
204@@ -48,7 +50,8 @@
205 annotations:
206 "gui-x": "200"
207 "gui-y": "300"
208- "clearwater-sprout":
209+ to: lxc:clearwater-homer=0
210+ clearwater-sprout:
211 charm: "cs:~thomnico/precise/clearwater-sprout"
212 num_units: 1
213 options:
214@@ -68,7 +71,8 @@
215 annotations:
216 "gui-x": "1000"
217 "gui-y": "450"
218- "telscale-load-balancer":
219+ to: lxc:clearwater-bono=0
220+ telscale-load-balancer:
221 charm: "cs:~thomnico/trusty/telscale-load-balancer"
222 num_units: 1
223 expose: true
224@@ -83,14 +87,16 @@
225 annotations:
226 "gui-x": "-500.8215242215981"
227 "gui-y": "698.5485784445332"
228- sipml5:
229+ to: lxc:telscale-load-balancer=0
230+ sipml5:
231 charm: "cs:~thomnico/trusty/sipml5"
232 num_units: 1
233 expose: true
234 annotations:
235 "gui-x": "1383.4697265625"
236 "gui-y": "423.10858154296875"
237- "telscale-restcomm":
238+ to: lxc:clearwater-bono=0
239+ telscale-restcomm:
240 charm: "cs:~thomnico/trusty/telscale-restcomm"
241 num_units: 1
242 constraints: arch=amd64 mem=2G
243@@ -98,6 +104,7 @@
244 annotations:
245 "gui-x": "-500.625244140625"
246 "gui-y": "547.9537963867188"
247+ to: lxc:telscale-load-balancer=0
248 relations:
249 - - "clearwater-bono:scscf"
250 - "clearwater-sprout:pcscf"

Subscribers

People subscribed via source and target branches