Merge lp:~zulcss/openstack-charm-testing/newton-lxd-updates into lp:openstack-charm-testing
- newton-lxd-updates
- Merge into trunk
Proposed by
Chuck Short
Status: | Merged |
---|---|
Merged at revision: | 221 |
Proposed branch: | lp:~zulcss/openstack-charm-testing/newton-lxd-updates |
Merge into: | lp:openstack-charm-testing |
Diff against target: |
434 lines (+205/-78) 6 files modified
bundles/lxd/default.yaml (+42/-38) bundles/lxd/next.yaml (+78/-37) bundles/lxd/source/default.yaml (+41/-0) bundles/lxd/source/next.yaml (+41/-0) bundles/lxd/source/nova-master.yaml (+2/-2) bundles/lxd/source/nova-mitaka.yaml (+1/-1) |
To merge this branch: | bzr merge lp:~zulcss/openstack-charm-testing/newton-lxd-updates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
Review via email: mp+298335@code.launchpad.net |
Commit message
Description of the change
- Add support for newton for lxd bundles
- Add support for newton for the dfs lxd bundles.
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bundles/lxd/default.yaml' |
2 | --- bundles/lxd/default.yaml 2016-06-04 22:55:27 +0000 |
3 | +++ bundles/lxd/default.yaml 2016-06-24 18:55:07 +0000 |
4 | @@ -1,15 +1,8 @@ |
5 | # vim: set ts=2 et: |
6 | -# deployer bundle for development (stable/trunk) charms |
7 | +# deployer bundle for stable charms |
8 | # UOSCI relies on this for OS-on-OS deployment testing |
9 | -openstack-services: |
10 | +base-services: |
11 | services: |
12 | - mysql: |
13 | - branch: lp:charms/trusty/mysql |
14 | - #https://github.com/openstack/charm-percona-cluster |
15 | - constraints: mem=1G |
16 | - options: |
17 | - dataset-size: 50% |
18 | - max-connections: 20000 |
19 | rabbitmq-server: |
20 | branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04 |
21 | constraints: mem=1G |
22 | @@ -36,12 +29,18 @@ |
23 | constraints: mem=1G |
24 | options: |
25 | network-manager: Neutron |
26 | - ram-allocation-ratio: 5.0 |
27 | neutron-gateway: |
28 | branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04 |
29 | constraints: mem=1G |
30 | options: |
31 | instance-mtu: 1300 |
32 | + neutron-api: |
33 | + branch: https://github.com/openstack/charm-neutron-api;stable/16.04 |
34 | + constraints: mem=1G |
35 | + options: |
36 | + neutron-security-groups: True |
37 | + neutron-openvswitch: |
38 | + branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04 |
39 | glance: |
40 | branch: https://github.com/openstack/charm-glance;stable/16.04 |
41 | constraints: mem=1G |
42 | @@ -97,15 +96,14 @@ |
43 | - [ nova-cloud-controller, glance ] |
44 | - [ nova-cloud-controller, keystone ] |
45 | - [ nova-compute, nova-cloud-controller ] |
46 | + - [ nova-compute, mysql ] |
47 | - [ nova-compute, lxd ] |
48 | - - [ nova-compute, mysql ] |
49 | - - nova-compute |
50 | - rabbitmq-server:amqp |
51 | - [ nova-compute, glance ] |
52 | - [ glance, mysql ] |
53 | - [ glance, keystone ] |
54 | - [ glance, rabbitmq-server ] |
55 | - - [ glance, swift-proxy ] |
56 | - [ neutron-gateway, nova-cloud-controller ] |
57 | - [ openstack-dashboard, keystone ] |
58 | - [ swift-proxy, keystone ] |
59 | @@ -121,41 +119,47 @@ |
60 | - [ heat, mysql ] |
61 | - [ heat, keystone ] |
62 | - [ heat, rabbitmq-server ] |
63 | -openstack-singlerabbit: |
64 | - inherits: openstack-services |
65 | - relations: |
66 | - [ "neutron-gateway:amqp", rabbitmq-server ] |
67 | -openstack-icehouse: |
68 | - inherits: openstack-singlerabbit |
69 | - services: |
70 | - neutron-api: |
71 | - branch: https://github.com/openstack/charm-neutron-api;stable/16.04 |
72 | - constraints: mem=1G |
73 | - options: |
74 | - neutron-security-groups: True |
75 | - neutron-openvswitch: |
76 | - branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04 |
77 | - relations: |
78 | - - [ neutron-api, mysql ] |
79 | - - [ neutron-api, rabbitmq-server ] |
80 | - - [ neutron-api, nova-cloud-controller ] |
81 | - - [ neutron-api, neutron-openvswitch ] |
82 | - - [ neutron-api, keystone ] |
83 | - - [ neutron-api, neutron-gateway ] |
84 | - - [ neutron-openvswitch, nova-compute ] |
85 | - - [ neutron-openvswitch, rabbitmq-server ] |
86 | -# Liberty |
87 | + - [ neutron-api, mysql ] |
88 | + - [ neutron-api, rabbitmq-server ] |
89 | + - [ neutron-api, nova-cloud-controller ] |
90 | + - [ neutron-api, neutron-openvswitch ] |
91 | + - [ neutron-api, keystone ] |
92 | + - [ neutron-api, neutron-gateway ] |
93 | + - [ neutron-openvswitch, nova-compute ] |
94 | + - [ neutron-openvswitch, rabbitmq-server ] |
95 | +openstack-services-legacy: |
96 | + inherits: base-services |
97 | + services: |
98 | + mysql: |
99 | + branch: lp:charms/trusty/mysql |
100 | + constraints: mem=2G |
101 | + options: |
102 | + dataset-size: 50% |
103 | + max-connections: 20000 |
104 | +openstack-services: |
105 | + inherits: base-services |
106 | + services: |
107 | + mysql: |
108 | + branch: https://github.com/openstack/charm-percona-cluster;stable/16.04 |
109 | + constraints: mem=4G |
110 | + options: |
111 | + dataset-size: 50% |
112 | + max-connections: 20000 |
113 | + root-password: ChangeMe123 |
114 | + sst-password: ChangeMe123 |
115 | +# liberty |
116 | wily-liberty: |
117 | - inherits: openstack-icehouse |
118 | + inherits: openstack-services |
119 | series: wily |
120 | wily-liberty-proposed: |
121 | inherits: wily-liberty |
122 | overrides: |
123 | source: proposed |
124 | openstack-origin: distro-proposed |
125 | -# Mitaka |
126 | +# mitaka |
127 | xenial-mitaka: |
128 | - inherits: openstack-icehouse |
129 | + inherits: openstack-services |
130 | series: xenial |
131 | xenial-mitaka-proposed: |
132 | inherits: xenial-mitaka |
133 | |
134 | === modified file 'bundles/lxd/next.yaml' |
135 | --- bundles/lxd/next.yaml 2016-06-08 15:01:45 +0000 |
136 | +++ bundles/lxd/next.yaml 2016-06-24 18:55:07 +0000 |
137 | @@ -1,15 +1,8 @@ |
138 | # vim: set ts=2 et: |
139 | # deployer bundle for development ('next') charms |
140 | # UOSCI relies on this for OS-on-OS deployment testing |
141 | -openstack-services: |
142 | +base-services: |
143 | services: |
144 | - mysql: |
145 | - branch: lp:charms/trusty/mysql |
146 | - #https://github.com/openstack/charm-percona-cluster |
147 | - constraints: mem=1G |
148 | - options: |
149 | - dataset-size: 50% |
150 | - max-connections: 20000 |
151 | rabbitmq-server: |
152 | branch: https://github.com/openstack/charm-rabbitmq-server |
153 | constraints: mem=1G |
154 | @@ -36,12 +29,20 @@ |
155 | constraints: mem=1G |
156 | options: |
157 | network-manager: Neutron |
158 | - ram-allocation-ratio: 5.0 |
159 | neutron-gateway: |
160 | branch: https://github.com/openstack/charm-neutron-gateway |
161 | constraints: mem=1G |
162 | options: |
163 | instance-mtu: 1300 |
164 | + bridge-mappings: physnet1:br-ex |
165 | + neutron-api: |
166 | + branch: https://github.com/openstack/charm-neutron-api |
167 | + constraints: mem=1G |
168 | + options: |
169 | + neutron-security-groups: True |
170 | + flat-network-providers: physnet1 |
171 | + neutron-openvswitch: |
172 | + branch: https://github.com/openstack/charm-neutron-openvswitch |
173 | glance: |
174 | branch: https://github.com/openstack/charm-glance |
175 | constraints: mem=1G |
176 | @@ -97,15 +98,14 @@ |
177 | - [ nova-cloud-controller, glance ] |
178 | - [ nova-cloud-controller, keystone ] |
179 | - [ nova-compute, nova-cloud-controller ] |
180 | + - [ nova-compute, mysql ] |
181 | - [ nova-compute, lxd ] |
182 | - - [ nova-compute, mysql ] |
183 | - - nova-compute |
184 | - rabbitmq-server:amqp |
185 | - [ nova-compute, glance ] |
186 | - [ glance, mysql ] |
187 | - [ glance, keystone ] |
188 | - [ glance, rabbitmq-server ] |
189 | - - [ glance, swift-proxy ] |
190 | - [ neutron-gateway, nova-cloud-controller ] |
191 | - [ openstack-dashboard, keystone ] |
192 | - [ swift-proxy, keystone ] |
193 | @@ -121,44 +121,85 @@ |
194 | - [ heat, mysql ] |
195 | - [ heat, keystone ] |
196 | - [ heat, rabbitmq-server ] |
197 | -openstack-singlerabbit: |
198 | - inherits: openstack-services |
199 | - relations: |
200 | - [ "neutron-gateway:amqp", rabbitmq-server ] |
201 | -openstack-icehouse: |
202 | - inherits: openstack-singlerabbit |
203 | - services: |
204 | - neutron-api: |
205 | - branch: https://github.com/openstack/charm-neutron-api |
206 | - constraints: mem=1G |
207 | - options: |
208 | - neutron-security-groups: True |
209 | - neutron-openvswitch: |
210 | - branch: https://github.com/openstack/charm-neutron-openvswitch |
211 | - relations: |
212 | - - [ neutron-api, mysql ] |
213 | - - [ neutron-api, rabbitmq-server ] |
214 | - - [ neutron-api, nova-cloud-controller ] |
215 | - - [ neutron-api, neutron-openvswitch ] |
216 | - - [ neutron-api, keystone ] |
217 | - - [ neutron-api, neutron-gateway ] |
218 | - - [ neutron-openvswitch, nova-compute ] |
219 | - - [ neutron-openvswitch, rabbitmq-server ] |
220 | -# Liberty |
221 | + - [ neutron-api, mysql ] |
222 | + - [ neutron-api, rabbitmq-server ] |
223 | + - [ neutron-api, nova-cloud-controller ] |
224 | + - [ neutron-api, neutron-openvswitch ] |
225 | + - [ neutron-api, keystone ] |
226 | + - [ neutron-api, neutron-gateway ] |
227 | + - [ neutron-openvswitch, nova-compute ] |
228 | + - [ neutron-openvswitch, rabbitmq-server ] |
229 | +openstack-services-legacy: |
230 | + inherits: base-services |
231 | + services: |
232 | + mysql: |
233 | + branch: lp:charms/trusty/mysql |
234 | + constraints: mem=2G |
235 | + options: |
236 | + dataset-size: 50% |
237 | + max-connections: 20000 |
238 | +openstack-services: |
239 | + inherits: base-services |
240 | + services: |
241 | + mysql: |
242 | + branch: https://github.com/openstack/charm-percona-cluster |
243 | + constraints: mem=4G |
244 | + options: |
245 | + dataset-size: 50% |
246 | + max-connections: 20000 |
247 | + root-password: ChangeMe123 |
248 | + sst-password: ChangeMe123 |
249 | +# liberty |
250 | wily-liberty: |
251 | - inherits: openstack-icehouse |
252 | + inherits: openstack-services |
253 | series: wily |
254 | wily-liberty-proposed: |
255 | inherits: wily-liberty |
256 | overrides: |
257 | source: proposed |
258 | openstack-origin: distro-proposed |
259 | -# Mitaka |
260 | +# mitaka |
261 | xenial-mitaka: |
262 | - inherits: openstack-icehouse |
263 | + inherits: openstack-services |
264 | series: xenial |
265 | xenial-mitaka-proposed: |
266 | inherits: xenial-mitaka |
267 | overrides: |
268 | source: proposed |
269 | openstack-origin: distro-proposed |
270 | +# newton |
271 | +xenial-newton: |
272 | + inherits: openstack-services |
273 | + series: xenial |
274 | + overrides: |
275 | + openstack-origin: cloud:xenial-newton |
276 | + source: cloud:xenial-newton |
277 | +xenial-newton-proposed: |
278 | + inherits: xenial-newton |
279 | + overrides: |
280 | + openstack-origin: cloud:xenial-newton/proposed |
281 | + source: cloud:xenial-newton/proposed |
282 | +xenial-newton-staging: |
283 | + inherits: xenial-newton |
284 | + overrides: |
285 | + openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
286 | + source: ppa:ubuntu-cloud-archive/newton-staging |
287 | +xenial-newton-branch: |
288 | + inherits: xenial-newton |
289 | + overrides: |
290 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
291 | + source: ppa:openstack-ubuntu-testing/newton |
292 | +yakkety-newton: |
293 | + inherits: openstack-services |
294 | + series: yakkety |
295 | +yakkety-newton-proposed: |
296 | + inherits: yakkety-newton |
297 | + overrides: |
298 | + source: proposed |
299 | + openstack-origin: distro-proposed |
300 | +yakkety-newton-branch: |
301 | + inherits: yakkety-newton |
302 | + overrides: |
303 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
304 | + source: ppa:openstack-ubuntu-testing/newton |
305 | |
306 | === modified file 'bundles/lxd/source/default.yaml' |
307 | --- bundles/lxd/source/default.yaml 2016-06-04 22:55:27 +0000 |
308 | +++ bundles/lxd/source/default.yaml 2016-06-24 18:55:07 +0000 |
309 | @@ -201,3 +201,44 @@ |
310 | overrides: |
311 | source: proposed |
312 | openstack-origin: distro-proposed |
313 | +# newton |
314 | +openstack-newton-git: |
315 | + inherits: openstack-icehouse |
316 | + services: |
317 | + nova-compute: |
318 | + options: |
319 | + openstack-origin-git: include-file://nova-master.yaml |
320 | +xenial-newton: |
321 | + inherits: openstack-newton-git |
322 | + series: xenial |
323 | + overrides: |
324 | + openstack-origin: cloud:xenial-newton |
325 | + source: cloud:xenial-newton |
326 | +xenial-newton-proposed: |
327 | + inherits: xenial-newton |
328 | + overrides: |
329 | + openstack-origin: cloud:xenial-newton/proposed |
330 | + source: cloud:xenial-newton/proposed |
331 | +xenial-newton-staging: |
332 | + inherits: xenial-newton |
333 | + overrides: |
334 | + openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
335 | + source: ppa:ubuntu-cloud-archive/newton-staging |
336 | +xenial-newton-branch: |
337 | + inherits: xenial-newton |
338 | + overrides: |
339 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
340 | + source: ppa:openstack-ubuntu-testing/newton |
341 | +yakkety-newton: |
342 | + inherits: openstack-newton-git |
343 | + series: yakkety |
344 | +yakkety-newton-proposed: |
345 | + inherits: yakkety-newton |
346 | + overrides: |
347 | + source: proposed |
348 | + openstack-origin: distro-proposed |
349 | +yakkety-newton-branch: |
350 | + inherits: yakkety-newton |
351 | + overrides: |
352 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
353 | + source: ppa:openstack-ubuntu-testing/newton |
354 | |
355 | === modified file 'bundles/lxd/source/next.yaml' |
356 | --- bundles/lxd/source/next.yaml 2016-06-04 22:55:27 +0000 |
357 | +++ bundles/lxd/source/next.yaml 2016-06-24 18:55:07 +0000 |
358 | @@ -201,3 +201,44 @@ |
359 | overrides: |
360 | source: proposed |
361 | openstack-origin: distro-proposed |
362 | +# newton |
363 | +openstack-newton-git: |
364 | + inherits: openstack-icehouse |
365 | + services: |
366 | + nova-compute: |
367 | + options: |
368 | + openstack-origin-git: include-file://nova-master.yaml |
369 | +xenial-newton: |
370 | + inherits: openstack-newton-git |
371 | + series: xenial |
372 | + overrides: |
373 | + openstack-origin: cloud:xenial-newton |
374 | + source: cloud:xenial-newton |
375 | +xenial-newton-proposed: |
376 | + inherits: xenial-newton |
377 | + overrides: |
378 | + openstack-origin: cloud:xenial-newton/proposed |
379 | + source: cloud:xenial-newton/proposed |
380 | +xenial-newton-staging: |
381 | + inherits: xenial-newton |
382 | + overrides: |
383 | + openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
384 | + source: ppa:ubuntu-cloud-archive/newton-staging |
385 | +xenial-newton-branch: |
386 | + inherits: xenial-newton |
387 | + overrides: |
388 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
389 | + source: ppa:openstack-ubuntu-testing/newton |
390 | +yakkety-newton: |
391 | + inherits: openstack-newton-git |
392 | + series: yakkety |
393 | +yakkety-newton-proposed: |
394 | + inherits: yakkety-newton |
395 | + overrides: |
396 | + source: proposed |
397 | + openstack-origin: distro-proposed |
398 | +yakkety-newton-branch: |
399 | + inherits: yakkety-newton |
400 | + overrides: |
401 | + openstack-origin: ppa:openstack-ubuntu-testing/newton |
402 | + source: ppa:openstack-ubuntu-testing/newton |
403 | |
404 | === modified file 'bundles/lxd/source/nova-master.yaml' |
405 | --- bundles/lxd/source/nova-master.yaml 2016-06-04 22:55:27 +0000 |
406 | +++ bundles/lxd/source/nova-master.yaml 2016-06-24 18:55:07 +0000 |
407 | @@ -1,12 +1,12 @@ |
408 | repositories: |
409 | - {name: requirements, |
410 | - repository: 'git://github.com/zulcss/requirements', |
411 | + repository: 'git://github.com/openstack/requirements', |
412 | branch: master} |
413 | - {name: pylxd, |
414 | repository: 'https://github.com/lxc/pylxd', |
415 | branch: master} |
416 | - {name: nova-compute-lxd, |
417 | - repository: 'https://github.com/lxc/nova-lxd', |
418 | + repository: 'https://github.com/openstack/nova-lxd', |
419 | branch: master} |
420 | - {name: nova, |
421 | repository: 'git://github.com/openstack/nova', |
422 | |
423 | === modified file 'bundles/lxd/source/nova-mitaka.yaml' |
424 | --- bundles/lxd/source/nova-mitaka.yaml 2016-06-04 22:55:27 +0000 |
425 | +++ bundles/lxd/source/nova-mitaka.yaml 2016-06-24 18:55:07 +0000 |
426 | @@ -6,7 +6,7 @@ |
427 | repository: 'https://github.com/lxc/pylxd', |
428 | branch: master} |
429 | - {name: nova-compute-lxd, |
430 | - repository: 'https://github.com/lxc/nova-lxd', |
431 | + repository: 'https://github.com/openstack/nova-lxd', |
432 | branch: stable/mitaka} |
433 | - {name: nova, |
434 | repository: 'git://github.com/openstack/nova', |