Merge lp:~zulcss/openstack-charm-testing/lxd-updates into lp:openstack-charm-testing
- lxd-updates
- Merge into trunk
Proposed by
Chuck Short
Status: | Merged |
---|---|
Merged at revision: | 189 |
Proposed branch: | lp:~zulcss/openstack-charm-testing/lxd-updates |
Merge into: | lp:openstack-charm-testing |
Diff against target: |
1353 lines (+285/-843) 26 files modified
bundles/lxd/default.yaml (+1/-1) bundles/lxd/glance-kilo.yaml (+0/-10) bundles/lxd/glance-liberty.yaml (+0/-10) bundles/lxd/glance-master.yaml (+0/-10) bundles/lxd/horizon-kilo.yaml (+0/-10) bundles/lxd/horizon-liberty.yaml (+0/-10) bundles/lxd/horizon-master.yaml (+0/-10) bundles/lxd/keystone-kilo.yaml (+0/-10) bundles/lxd/keystone-liberty.yaml (+0/-10) bundles/lxd/keystone-master.yaml (+0/-10) bundles/lxd/neutron-kilo.yaml (+0/-19) bundles/lxd/neutron-liberty.yaml (+0/-19) bundles/lxd/neutron-master.yaml (+0/-19) bundles/lxd/nova-kilo.yaml (+0/-13) bundles/lxd/nova-master.yaml (+0/-21) bundles/lxd/source/README (+11/-0) bundles/lxd/source/cinder-master.yaml (+0/-10) bundles/lxd/source/default.yaml (+185/-0) bundles/lxd/source/glance-master.yaml (+0/-10) bundles/lxd/source/horizon-master.yaml (+0/-10) bundles/lxd/source/keystone-master.yaml (+0/-10) bundles/lxd/source/lxd.yaml (+0/-367) bundles/lxd/source/neutron-master.yaml (+0/-19) bundles/lxd/source/next.yaml (+78/-225) bundles/lxd/source/nova-liberty.yaml (+8/-5) bundles/lxd/source/nova-master.yaml (+2/-5) |
To merge this branch: | bzr merge lp:~zulcss/openstack-charm-testing/lxd-updates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
Review via email: mp+289803@code.launchpad.net |
Commit message
Description of the change
This branch is a re-work of the LXD qa branch that was created before I went on vacation. It is a clean branch of all the changes that were made.
To post a comment you must log in.
- 194. By Chuck Short
-
Clean up DFS
- 195. By Chuck Short
-
Update git branch
- 196. By Chuck Short
-
Update git branch
- 197. By Chuck Short
-
Fix liberty deploy from source
- 198. By Chuck Short
-
update charms
Revision history for this message
Ryan Beisner (1chb1n) wrote : | # |
One typo, see inline.
- 199. By Chuck Short
-
Add more targets
- 200. By Chuck Short
-
Fix typo
- 201. By Chuck Short
-
More syncs
- 202. By Chuck Short
-
More sync
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-03-22 17:02:55 +0000 |
3 | +++ bundles/lxd/default.yaml 2016-03-29 17:26:34 +0000 |
4 | @@ -85,7 +85,7 @@ |
5 | branch: lp:charms/trusty/mongodb |
6 | constraints: mem=1G |
7 | lxd: |
8 | - branch: lp:~openstack-charmers-next/charms/trusty/lxd/trunk |
9 | + branch: https://github.com/openstack/charm-lxd |
10 | options: |
11 | block-device: /dev/vdb |
12 | ephemeral-unmount: /mnt |
13 | |
14 | === removed file 'bundles/lxd/glance-kilo.yaml' |
15 | --- bundles/lxd/glance-kilo.yaml 2016-02-19 16:49:21 +0000 |
16 | +++ bundles/lxd/glance-kilo.yaml 1970-01-01 00:00:00 +0000 |
17 | @@ -1,10 +0,0 @@ |
18 | -repositories: |
19 | - - {name: requirements, |
20 | - repository: 'git://github.com/openstack/requirements', |
21 | - branch: stable/kilo} |
22 | - - {name: glance, |
23 | - repository: 'git://github.com/openstack/glance', |
24 | - branch: stable/kilo} |
25 | -directory: /mnt/openstack-git |
26 | -http_proxy: http://squid.internal:3128 |
27 | -https_proxy: http://squid.internal:3128 |
28 | |
29 | === removed file 'bundles/lxd/glance-liberty.yaml' |
30 | --- bundles/lxd/glance-liberty.yaml 2016-02-19 16:49:21 +0000 |
31 | +++ bundles/lxd/glance-liberty.yaml 1970-01-01 00:00:00 +0000 |
32 | @@ -1,10 +0,0 @@ |
33 | -repositories: |
34 | - - {name: requirements, |
35 | - repository: 'git://github.com/openstack/requirements', |
36 | - branch: stable/liberty} |
37 | - - {name: glance, |
38 | - repository: 'git://github.com/openstack/glance', |
39 | - branch: stable/liberty} |
40 | -directory: /mnt/openstack-git |
41 | -http_proxy: http://squid.internal:3128 |
42 | -https_proxy: http://squid.internal:3128 |
43 | |
44 | === removed file 'bundles/lxd/glance-master.yaml' |
45 | --- bundles/lxd/glance-master.yaml 2016-02-19 16:49:21 +0000 |
46 | +++ bundles/lxd/glance-master.yaml 1970-01-01 00:00:00 +0000 |
47 | @@ -1,10 +0,0 @@ |
48 | -repositories: |
49 | - - {name: requirements, |
50 | - repository: 'git://github.com/zulcss/requirements', |
51 | - branch: master} |
52 | - - {name: glance, |
53 | - repository: 'git://github.com/openstack/glance', |
54 | - branch: 12.0.0.0b2} |
55 | -directory: /mnt/openstack-git |
56 | -http_proxy: http://squid.internal:3128 |
57 | -https_proxy: http://squid.internal:3128 |
58 | |
59 | === removed file 'bundles/lxd/horizon-kilo.yaml' |
60 | --- bundles/lxd/horizon-kilo.yaml 2016-02-19 16:49:21 +0000 |
61 | +++ bundles/lxd/horizon-kilo.yaml 1970-01-01 00:00:00 +0000 |
62 | @@ -1,10 +0,0 @@ |
63 | -repositories: |
64 | - - {name: requirements, |
65 | - repository: 'git://github.com/openstack/requirements', |
66 | - branch: stable/kilo} |
67 | - - {name: horizon, |
68 | - repository: 'git://github.com/openstack/horizon', |
69 | - branch: stable/kilo} |
70 | -directory: /mnt/openstack-git |
71 | -http_proxy: http://squid.internal:3128 |
72 | -https_proxy: http://squid.internal:3128 |
73 | |
74 | === removed file 'bundles/lxd/horizon-liberty.yaml' |
75 | --- bundles/lxd/horizon-liberty.yaml 2016-02-19 16:49:21 +0000 |
76 | +++ bundles/lxd/horizon-liberty.yaml 1970-01-01 00:00:00 +0000 |
77 | @@ -1,10 +0,0 @@ |
78 | -repositories: |
79 | - - {name: requirements, |
80 | - repository: 'git://github.com/openstack/requirements', |
81 | - branch: stable/liberty} |
82 | - - {name: horizon, |
83 | - repository: 'git://github.com/openstack/horizon', |
84 | - branch: stable/liberty} |
85 | -directory: /mnt/openstack-git |
86 | -http_proxy: http://squid.internal:3128 |
87 | -https_proxy: http://squid.internal:3128 |
88 | |
89 | === removed file 'bundles/lxd/horizon-master.yaml' |
90 | --- bundles/lxd/horizon-master.yaml 2016-02-19 16:49:21 +0000 |
91 | +++ bundles/lxd/horizon-master.yaml 1970-01-01 00:00:00 +0000 |
92 | @@ -1,10 +0,0 @@ |
93 | -repositories: |
94 | - - {name: requirements, |
95 | - repository: 'git://github.com/zulcss/requirements', |
96 | - branch: master} |
97 | - - {name: horizon, |
98 | - repository: 'git://github.com/openstack/horizon', |
99 | - branch: 9.0.0.0b2} |
100 | -directory: /mnt/openstack-git |
101 | -http_proxy: http://squid.internal:3128 |
102 | -https_proxy: http://squid.internal:3128 |
103 | |
104 | === removed file 'bundles/lxd/keystone-kilo.yaml' |
105 | --- bundles/lxd/keystone-kilo.yaml 2016-02-19 16:49:21 +0000 |
106 | +++ bundles/lxd/keystone-kilo.yaml 1970-01-01 00:00:00 +0000 |
107 | @@ -1,10 +0,0 @@ |
108 | -repositories: |
109 | - - {name: requirements, |
110 | - repository: 'git://github.com/openstack/requirements', |
111 | - branch: stable/kilo} |
112 | - - {name: keystone, |
113 | - repository: 'git://github.com/openstack/keystone', |
114 | - branch: stable/kilo} |
115 | -directory: /mnt/openstack-git |
116 | -http_proxy: http://squid.internal:3128 |
117 | -https_proxy: http://squid.internal:3128 |
118 | |
119 | === removed file 'bundles/lxd/keystone-liberty.yaml' |
120 | --- bundles/lxd/keystone-liberty.yaml 2016-02-19 16:49:21 +0000 |
121 | +++ bundles/lxd/keystone-liberty.yaml 1970-01-01 00:00:00 +0000 |
122 | @@ -1,10 +0,0 @@ |
123 | -repositories: |
124 | - - {name: requirements, |
125 | - repository: 'git://github.com/openstack/requirements', |
126 | - branch: stable/liberty} |
127 | - - {name: keystone, |
128 | - repository: 'git://github.com/openstack/keystone', |
129 | - branch: stable/liberty} |
130 | -directory: /mnt/openstack-git |
131 | -http_proxy: http://squid.internal:3128 |
132 | -https_proxy: http://squid.internal:3128 |
133 | |
134 | === removed file 'bundles/lxd/keystone-master.yaml' |
135 | --- bundles/lxd/keystone-master.yaml 2016-02-19 16:49:21 +0000 |
136 | +++ bundles/lxd/keystone-master.yaml 1970-01-01 00:00:00 +0000 |
137 | @@ -1,10 +0,0 @@ |
138 | -repositories: |
139 | - - {name: requirements, |
140 | - repository: 'git://github.com/zulcss/requirements', |
141 | - branch: master} |
142 | - - {name: keystone, |
143 | - repository: 'git://github.com/openstack/keystone', |
144 | - branch: 9.0.0.0b2} |
145 | -directory: /mnt/openstack-git |
146 | -http_proxy: http://squid.internal:3128 |
147 | -https_proxy: http://squid.internal:3128 |
148 | |
149 | === removed file 'bundles/lxd/neutron-kilo.yaml' |
150 | --- bundles/lxd/neutron-kilo.yaml 2016-02-19 16:49:21 +0000 |
151 | +++ bundles/lxd/neutron-kilo.yaml 1970-01-01 00:00:00 +0000 |
152 | @@ -1,19 +0,0 @@ |
153 | -repositories: |
154 | - - {name: requirements, |
155 | - repository: 'git://github.com/openstack/requirements', |
156 | - branch: stable/kilo} |
157 | - - {name: neutron-fwaas, |
158 | - repository: 'git://github.com/openstack/neutron-fwaas', |
159 | - branch: stable/kilo} |
160 | - - {name: neutron-lbaas, |
161 | - repository: 'git://github.com/openstack/neutron-lbaas', |
162 | - branch: stable/kilo} |
163 | - - {name: neutron-vpnaas, |
164 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
165 | - branch: stable/kilo} |
166 | - - {name: neutron, |
167 | - repository: 'git://github.com/openstack/neutron', |
168 | - branch: stable/kilo} |
169 | -directory: /mnt/openstack-git |
170 | -http_proxy: http://squid.internal:3128 |
171 | -https_proxy: http://squid.internal:3128 |
172 | |
173 | === removed file 'bundles/lxd/neutron-liberty.yaml' |
174 | --- bundles/lxd/neutron-liberty.yaml 2016-02-19 16:49:21 +0000 |
175 | +++ bundles/lxd/neutron-liberty.yaml 1970-01-01 00:00:00 +0000 |
176 | @@ -1,19 +0,0 @@ |
177 | -repositories: |
178 | - - {name: requirements, |
179 | - repository: 'git://github.com/openstack/requirements', |
180 | - branch: stable/liberty} |
181 | - - {name: neutron-fwaas, |
182 | - repository: 'git://github.com/openstack/neutron-fwaas', |
183 | - branch: stable/liberty} |
184 | - - {name: neutron-lbaas, |
185 | - repository: 'git://github.com/openstack/neutron-lbaas', |
186 | - branch: stable/liberty} |
187 | - - {name: neutron-vpnaas, |
188 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
189 | - branch: stable/liberty} |
190 | - - {name: neutron, |
191 | - repository: 'git://github.com/openstack/neutron', |
192 | - branch: stable/liberty} |
193 | -directory: /mnt/openstack-git |
194 | -http_proxy: http://squid.internal:3128 |
195 | -https_proxy: http://squid.internal:3128 |
196 | |
197 | === removed file 'bundles/lxd/neutron-master.yaml' |
198 | --- bundles/lxd/neutron-master.yaml 2016-02-19 16:49:21 +0000 |
199 | +++ bundles/lxd/neutron-master.yaml 1970-01-01 00:00:00 +0000 |
200 | @@ -1,19 +0,0 @@ |
201 | -repositories: |
202 | - - {name: requirements, |
203 | - repository: 'git://github.com/zulcss/requirements', |
204 | - branch: master} |
205 | - - {name: neutron-fwaas, |
206 | - repository: 'git://github.com/openstack/neutron-fwaas', |
207 | - branch: 8.0.0.0b2} |
208 | - - {name: neutron-lbaas, |
209 | - repository: 'git://github.com/openstack/neutron-lbaas', |
210 | - branch: 8.0.0.0b2} |
211 | - - {name: neutron-vpnaas, |
212 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
213 | - branch: 8.0.0.0b2} |
214 | - - {name: neutron, |
215 | - repository: 'git://github.com/openstack/neutron', |
216 | - branch: 8.0.0.0b2} |
217 | -directory: /mnt/openstack-git |
218 | -http_proxy: http://squid.internal:3128 |
219 | -https_proxy: http://squid.internal:3128 |
220 | |
221 | === removed file 'bundles/lxd/nova-kilo.yaml' |
222 | --- bundles/lxd/nova-kilo.yaml 2016-02-19 16:49:21 +0000 |
223 | +++ bundles/lxd/nova-kilo.yaml 1970-01-01 00:00:00 +0000 |
224 | @@ -1,13 +0,0 @@ |
225 | -repositories: |
226 | - - {name: requirements, |
227 | - repository: 'git://github.com/openstack/requirements', |
228 | - branch: stable/kilo} |
229 | - - {name: neutron, |
230 | - repository: 'git://github.com/openstack/neutron', |
231 | - branch: stable/kilo} |
232 | - - {name: nova, |
233 | - repository: 'git://github.com/openstack/nova', |
234 | - branch: stable/kilo} |
235 | -directory: /mnt/openstack-git |
236 | -http_proxy: http://squid.internal:3128 |
237 | -https_proxy: http://squid.internal:3128 |
238 | |
239 | === removed file 'bundles/lxd/nova-master.yaml' |
240 | --- bundles/lxd/nova-master.yaml 2016-02-19 16:49:21 +0000 |
241 | +++ bundles/lxd/nova-master.yaml 1970-01-01 00:00:00 +0000 |
242 | @@ -1,21 +0,0 @@ |
243 | -# Update this file to point to master when Xenial |
244 | -# is available |
245 | -repositories: |
246 | - - {name: requirements, |
247 | - repository: 'git://github.com/zulcss/requirements', |
248 | - branch: master} |
249 | - - {name: neutron, |
250 | - repository: 'git://github.com/openstack/neutron', |
251 | - branch: 8.0.0.0b2} |
252 | - - {name: nova-lxd, |
253 | - repository: 'git://github.com/lxc/nova-lxd', |
254 | - branch: master} |
255 | - - {name: pylxd, |
256 | - repository: 'git://github.com/lxc/pylxd', |
257 | - branch: master} |
258 | - - {name: nova, |
259 | - repository: 'git://github.com/openstack/nova', |
260 | - branch: 13.0.0.0b2} |
261 | -directory: /mnt/openstack-git |
262 | -http_proxy: http://squid.internal:3128 |
263 | -https_proxy: http://squid.internal:3128 |
264 | |
265 | === added file 'bundles/lxd/source/README' |
266 | --- bundles/lxd/source/README 1970-01-01 00:00:00 +0000 |
267 | +++ bundles/lxd/source/README 2016-03-29 17:26:34 +0000 |
268 | @@ -0,0 +1,11 @@ |
269 | +bundles/lxd/qa |
270 | +============== |
271 | + |
272 | +The following bundle are meant to be consumed by UOSCI |
273 | +in automated git deployment testing. They are working |
274 | +bundles, updated throughout the dev cycle. |
275 | + |
276 | +== Branches == |
277 | + |
278 | +To test your branch, replace the master branch with |
279 | +the branch that you want to test in the nova-master.yaml. |
280 | |
281 | === removed file 'bundles/lxd/source/cinder-master.yaml' |
282 | --- bundles/lxd/source/cinder-master.yaml 2015-07-23 20:48:46 +0000 |
283 | +++ bundles/lxd/source/cinder-master.yaml 1970-01-01 00:00:00 +0000 |
284 | @@ -1,10 +0,0 @@ |
285 | -repositories: |
286 | - - {name: requirements, |
287 | - repository: 'git://github.com/openstack/requirements', |
288 | - branch: master} |
289 | - - {name: cinder, |
290 | - repository: 'git://github.com/openstack/cinder', |
291 | - branch: master} |
292 | -directory: /mnt/openstack-git |
293 | -http_proxy: http://squid.internal:3128 |
294 | -https_proxy: http://squid.internal:3128 |
295 | |
296 | === added file 'bundles/lxd/source/default.yaml' |
297 | --- bundles/lxd/source/default.yaml 1970-01-01 00:00:00 +0000 |
298 | +++ bundles/lxd/source/default.yaml 2016-03-29 17:26:34 +0000 |
299 | @@ -0,0 +1,185 @@ |
300 | +# vim: set ts=2 et: |
301 | +# deployer bundle for development ('next') charms |
302 | +# UOSCI relies on this for OS-on-OS deployment testing |
303 | +openstack-services: |
304 | + services: |
305 | + mysql: |
306 | + branch: lp:charms/trusty/mysql |
307 | + #https://github.com/openstack/charm-percona-cluster |
308 | + constraints: mem=1G |
309 | + options: |
310 | + dataset-size: 50% |
311 | + max-connections: 20000 |
312 | + rabbitmq-server: |
313 | + branch: https://github.com/openstack/charm-rabbitmq-server;stable |
314 | + constraints: mem=1G |
315 | + keystone: |
316 | + branch: https://github.com/openstack/charm-keystone;stable |
317 | + constraints: mem=1G |
318 | + options: |
319 | + admin-password: openstack |
320 | + admin-token: ubuntutesting |
321 | + openstack-dashboard: |
322 | + branch: https://github.com/openstack/charm-openstack-dashboard;stable |
323 | + constraints: mem=1G |
324 | + nova-compute: |
325 | + branch: https://github.com/openstack/charm-nova-compute;stable |
326 | + num_units: 3 |
327 | + constraints: mem=4G |
328 | + options: |
329 | + enable-live-migration: True |
330 | + enable-resize: True |
331 | + migration-auth-type: ssh |
332 | + virt-type: lxd |
333 | + nova-cloud-controller: |
334 | + branch: https://github.com/openstack/charm-nova-cloud-controller;stable |
335 | + constraints: mem=1G |
336 | + options: |
337 | + network-manager: Neutron |
338 | + quantum-security-groups: "yes" |
339 | + ram-allocation-ratio: 5.0 |
340 | + neutron-gateway: |
341 | + branch: https://github.com/openstack/charm-neutron-gateway;stable |
342 | + constraints: mem=1G |
343 | + options: |
344 | + instance-mtu: 1300 |
345 | + glance: |
346 | + branch: https://github.com/openstack/charm-glance;stable |
347 | + constraints: mem=1G |
348 | + swift-proxy: |
349 | + branch: https://github.com/openstack/charm-swift-proxy;stable |
350 | + constraints: mem=1G |
351 | + options: |
352 | + zone-assignment: manual |
353 | + replicas: 3 |
354 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
355 | + swift-storage-z1: |
356 | + branch: https://github.com/openstack/charm-swift-storage;stable |
357 | + constraints: mem=1G |
358 | + options: |
359 | + zone: 1 |
360 | + block-device: vdb |
361 | + overwrite: "true" |
362 | + swift-storage-z2: |
363 | + branch: https://github.com/openstack/charm-swift-storage;stable |
364 | + constraints: mem=1G |
365 | + options: |
366 | + zone: 2 |
367 | + block-device: vdb |
368 | + overwrite: "true" |
369 | + swift-storage-z3: |
370 | + branch: https://github.com/openstack/charm-swift-storage;stable |
371 | + constraints: mem=1G |
372 | + options: |
373 | + zone: 3 |
374 | + block-device: vdb |
375 | + overwrite: "true" |
376 | + ceilometer: |
377 | + branch: https://github.com/openstack/charm-ceilometer;stable |
378 | + constraints: mem=1G |
379 | + ceilometer-agent: |
380 | + branch: https://github.com/openstack/charm-ceilometer-agent;stable |
381 | + heat: |
382 | + branch: https://github.com/openstack/charm-heat;stable |
383 | + mongodb: |
384 | + branch: lp:charms/trusty/mongodb;stable |
385 | + constraints: mem=1G |
386 | + lxd: |
387 | + branch: https://github.com/openstack/charm-lxd |
388 | + options: |
389 | + block-device: /dev/vdb |
390 | + ephemeral-unmount: /mnt |
391 | + storage-type: lvm |
392 | + relations: |
393 | + - [ keystone, mysql ] |
394 | + - [ nova-cloud-controller, mysql ] |
395 | + - [ nova-cloud-controller, rabbitmq-server ] |
396 | + - [ nova-cloud-controller, glance ] |
397 | + - [ nova-cloud-controller, keystone ] |
398 | + - [ nova-compute, nova-cloud-controller ] |
399 | + - [ nova-compute, lxd ] |
400 | + - [ nova-compute, mysql ] |
401 | + - - nova-compute |
402 | + - rabbitmq-server:amqp |
403 | + - [ nova-compute, glance ] |
404 | + - [ glance, mysql ] |
405 | + - [ glance, keystone ] |
406 | + - [ glance, rabbitmq-server ] |
407 | + - [ glance, swift-proxy ] |
408 | + - [ neutron-gateway, nova-cloud-controller ] |
409 | + - [ openstack-dashboard, keystone ] |
410 | + - [ swift-proxy, keystone ] |
411 | + - [ swift-proxy, swift-storage-z1 ] |
412 | + - [ swift-proxy, swift-storage-z2 ] |
413 | + - [ swift-proxy, swift-storage-z3 ] |
414 | + - - ceilometer |
415 | + - keystone:identity-service |
416 | + - [ ceilometer, rabbitmq-server ] |
417 | + - [ ceilometer, mongodb ] |
418 | + - [ ceilometer-agent, nova-compute ] |
419 | + - [ ceilometer-agent, ceilometer ] |
420 | + - [ heat, mysql ] |
421 | + - [ heat, keystone ] |
422 | + - [ heat, rabbitmq-server ] |
423 | +openstack-singlerabbit: |
424 | + inherits: openstack-services |
425 | + relations: |
426 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
427 | +openstack-icehouse: |
428 | + inherits: openstack-singlerabbit |
429 | + services: |
430 | + neutron-api: |
431 | + branch: https://github.com/openstack/charm-neutron-api;stable |
432 | + constraints: mem=1G |
433 | + options: |
434 | + neutron-security-groups: True |
435 | + neutron-openvswitch: |
436 | + branch: https://github.com/openstack/charm-neutron-openvswitch;stable |
437 | + relations: |
438 | + - [ neutron-api, mysql ] |
439 | + - [ neutron-api, rabbitmq-server ] |
440 | + - [ neutron-api, nova-cloud-controller ] |
441 | + - [ neutron-api, neutron-openvswitch ] |
442 | + - [ neutron-api, keystone ] |
443 | + - [ neutron-api, neutron-gateway ] |
444 | + - [ neutron-openvswitch, nova-compute ] |
445 | + - [ neutron-openvswitch, rabbitmq-server ] |
446 | +# liberty |
447 | +openstack-liberty-git: |
448 | + inherits: openstack-icehouse |
449 | + services: |
450 | + nova-compute: |
451 | + options: |
452 | + openstack-origin-git: include-file://nova-liberty.yaml |
453 | +wily-liberty: |
454 | + inherits: openstack-liberty-git |
455 | + series: wily |
456 | +wily-liberty-proposed: |
457 | + inherits: wily-liberty |
458 | + overrides: |
459 | + source: proposed |
460 | + openstack-origin: distro-proposed |
461 | +trusty-liberty: |
462 | + inherits: openstack-liberty-git |
463 | + series: trusty |
464 | + overrides: |
465 | + openstack-origin: cloud:trusty-liberty |
466 | + source: cloud:trusty-liberty |
467 | +# mitaka |
468 | +openstack-master-git: |
469 | + inherits: openstack-icehouse |
470 | + services: |
471 | + nova-compute: |
472 | + options: |
473 | + openstack-origin-git: include-file://nova-master.yaml |
474 | +xenial-mitaka: |
475 | + inherits: openstack-master-git |
476 | + series: xenial |
477 | + services: |
478 | + mysql: |
479 | + branch: lp:charms/trusty/mysql |
480 | +xenial-mitaka-proposed: |
481 | + inherits: xenial-mitaka |
482 | + overrides: |
483 | + source: proposed |
484 | + openstack-origin: distro-proposed |
485 | |
486 | === removed file 'bundles/lxd/source/glance-master.yaml' |
487 | --- bundles/lxd/source/glance-master.yaml 2015-07-23 20:48:46 +0000 |
488 | +++ bundles/lxd/source/glance-master.yaml 1970-01-01 00:00:00 +0000 |
489 | @@ -1,10 +0,0 @@ |
490 | -repositories: |
491 | - - {name: requirements, |
492 | - repository: 'git://github.com/openstack/requirements', |
493 | - branch: master} |
494 | - - {name: glance, |
495 | - repository: 'git://github.com/openstack/glance', |
496 | - branch: master} |
497 | -directory: /mnt/openstack-git |
498 | -http_proxy: http://squid.internal:3128 |
499 | -https_proxy: http://squid.internal:3128 |
500 | |
501 | === removed file 'bundles/lxd/source/horizon-master.yaml' |
502 | --- bundles/lxd/source/horizon-master.yaml 2015-07-23 20:48:46 +0000 |
503 | +++ bundles/lxd/source/horizon-master.yaml 1970-01-01 00:00:00 +0000 |
504 | @@ -1,10 +0,0 @@ |
505 | -repositories: |
506 | - - {name: requirements, |
507 | - repository: 'git://github.com/openstack/requirements', |
508 | - branch: master} |
509 | - - {name: horizon, |
510 | - repository: 'git://github.com/openstack/horizon', |
511 | - branch: master} |
512 | -directory: /mnt/openstack-git |
513 | -http_proxy: http://squid.internal:3128 |
514 | -https_proxy: http://squid.internal:3128 |
515 | |
516 | === removed file 'bundles/lxd/source/keystone-master.yaml' |
517 | --- bundles/lxd/source/keystone-master.yaml 2015-07-23 20:48:46 +0000 |
518 | +++ bundles/lxd/source/keystone-master.yaml 1970-01-01 00:00:00 +0000 |
519 | @@ -1,10 +0,0 @@ |
520 | -repositories: |
521 | - - {name: requirements, |
522 | - repository: 'git://github.com/openstack/requirements', |
523 | - branch: master} |
524 | - - {name: keystone, |
525 | - repository: 'git://github.com/openstack/keystone', |
526 | - branch: master} |
527 | -directory: /mnt/openstack-git |
528 | -http_proxy: http://squid.internal:3128 |
529 | -https_proxy: http://squid.internal:3128 |
530 | |
531 | === removed file 'bundles/lxd/source/lxd.yaml' |
532 | --- bundles/lxd/source/lxd.yaml 2016-03-11 09:33:21 +0000 |
533 | +++ bundles/lxd/source/lxd.yaml 1970-01-01 00:00:00 +0000 |
534 | @@ -1,367 +0,0 @@ |
535 | -# vim: set ts=2 et: |
536 | -# deployer bundle for development ('lxd') charms |
537 | -# UOSCI relies on this for OS-on-OS deployment testing |
538 | -openstack-services: |
539 | - services: |
540 | - mysql: |
541 | - branch: https://github.com/openstack/charm-percona-cluster |
542 | - constraints: mem=1G |
543 | - options: |
544 | - dataset-size: 50% |
545 | - max-connections: 20000 |
546 | - rabbitmq-server: |
547 | - branch: https://github.com/openstack/charm-rabbitmq-server |
548 | - constraints: mem=1G |
549 | - ceph: |
550 | - branch: https://github.com/openstack/charm-ceph |
551 | - num_units: 3 |
552 | - constraints: mem=1G |
553 | - options: |
554 | - monitor-count: 3 |
555 | - fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
556 | - monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
557 | - osd-devices: /dev/vdb |
558 | - osd-reformat: "yes" |
559 | - ephemeral-unmount: /mnt |
560 | - keystone: |
561 | - branch: https://github.com/openstack/charm-keystone |
562 | - constraints: mem=1G |
563 | - options: |
564 | - admin-password: openstack |
565 | - admin-token: ubuntutesting |
566 | - openstack-dashboard: |
567 | - branch: https://github.com/openstack/charm-openstack-dashboard |
568 | - constraints: mem=1G |
569 | - nova-compute: |
570 | - branch: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd |
571 | - num_units: 3 |
572 | - constraints: mem=4G |
573 | - options: |
574 | - enable-live-migration: True |
575 | - enable-resize: True |
576 | - virt-type: lxd |
577 | - nova-cloud-controller: |
578 | - branch: https://github.com/openstack/charm-nova-cloud-controller |
579 | - constraints: mem=1G |
580 | - options: |
581 | - network-manager: Neutron |
582 | - quantum-security-groups: "yes" |
583 | - neutron-gateway: |
584 | - branch: https://github.com/openstack/charm-neutron-gateway |
585 | - constraints: mem=1G |
586 | - options: |
587 | - instance-mtu: 1300 |
588 | - cinder: |
589 | - branch: https://github.com/openstack/charm-cinder |
590 | - options: |
591 | - block-device: "None" |
592 | - glance-api-version: 2 |
593 | - constraints: mem=1G |
594 | -# cinder-ceph: |
595 | -# branch: https://github.com/openstack/charm-cinder-ceph |
596 | - glance: |
597 | - branch: https://github.com/openstack/charm-glance |
598 | - constraints: mem=1G |
599 | - swift-proxy: |
600 | - branch: https://github.com/openstack/charm-swift-proxy |
601 | - constraints: mem=1G |
602 | - options: |
603 | - zone-assignment: manual |
604 | - replicas: 3 |
605 | - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
606 | - swift-storage-z1: |
607 | - branch: https://github.com/openstack/charm-swift-storage |
608 | - constraints: mem=1G |
609 | - options: |
610 | - zone: 1 |
611 | - block-device: vdb |
612 | - overwrite: "true" |
613 | - swift-storage-z2: |
614 | - branch: https://github.com/openstack/charm-swift-storage |
615 | - constraints: mem=1G |
616 | - options: |
617 | - zone: 2 |
618 | - block-device: vdb |
619 | - overwrite: "true" |
620 | - swift-storage-z3: |
621 | - branch: https://github.com/openstack/charm-swift-storage |
622 | - constraints: mem=1G |
623 | - options: |
624 | - zone: 3 |
625 | - block-device: vdb |
626 | - overwrite: "true" |
627 | - ceilometer: |
628 | - branch: https://github.com/openstack/charm-ceilometer |
629 | - constraints: mem=1G |
630 | - ceilometer-agent: |
631 | - branch: https://github.com/openstack/charm-ceilometer-agent |
632 | - heat: |
633 | - branch: https://github.com/openstack/charm-heat |
634 | - mongodb: |
635 | - branch: lp:charms/trusty/mongodb |
636 | - constraints: mem=1G |
637 | - lxd: |
638 | - branch: lp:~zulcss/+junk/lxd-container |
639 | - options: |
640 | - lxd-block-device: /mnt/disk.img|20G |
641 | - lxd-origin: ppa:ubuntu-lxc/lxd-git-master |
642 | - lxd-use-source: True |
643 | - lxd-trust-password: blah |
644 | - relations: |
645 | - - [ keystone, mysql ] |
646 | - - [ nova-cloud-controller, mysql ] |
647 | - - [ nova-cloud-controller, rabbitmq-server ] |
648 | - - [ nova-cloud-controller, glance ] |
649 | - - [ nova-cloud-controller, keystone ] |
650 | - - [ nova-compute, nova-cloud-controller ] |
651 | - - [ nova-compute, mysql ] |
652 | - - [ nova-compute, lxd ] |
653 | - - - nova-compute |
654 | - - rabbitmq-server:amqp |
655 | - - [ nova-compute, glance ] |
656 | - - [ nova-compute, ceph ] |
657 | - - [ glance, mysql ] |
658 | - - [ glance, keystone ] |
659 | - - [ glance, ceph ] |
660 | - - [ glance, cinder ] |
661 | - - [ cinder, mysql ] |
662 | - - [ cinder, rabbitmq-server ] |
663 | - - [ cinder, nova-cloud-controller ] |
664 | - - [ cinder, keystone ] |
665 | - - [ cinder, ceph ] |
666 | -# - [ cinder, cinder-ceph ] |
667 | -# - [ cinder-ceph, ceph ] |
668 | - - [ neutron-gateway, nova-cloud-controller ] |
669 | - - [ openstack-dashboard, keystone ] |
670 | - - [ swift-proxy, keystone ] |
671 | - - [ swift-proxy, swift-storage-z1 ] |
672 | - - [ swift-proxy, swift-storage-z2 ] |
673 | - - [ swift-proxy, swift-storage-z3 ] |
674 | - - - ceilometer |
675 | - - keystone:identity-service |
676 | - - [ ceilometer, rabbitmq-server ] |
677 | - - [ ceilometer, mongodb ] |
678 | - - [ ceilometer-agent, nova-compute ] |
679 | - - [ ceilometer-agent, ceilometer ] |
680 | - - [ heat, mysql ] |
681 | - - [ heat, keystone ] |
682 | - - [ heat, rabbitmq-server ] |
683 | -openstack-singlerabbit: |
684 | - inherits: openstack-services |
685 | - relations: |
686 | - - [ "neutron-gateway:amqp", rabbitmq-server ] |
687 | -openstack-icehouse: |
688 | - inherits: openstack-singlerabbit |
689 | - services: |
690 | - neutron-api: |
691 | - branch: https://github.com/openstack/charm-neutron-api |
692 | - constraints: mem=1G |
693 | - options: |
694 | - neutron-security-groups: True |
695 | - neutron-openvswitch: |
696 | - branch: https://github.com/openstack/charm-neutron-openvswitch |
697 | - relations: |
698 | - - [ neutron-api, mysql ] |
699 | - - [ neutron-api, rabbitmq-server ] |
700 | - - [ neutron-api, nova-cloud-controller ] |
701 | - - [ neutron-api, neutron-openvswitch ] |
702 | - - [ neutron-api, keystone ] |
703 | - - [ neutron-api, neutron-gateway ] |
704 | - - [ neutron-openvswitch, nova-compute ] |
705 | - - [ neutron-openvswitch, rabbitmq-server ] |
706 | -openstack-icehouse-msg-split: |
707 | - inherits: openstack-services |
708 | - services: |
709 | - neutron-api: |
710 | - branch: https://github.com/openstack/charm-neutron-api |
711 | - constraints: mem=1G |
712 | - options: |
713 | - neutron-security-groups: True |
714 | - neutron-openvswitch: |
715 | - branch: https://github.com/openstack/charm-neutron-openvswitch |
716 | - rabbitmq-server-neutron: |
717 | - branch: https://github.com/openstack/charm-rabbitmq-server;stable |
718 | - constraints: mem=1G |
719 | - relations: |
720 | - - [ neutron-api, mysql ] |
721 | - - [ neutron-api, rabbitmq-server-neutron ] |
722 | - - [ neutron-api, nova-cloud-controller ] |
723 | - - [ neutron-api, neutron-openvswitch ] |
724 | - - [ neutron-api, keystone ] |
725 | - - [ neutron-api, neutron-gateway ] |
726 | - - [ neutron-openvswitch, nova-compute ] |
727 | - - [ neutron-openvswitch, rabbitmq-server-neutron ] |
728 | - - [ "neutron-gateway:amqp-nova", rabbitmq-server ] |
729 | - - [ "neutron-gateway:amqp", rabbitmq-server-neutron ] |
730 | -# icehouse |
731 | -openstack-icehouse-git: |
732 | - inherits: openstack-icehouse |
733 | - services: |
734 | - keystone: |
735 | - options: |
736 | - openstack-origin-git: include-file://keystone-icehouse.yaml |
737 | - glance: |
738 | - options: |
739 | - openstack-origin-git: include-file://glance-icehouse.yaml |
740 | - cinder: |
741 | - options: |
742 | - openstack-origin-git: include-file://cinder-icehouse.yaml |
743 | - neutron-api: |
744 | - options: |
745 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
746 | - neutron-gateway: |
747 | - options: |
748 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
749 | - neutron-openvswitch: |
750 | - options: |
751 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
752 | - openstack-dashboard: |
753 | - options: |
754 | - openstack-origin-git: include-file://horizon-icehouse.yaml |
755 | - nova-compute: |
756 | - options: |
757 | - openstack-origin-git: include-file://nova-icehouse.yaml |
758 | - nova-cloud-controller: |
759 | - options: |
760 | - openstack-origin-git: include-file://nova-icehouse.yaml |
761 | -precise-icehouse: |
762 | - inherits: openstack-icehouse-git |
763 | - series: precise |
764 | - overrides: |
765 | - openstack-origin: cloud:precise-icehouse |
766 | - source: cloud:precise-icehouse |
767 | -trusty-icehouse: |
768 | - inherits: openstack-icehouse-git |
769 | - series: trusty |
770 | -# juno |
771 | -openstack-juno-git: |
772 | - inherits: openstack-icehouse |
773 | - services: |
774 | - keystone: |
775 | - options: |
776 | - openstack-origin-git: include-file://keystone-juno.yaml |
777 | - glance: |
778 | - options: |
779 | - openstack-origin-git: include-file://glance-juno.yaml |
780 | - cinder: |
781 | - options: |
782 | - openstack-origin-git: include-file://cinder-juno.yaml |
783 | - neutron-api: |
784 | - options: |
785 | - openstack-origin-git: include-file://neutron-juno.yaml |
786 | - neutron-gateway: |
787 | - options: |
788 | - openstack-origin-git: include-file://neutron-juno.yaml |
789 | - neutron-openvswitch: |
790 | - options: |
791 | - openstack-origin-git: include-file://neutron-juno.yaml |
792 | - openstack-dashboard: |
793 | - options: |
794 | - openstack-origin-git: include-file://horizon-juno.yaml |
795 | - nova-compute: |
796 | - options: |
797 | - openstack-origin-git: include-file://nova-juno.yaml |
798 | - nova-cloud-controller: |
799 | - options: |
800 | - openstack-origin-git: include-file://nova-juno.yaml |
801 | -trusty-juno: |
802 | - inherits: openstack-juno-git |
803 | - series: trusty |
804 | - overrides: |
805 | - openstack-origin: cloud:trusty-juno |
806 | - source: cloud:trusty-juno |
807 | -utopic-juno: |
808 | - inherits: openstack-juno-git |
809 | - series: utopic |
810 | -# kilo |
811 | -openstack-kilo-git: |
812 | - inherits: openstack-icehouse |
813 | - services: |
814 | - keystone: |
815 | - options: |
816 | - openstack-origin-git: include-file://keystone-kilo.yaml |
817 | - glance: |
818 | - options: |
819 | - openstack-origin-git: include-file://glance-kilo.yaml |
820 | - cinder: |
821 | - options: |
822 | - openstack-origin-git: include-file://cinder-kilo.yaml |
823 | - neutron-api: |
824 | - options: |
825 | - openstack-origin-git: include-file://neutron-kilo.yaml |
826 | - neutron-gateway: |
827 | - options: |
828 | - openstack-origin-git: include-file://neutron-kilo.yaml |
829 | - neutron-openvswitch: |
830 | - options: |
831 | - openstack-origin-git: include-file://neutron-kilo.yaml |
832 | - openstack-dashboard: |
833 | - options: |
834 | - openstack-origin-git: include-file://horizon-kilo.yaml |
835 | - nova-compute: |
836 | - options: |
837 | - openstack-origin-git: include-file://nova-kilo.yaml |
838 | - nova-cloud-controller: |
839 | - options: |
840 | - openstack-origin-git: include-file://nova-kilo.yaml |
841 | -trusty-kilo: |
842 | - inherits: openstack-kilo-git |
843 | - series: trusty |
844 | - overrides: |
845 | - openstack-origin: cloud:trusty-kilo |
846 | - source: cloud:trusty-kilo |
847 | -trusty-kilo-proposed: |
848 | - inherits: openstack-kilo-git |
849 | - series: trusty |
850 | - overrides: |
851 | - openstack-origin: cloud:trusty-kilo/proposed |
852 | - source: cloud:trusty-kilo/proposed |
853 | -vivid-kilo: |
854 | - inherits: openstack-kilo-git |
855 | - series: vivid |
856 | -# master |
857 | -openstack-master-git: |
858 | - inherits: openstack-icehouse |
859 | - services: |
860 | - keystone: |
861 | - options: |
862 | - openstack-origin-git: include-file://keystone-master.yaml |
863 | - glance: |
864 | - options: |
865 | - openstack-origin-git: include-file://glance-master.yaml |
866 | - cinder: |
867 | - options: |
868 | - openstack-origin-git: include-file://cinder-master.yaml |
869 | - neutron-api: |
870 | - options: |
871 | - openstack-origin-git: include-file://neutron-master.yaml |
872 | - neutron-gateway: |
873 | - options: |
874 | - openstack-origin-git: include-file://neutron-master.yaml |
875 | - neutron-openvswitch: |
876 | - options: |
877 | - openstack-origin-git: include-file://neutron-master.yaml |
878 | - openstack-dashboard: |
879 | - options: |
880 | - openstack-origin-git: include-file://horizon-master.yaml |
881 | - nova-compute: |
882 | - options: |
883 | - openstack-origin-git: include-file://nova-master.yaml |
884 | - nova-cloud-controller: |
885 | - options: |
886 | - openstack-origin-git: include-file://nova-master.yaml |
887 | -trusty-master: |
888 | - inherits: openstack-master-git |
889 | - series: trusty |
890 | - overrides: |
891 | - openstack-origin: cloud:trusty-kilo |
892 | - source: cloud:trusty-kilo |
893 | -trusty-master-proposed: |
894 | - inherits: openstack-master-git |
895 | - series: trusty |
896 | - overrides: |
897 | - openstack-origin: cloud:trusty-kilo/proposed |
898 | - source: cloud:trusty-kilo/proposed |
899 | -vivid-master: |
900 | - inherits: openstack-master-git |
901 | - series: vivid |
902 | |
903 | === removed file 'bundles/lxd/source/neutron-master.yaml' |
904 | --- bundles/lxd/source/neutron-master.yaml 2015-07-23 20:48:46 +0000 |
905 | +++ bundles/lxd/source/neutron-master.yaml 1970-01-01 00:00:00 +0000 |
906 | @@ -1,19 +0,0 @@ |
907 | -repositories: |
908 | - - {name: requirements, |
909 | - repository: 'git://github.com/openstack/requirements', |
910 | - branch: master} |
911 | - - {name: neutron-fwaas, |
912 | - repository: 'git://github.com/openstack/neutron-fwaas', |
913 | - branch: master} |
914 | - - {name: neutron-lbaas, |
915 | - repository: 'git://github.com/openstack/neutron-lbaas', |
916 | - branch: master} |
917 | - - {name: neutron-vpnaas, |
918 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
919 | - branch: master} |
920 | - - {name: neutron, |
921 | - repository: 'git://github.com/openstack/neutron', |
922 | - branch: master} |
923 | -directory: /mnt/openstack-git |
924 | -http_proxy: http://squid.internal:3128 |
925 | -https_proxy: http://squid.internal:3128 |
926 | |
927 | === renamed file 'bundles/lxd/lxd.yaml' => 'bundles/lxd/source/next.yaml' |
928 | --- bundles/lxd/lxd.yaml 2016-03-11 09:33:21 +0000 |
929 | +++ bundles/lxd/source/next.yaml 2016-03-29 17:26:34 +0000 |
930 | @@ -4,13 +4,12 @@ |
931 | openstack-services: |
932 | services: |
933 | mysql: |
934 | - branch: https://github.com/openstack/charm-percona-cluster |
935 | - constraints: mem=4G |
936 | + branch: lp:charms/trusty/mysql |
937 | + #https://github.com/openstack/charm-percona-cluster |
938 | + constraints: mem=1G |
939 | options: |
940 | dataset-size: 50% |
941 | max-connections: 20000 |
942 | -# root-password: changeme |
943 | -# sst-password: changeme |
944 | rabbitmq-server: |
945 | branch: https://github.com/openstack/charm-rabbitmq-server |
946 | constraints: mem=1G |
947 | @@ -25,7 +24,7 @@ |
948 | constraints: mem=1G |
949 | nova-compute: |
950 | branch: https://github.com/openstack/charm-nova-compute |
951 | - num_units: 1 |
952 | + num_units: 3 |
953 | constraints: mem=4G |
954 | options: |
955 | enable-live-migration: True |
956 | @@ -38,6 +37,7 @@ |
957 | options: |
958 | network-manager: Neutron |
959 | quantum-security-groups: "yes" |
960 | + ram-allocation-ratio: 5.0 |
961 | neutron-gateway: |
962 | branch: https://github.com/openstack/charm-neutron-gateway |
963 | constraints: mem=1G |
964 | @@ -46,12 +46,50 @@ |
965 | glance: |
966 | branch: https://github.com/openstack/charm-glance |
967 | constraints: mem=1G |
968 | + swift-proxy: |
969 | + branch: https://github.com/openstack/charm-swift-proxy |
970 | + constraints: mem=1G |
971 | + options: |
972 | + zone-assignment: manual |
973 | + replicas: 3 |
974 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
975 | + swift-storage-z1: |
976 | + branch: https://github.com/openstack/charm-swift-storage |
977 | + constraints: mem=1G |
978 | + options: |
979 | + zone: 1 |
980 | + block-device: vdb |
981 | + overwrite: "true" |
982 | + swift-storage-z2: |
983 | + branch: https://github.com/openstack/charm-swift-storage |
984 | + constraints: mem=1G |
985 | + options: |
986 | + zone: 2 |
987 | + block-device: vdb |
988 | + overwrite: "true" |
989 | + swift-storage-z3: |
990 | + branch: https://github.com/openstack/charm-swift-storage |
991 | + constraints: mem=1G |
992 | + options: |
993 | + zone: 3 |
994 | + block-device: vdb |
995 | + overwrite: "true" |
996 | + ceilometer: |
997 | + branch: https://github.com/openstack/charm-ceilometer |
998 | + constraints: mem=1G |
999 | + ceilometer-agent: |
1000 | + branch: https://github.com/openstack/charm-ceilometer-agent |
1001 | + heat: |
1002 | + branch: https://github.com/openstack/charm-heat |
1003 | + mongodb: |
1004 | + branch: lp:charms/trusty/mongodb |
1005 | + constraints: mem=1G |
1006 | lxd: |
1007 | - branch: lp:~zulcss/charms/trusty/lxd/lxd-2.0 |
1008 | + branch: https://github.com/openstack/charm-lxd |
1009 | options: |
1010 | - block-device: /mnt/disk.img|20G |
1011 | - storage-type: btrfs |
1012 | - lxd-origin: ppa:ubuntu-lxc/lxd-git-master |
1013 | + block-device: /dev/vdb |
1014 | + ephemeral-unmount: /mnt |
1015 | + storage-type: lvm |
1016 | relations: |
1017 | - [ keystone, mysql ] |
1018 | - [ nova-cloud-controller, mysql ] |
1019 | @@ -59,15 +97,30 @@ |
1020 | - [ nova-cloud-controller, glance ] |
1021 | - [ nova-cloud-controller, keystone ] |
1022 | - [ nova-compute, nova-cloud-controller ] |
1023 | + - [ nova-compute, lxd ] |
1024 | - [ nova-compute, mysql ] |
1025 | - - [ nova-compute, lxd ] |
1026 | - - nova-compute |
1027 | - rabbitmq-server:amqp |
1028 | - [ nova-compute, glance ] |
1029 | - [ glance, mysql ] |
1030 | - [ glance, keystone ] |
1031 | + - [ glance, rabbitmq-server ] |
1032 | + - [ glance, swift-proxy ] |
1033 | - [ neutron-gateway, nova-cloud-controller ] |
1034 | - [ openstack-dashboard, keystone ] |
1035 | + - [ swift-proxy, keystone ] |
1036 | + - [ swift-proxy, swift-storage-z1 ] |
1037 | + - [ swift-proxy, swift-storage-z2 ] |
1038 | + - [ swift-proxy, swift-storage-z3 ] |
1039 | + - - ceilometer |
1040 | + - keystone:identity-service |
1041 | + - [ ceilometer, rabbitmq-server ] |
1042 | + - [ ceilometer, mongodb ] |
1043 | + - [ ceilometer-agent, nova-compute ] |
1044 | + - [ ceilometer-agent, ceilometer ] |
1045 | + - [ heat, mysql ] |
1046 | + - [ heat, keystone ] |
1047 | + - [ heat, rabbitmq-server ] |
1048 | openstack-singlerabbit: |
1049 | inherits: openstack-services |
1050 | relations: |
1051 | @@ -91,242 +144,42 @@ |
1052 | - [ neutron-api, neutron-gateway ] |
1053 | - [ neutron-openvswitch, nova-compute ] |
1054 | - [ neutron-openvswitch, rabbitmq-server ] |
1055 | -openstack-icehouse-msg-split: |
1056 | - inherits: openstack-services |
1057 | - services: |
1058 | - neutron-api: |
1059 | - branch: https://github.com/openstack/charm-neutron-api |
1060 | - constraints: mem=1G |
1061 | - options: |
1062 | - neutron-security-groups: True |
1063 | - neutron-openvswitch: |
1064 | - branch: https://github.com/openstack/charm-neutron-openvswitch |
1065 | - rabbitmq-server-neutron: |
1066 | - branch: https://github.com/openstack/charm-rabbitmq-server;stable |
1067 | - constraints: mem=1G |
1068 | - relations: |
1069 | - - [ neutron-api, mysql ] |
1070 | - - [ neutron-api, rabbitmq-server-neutron ] |
1071 | - - [ neutron-api, nova-cloud-controller ] |
1072 | - - [ neutron-api, neutron-openvswitch ] |
1073 | - - [ neutron-api, keystone ] |
1074 | - - [ neutron-api, neutron-gateway ] |
1075 | - - [ neutron-openvswitch, nova-compute ] |
1076 | - - [ neutron-openvswitch, rabbitmq-server-neutron ] |
1077 | - - [ "neutron-gateway:amqp-nova", rabbitmq-server ] |
1078 | - - [ "neutron-gateway:amqp", rabbitmq-server-neutron ] |
1079 | -# icehouse |
1080 | -openstack-icehouse-git: |
1081 | - inherits: openstack-icehouse |
1082 | - services: |
1083 | - keystone: |
1084 | - options: |
1085 | - openstack-origin-git: include-file://keystone-icehouse.yaml |
1086 | - glance: |
1087 | - options: |
1088 | - openstack-origin-git: include-file://glance-icehouse.yaml |
1089 | - neutron-api: |
1090 | - options: |
1091 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
1092 | - neutron-gateway: |
1093 | - options: |
1094 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
1095 | - neutron-openvswitch: |
1096 | - options: |
1097 | - openstack-origin-git: include-file://neutron-icehouse.yaml |
1098 | - openstack-dashboard: |
1099 | - options: |
1100 | - openstack-origin-git: include-file://horizon-icehouse.yaml |
1101 | - nova-compute: |
1102 | - options: |
1103 | - openstack-origin-git: include-file://nova-icehouse.yaml |
1104 | - nova-cloud-controller: |
1105 | - options: |
1106 | - openstack-origin-git: include-file://nova-icehouse.yaml |
1107 | -precise-icehouse: |
1108 | - inherits: openstack-icehouse-git |
1109 | - series: precise |
1110 | - services: |
1111 | - mysql: |
1112 | - branch: lp:charms/trusty/mysql |
1113 | - overrides: |
1114 | - openstack-origin: cloud:precise-icehouse |
1115 | - source: cloud:precise-icehouse |
1116 | -trusty-icehouse: |
1117 | - inherits: openstack-icehouse-git |
1118 | - series: trusty |
1119 | -# juno |
1120 | -openstack-juno-git: |
1121 | - inherits: openstack-icehouse |
1122 | - services: |
1123 | - keystone: |
1124 | - options: |
1125 | - openstack-origin-git: include-file://keystone-juno.yaml |
1126 | - glance: |
1127 | - options: |
1128 | - openstack-origin-git: include-file://glance-juno.yaml |
1129 | - neutron-api: |
1130 | - options: |
1131 | - openstack-origin-git: include-file://neutron-juno.yaml |
1132 | - neutron-gateway: |
1133 | - options: |
1134 | - openstack-origin-git: include-file://neutron-juno.yaml |
1135 | - neutron-openvswitch: |
1136 | - options: |
1137 | - openstack-origin-git: include-file://neutron-juno.yaml |
1138 | - openstack-dashboard: |
1139 | - options: |
1140 | - openstack-origin-git: include-file://horizon-juno.yaml |
1141 | - nova-compute: |
1142 | - options: |
1143 | - openstack-origin-git: include-file://nova-juno.yaml |
1144 | - nova-cloud-controller: |
1145 | - options: |
1146 | - openstack-origin-git: include-file://nova-juno.yaml |
1147 | -trusty-juno: |
1148 | - inherits: openstack-juno-git |
1149 | - series: trusty |
1150 | - overrides: |
1151 | - openstack-origin: cloud:trusty-juno |
1152 | - source: cloud:trusty-juno |
1153 | -utopic-juno: |
1154 | - inherits: openstack-juno-git |
1155 | - series: utopic |
1156 | -# kilo |
1157 | -openstack-kilo-git: |
1158 | - inherits: openstack-icehouse |
1159 | - services: |
1160 | - keystone: |
1161 | - options: |
1162 | - openstack-origin-git: include-file://keystone-kilo.yaml |
1163 | - glance: |
1164 | - options: |
1165 | - openstack-origin-git: include-file://glance-kilo.yaml |
1166 | - neutron-api: |
1167 | - options: |
1168 | - openstack-origin-git: include-file://neutron-kilo.yaml |
1169 | - neutron-gateway: |
1170 | - options: |
1171 | - openstack-origin-git: include-file://neutron-kilo.yaml |
1172 | - neutron-openvswitch: |
1173 | - options: |
1174 | - openstack-origin-git: include-file://neutron-kilo.yaml |
1175 | - openstack-dashboard: |
1176 | - options: |
1177 | - openstack-origin-git: include-file://horizon-kilo.yaml |
1178 | - nova-compute: |
1179 | - options: |
1180 | - openstack-origin-git: include-file://nova-kilo.yaml |
1181 | - nova-cloud-controller: |
1182 | - options: |
1183 | - openstack-origin-git: include-file://nova-kilo.yaml |
1184 | -trusty-kilo: |
1185 | - inherits: openstack-kilo-git |
1186 | - series: trusty |
1187 | - overrides: |
1188 | - openstack-origin: cloud:trusty-kilo |
1189 | - source: cloud:trusty-kilo |
1190 | -trusty-kilo-proposed: |
1191 | - inherits: openstack-kilo-git |
1192 | - series: trusty |
1193 | - overrides: |
1194 | - openstack-origin: cloud:trusty-kilo/proposed |
1195 | - source: cloud:trusty-kilo/proposed |
1196 | -vivid-kilo: |
1197 | - inherits: openstack-kilo-git |
1198 | - series: vivid |
1199 | - services: |
1200 | - mysql: |
1201 | - branch: lp:charms/trusty/mysql |
1202 | # liberty |
1203 | openstack-liberty-git: |
1204 | inherits: openstack-icehouse |
1205 | services: |
1206 | - keystone: |
1207 | - options: |
1208 | - openstack-origin-git: include-file://keystone-liberty.yaml |
1209 | - glance: |
1210 | - options: |
1211 | - openstack-origin-git: include-file://glance-liberty.yaml |
1212 | - neutron-api: |
1213 | - options: |
1214 | - openstack-origin-git: include-file://neutron-liberty.yaml |
1215 | - neutron-gateway: |
1216 | - options: |
1217 | - openstack-origin-git: include-file://neutron-liberty.yaml |
1218 | - neutron-openvswitch: |
1219 | - options: |
1220 | - openstack-origin-git: include-file://neutron-liberty.yaml |
1221 | - openstack-dashboard: |
1222 | - options: |
1223 | - openstack-origin-git: include-file://horizon-liberty.yaml |
1224 | nova-compute: |
1225 | options: |
1226 | openstack-origin-git: include-file://nova-liberty.yaml |
1227 | - nova-cloud-controller: |
1228 | - options: |
1229 | - openstack-origin-git: include-file://nova-liberty.yaml |
1230 | +wily-liberty: |
1231 | + inherits: openstack-liberty-git |
1232 | + series: wily |
1233 | +wily-liberty-proposed: |
1234 | + inherits: wily-liberty |
1235 | + overrides: |
1236 | + source: proposed |
1237 | + openstack-origin: distro-proposed |
1238 | trusty-liberty: |
1239 | inherits: openstack-liberty-git |
1240 | series: trusty |
1241 | overrides: |
1242 | openstack-origin: cloud:trusty-liberty |
1243 | source: cloud:trusty-liberty |
1244 | -trusty-liberty-proposed: |
1245 | - inherits: openstack-liberty-git |
1246 | - series: trusty |
1247 | - overrides: |
1248 | - openstack-origin: cloud:trusty-liberty/proposed |
1249 | - source: cloud:trusty-liberty/proposed |
1250 | -wily-liberty: |
1251 | - inherits: openstack-liberty-git |
1252 | - series: wily |
1253 | - services: |
1254 | - mysql: |
1255 | - branch: lp:charms/trusty/mysql |
1256 | -# master |
1257 | +# mitaka |
1258 | openstack-master-git: |
1259 | inherits: openstack-icehouse |
1260 | services: |
1261 | - keystone: |
1262 | - options: |
1263 | - openstack-origin-git: include-file://keystone-master.yaml |
1264 | - glance: |
1265 | - options: |
1266 | - openstack-origin-git: include-file://glance-master.yaml |
1267 | - neutron-api: |
1268 | - options: |
1269 | - openstack-origin-git: include-file://neutron-master.yaml |
1270 | - neutron-gateway: |
1271 | - options: |
1272 | - openstack-origin-git: include-file://neutron-master.yaml |
1273 | - neutron-openvswitch: |
1274 | - options: |
1275 | - openstack-origin-git: include-file://neutron-master.yaml |
1276 | - openstack-dashboard: |
1277 | - options: |
1278 | - openstack-origin-git: include-file://horizon-master.yaml |
1279 | nova-compute: |
1280 | options: |
1281 | openstack-origin-git: include-file://nova-master.yaml |
1282 | - nova-cloud-controller: |
1283 | - options: |
1284 | - openstack-origin-git: include-file://nova-master.yaml |
1285 | -trusty-master: |
1286 | - inherits: openstack-master-git |
1287 | - series: trusty |
1288 | - overrides: |
1289 | - openstack-origin: cloud:trusty-mitaka |
1290 | - source: cloud:trusty-mitaka |
1291 | -trusty-master-proposed: |
1292 | - inherits: openstack-master-git |
1293 | - series: trusty |
1294 | - overrides: |
1295 | - openstack-origin: cloud:trusty-mitaka/proposed |
1296 | - source: cloud:trusty-mitaka/proposed |
1297 | -xenial-master: |
1298 | +xenial-mitaka: |
1299 | inherits: openstack-master-git |
1300 | series: xenial |
1301 | services: |
1302 | mysql: |
1303 | branch: lp:charms/trusty/mysql |
1304 | +xenial-mitaka-proposed: |
1305 | + inherits: xenial-mitaka |
1306 | + overrides: |
1307 | + source: proposed |
1308 | + openstack-origin: distro-proposed |
1309 | |
1310 | === renamed file 'bundles/lxd/nova-liberty.yaml' => 'bundles/lxd/source/nova-liberty.yaml' |
1311 | --- bundles/lxd/nova-liberty.yaml 2016-02-19 16:49:21 +0000 |
1312 | +++ bundles/lxd/source/nova-liberty.yaml 2016-03-29 17:26:34 +0000 |
1313 | @@ -1,10 +1,13 @@ |
1314 | repositories: |
1315 | - {name: requirements, |
1316 | - repository: 'git://github.com/openstack/requirements', |
1317 | - branch: stable/liberty} |
1318 | - - {name: neutron, |
1319 | - repository: 'git://github.com/openstack/neutron', |
1320 | - branch: stable/liberty} |
1321 | + repository: 'git://github.com/zulcss/requirements', |
1322 | + branch: stable/liberty} |
1323 | + - {name: pylxd, |
1324 | + repository: 'https://github.com/lxc/pylxd', |
1325 | + branch: master} |
1326 | + - {name: nova-compute-lxd, |
1327 | + repository: 'https://github.com/lxc/nova-lxd', |
1328 | + branch: master} |
1329 | - {name: nova, |
1330 | repository: 'git://github.com/openstack/nova', |
1331 | branch: stable/liberty} |
1332 | |
1333 | === modified file 'bundles/lxd/source/nova-master.yaml' |
1334 | --- bundles/lxd/source/nova-master.yaml 2015-07-23 20:48:46 +0000 |
1335 | +++ bundles/lxd/source/nova-master.yaml 2016-03-29 17:26:34 +0000 |
1336 | @@ -1,15 +1,12 @@ |
1337 | repositories: |
1338 | - {name: requirements, |
1339 | - repository: 'git://github.com/openstack/requirements', |
1340 | - branch: master} |
1341 | - - {name: neutron, |
1342 | - repository: 'git://github.com/openstack/neutron', |
1343 | + repository: 'git://github.com/zulcss/requirements', |
1344 | branch: master} |
1345 | - {name: pylxd, |
1346 | repository: 'https://github.com/lxc/pylxd', |
1347 | branch: master} |
1348 | - {name: nova-compute-lxd, |
1349 | - repository: 'https://github.com/lxc/nova-compute-lxd', |
1350 | + repository: 'https://github.com/lxc/nova-lxd', |
1351 | branch: master} |
1352 | - {name: nova, |
1353 | repository: 'git://github.com/openstack/nova', |
Thanks for your work on this. I'd like to see these be nearly identical wrt charms, topology, configuration: source/ next.yaml paste.ubuntu. com/15551947/
lxd/next.yaml
lxd/
diff: http://
Same for the stable.yaml files.