Merge lp:~zulcss/openstack-charm-testing/lxd-qa into lp:openstack-charm-testing
- lxd-qa
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Ryan Beisner |
Proposed branch: | lp:~zulcss/openstack-charm-testing/lxd-qa |
Merge into: | lp:openstack-charm-testing |
Diff against target: |
735 lines (+306/-272) (has conflicts) 26 files modified
bundles/lxd/default.yaml (+11/-0) 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-liberty.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 (+134/-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/neutron-master.yaml (+0/-19) bundles/lxd/source/next.yaml (+134/-0) bundles/lxd/source/nova-liberty.yaml (+16/-0) bundles/lxd/source/nova-master.yaml (+0/-19) Contents conflict in bundles/lxd/lxd.yaml Contents conflict in bundles/lxd/source/lxd.yaml |
To merge this branch: | bzr merge lp:~zulcss/openstack-charm-testing/lxd-qa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Disapprove | ||
Review via email: mp+288645@code.launchpad.net |
Commit message
Description of the change
- Add LXD dfs QA rig
- Update charms
- Clean up LXD directory.
Ryan Beisner (1chb1n) wrote : | # |
I would suggest a 3rd set of bundles:
bundles/
bundles/
Which are identical to bundles/
ie. Deploy everything from distro/cloud archive, except for lxd.
IMHO, That is where you will best detect whether lxd changes have broken something badly.
- 184. By Chuck Short
-
Add isolated bundles
Add bundles without LXD so we can compare with a non-LXD deployment
if there are problems with LXD. - 185. By Chuck Short
-
Focus only on nova-lxd when deploying from source
- Remove cinder, glance, horizon, and neturon DFS
git branches since we only depeloy from nova-lxd
from source.
- default.yaml deploys the stable charms from the
charm store.
- next.yaml deploys the development charms with
nova-lxd. This is also used for UOSCI in
automated testing. - 186. By Chuck Short
-
Remove qa bundles
- 187. By Chuck Short
-
Add xenial support
- 188. By Chuck Short
-
Spelling is hard
Ryan Beisner (1chb1n) wrote : | # |
Looking good! Thanks for the rearrangement.
It's ok to remove the isolated dir since the source dir is doing lxd from source with all other services from distro/cloud archive.
Please see inline comments on 'bundles/
We should do the same on lxd/next.yaml and lxd/default.yaml, but that doesn't necessarily have to accompany this MP.
- 189. By Chuck Short
-
Remove isoloated
- 190. By Chuck Short
-
Cleanup bundle
- 191. By Chuck Short
-
Remove isolated
- 192. By Chuck Short
-
Clean up next branch
Ryan Beisner (1chb1n) wrote : | # |
Too much stuff removed in that last clean-up.
- 193. By Chuck Short
-
Revert last commit
- 194. By Chuck Short
-
Update branches
- 195. By Chuck Short
-
Update
Ryan Beisner (1chb1n) wrote : | # |
FYI, a separate re-do merge proposal has already been merged.
Unmerged revisions
- 195. By Chuck Short
-
Update
- 194. By Chuck Short
-
Update branches
- 193. By Chuck Short
-
Revert last commit
- 192. By Chuck Short
-
Clean up next branch
- 191. By Chuck Short
-
Remove isolated
- 190. By Chuck Short
-
Cleanup bundle
- 189. By Chuck Short
-
Remove isoloated
- 188. By Chuck Short
-
Spelling is hard
- 187. By Chuck Short
-
Add xenial support
- 186. By Chuck Short
-
Remove qa bundles
Preview Diff
1 | === modified file 'bundles/lxd/default.yaml' |
2 | --- bundles/lxd/default.yaml 2016-03-11 09:33:21 +0000 |
3 | +++ bundles/lxd/default.yaml 2016-03-21 15:03:28 +0000 |
4 | @@ -160,3 +160,14 @@ |
5 | overrides: |
6 | source: proposed |
7 | openstack-origin: distro-proposed |
8 | +xenial-mitaka: |
9 | + inherits: openstack-icehouse |
10 | + series: xenial |
11 | + services: |
12 | + mysql: |
13 | + branch: lp:charms/trusty/mysql |
14 | +xenial-mitaka-proposed: |
15 | + inherits: xenial-mitaka |
16 | + overrides: |
17 | + source: proposed |
18 | + openstack-origin: distro-proposed |
19 | |
20 | === removed file 'bundles/lxd/glance-kilo.yaml' |
21 | --- bundles/lxd/glance-kilo.yaml 2016-02-19 16:49:21 +0000 |
22 | +++ bundles/lxd/glance-kilo.yaml 1970-01-01 00:00:00 +0000 |
23 | @@ -1,10 +0,0 @@ |
24 | -repositories: |
25 | - - {name: requirements, |
26 | - repository: 'git://github.com/openstack/requirements', |
27 | - branch: stable/kilo} |
28 | - - {name: glance, |
29 | - repository: 'git://github.com/openstack/glance', |
30 | - branch: stable/kilo} |
31 | -directory: /mnt/openstack-git |
32 | -http_proxy: http://squid.internal:3128 |
33 | -https_proxy: http://squid.internal:3128 |
34 | |
35 | === removed file 'bundles/lxd/glance-liberty.yaml' |
36 | --- bundles/lxd/glance-liberty.yaml 2016-02-19 16:49:21 +0000 |
37 | +++ bundles/lxd/glance-liberty.yaml 1970-01-01 00:00:00 +0000 |
38 | @@ -1,10 +0,0 @@ |
39 | -repositories: |
40 | - - {name: requirements, |
41 | - repository: 'git://github.com/openstack/requirements', |
42 | - branch: stable/liberty} |
43 | - - {name: glance, |
44 | - repository: 'git://github.com/openstack/glance', |
45 | - branch: stable/liberty} |
46 | -directory: /mnt/openstack-git |
47 | -http_proxy: http://squid.internal:3128 |
48 | -https_proxy: http://squid.internal:3128 |
49 | |
50 | === removed file 'bundles/lxd/glance-master.yaml' |
51 | --- bundles/lxd/glance-master.yaml 2016-02-19 16:49:21 +0000 |
52 | +++ bundles/lxd/glance-master.yaml 1970-01-01 00:00:00 +0000 |
53 | @@ -1,10 +0,0 @@ |
54 | -repositories: |
55 | - - {name: requirements, |
56 | - repository: 'git://github.com/zulcss/requirements', |
57 | - branch: master} |
58 | - - {name: glance, |
59 | - repository: 'git://github.com/openstack/glance', |
60 | - branch: 12.0.0.0b2} |
61 | -directory: /mnt/openstack-git |
62 | -http_proxy: http://squid.internal:3128 |
63 | -https_proxy: http://squid.internal:3128 |
64 | |
65 | === removed file 'bundles/lxd/horizon-kilo.yaml' |
66 | --- bundles/lxd/horizon-kilo.yaml 2016-02-19 16:49:21 +0000 |
67 | +++ bundles/lxd/horizon-kilo.yaml 1970-01-01 00:00:00 +0000 |
68 | @@ -1,10 +0,0 @@ |
69 | -repositories: |
70 | - - {name: requirements, |
71 | - repository: 'git://github.com/openstack/requirements', |
72 | - branch: stable/kilo} |
73 | - - {name: horizon, |
74 | - repository: 'git://github.com/openstack/horizon', |
75 | - branch: stable/kilo} |
76 | -directory: /mnt/openstack-git |
77 | -http_proxy: http://squid.internal:3128 |
78 | -https_proxy: http://squid.internal:3128 |
79 | |
80 | === removed file 'bundles/lxd/horizon-liberty.yaml' |
81 | --- bundles/lxd/horizon-liberty.yaml 2016-02-19 16:49:21 +0000 |
82 | +++ bundles/lxd/horizon-liberty.yaml 1970-01-01 00:00:00 +0000 |
83 | @@ -1,10 +0,0 @@ |
84 | -repositories: |
85 | - - {name: requirements, |
86 | - repository: 'git://github.com/openstack/requirements', |
87 | - branch: stable/liberty} |
88 | - - {name: horizon, |
89 | - repository: 'git://github.com/openstack/horizon', |
90 | - branch: stable/liberty} |
91 | -directory: /mnt/openstack-git |
92 | -http_proxy: http://squid.internal:3128 |
93 | -https_proxy: http://squid.internal:3128 |
94 | |
95 | === removed file 'bundles/lxd/horizon-master.yaml' |
96 | --- bundles/lxd/horizon-master.yaml 2016-02-19 16:49:21 +0000 |
97 | +++ bundles/lxd/horizon-master.yaml 1970-01-01 00:00:00 +0000 |
98 | @@ -1,10 +0,0 @@ |
99 | -repositories: |
100 | - - {name: requirements, |
101 | - repository: 'git://github.com/zulcss/requirements', |
102 | - branch: master} |
103 | - - {name: horizon, |
104 | - repository: 'git://github.com/openstack/horizon', |
105 | - branch: 9.0.0.0b2} |
106 | -directory: /mnt/openstack-git |
107 | -http_proxy: http://squid.internal:3128 |
108 | -https_proxy: http://squid.internal:3128 |
109 | |
110 | === removed file 'bundles/lxd/keystone-kilo.yaml' |
111 | --- bundles/lxd/keystone-kilo.yaml 2016-02-19 16:49:21 +0000 |
112 | +++ bundles/lxd/keystone-kilo.yaml 1970-01-01 00:00:00 +0000 |
113 | @@ -1,10 +0,0 @@ |
114 | -repositories: |
115 | - - {name: requirements, |
116 | - repository: 'git://github.com/openstack/requirements', |
117 | - branch: stable/kilo} |
118 | - - {name: keystone, |
119 | - repository: 'git://github.com/openstack/keystone', |
120 | - branch: stable/kilo} |
121 | -directory: /mnt/openstack-git |
122 | -http_proxy: http://squid.internal:3128 |
123 | -https_proxy: http://squid.internal:3128 |
124 | |
125 | === removed file 'bundles/lxd/keystone-liberty.yaml' |
126 | --- bundles/lxd/keystone-liberty.yaml 2016-02-19 16:49:21 +0000 |
127 | +++ bundles/lxd/keystone-liberty.yaml 1970-01-01 00:00:00 +0000 |
128 | @@ -1,10 +0,0 @@ |
129 | -repositories: |
130 | - - {name: requirements, |
131 | - repository: 'git://github.com/openstack/requirements', |
132 | - branch: stable/liberty} |
133 | - - {name: keystone, |
134 | - repository: 'git://github.com/openstack/keystone', |
135 | - branch: stable/liberty} |
136 | -directory: /mnt/openstack-git |
137 | -http_proxy: http://squid.internal:3128 |
138 | -https_proxy: http://squid.internal:3128 |
139 | |
140 | === removed file 'bundles/lxd/keystone-master.yaml' |
141 | --- bundles/lxd/keystone-master.yaml 2016-02-19 16:49:21 +0000 |
142 | +++ bundles/lxd/keystone-master.yaml 1970-01-01 00:00:00 +0000 |
143 | @@ -1,10 +0,0 @@ |
144 | -repositories: |
145 | - - {name: requirements, |
146 | - repository: 'git://github.com/zulcss/requirements', |
147 | - branch: master} |
148 | - - {name: keystone, |
149 | - repository: 'git://github.com/openstack/keystone', |
150 | - branch: 9.0.0.0b2} |
151 | -directory: /mnt/openstack-git |
152 | -http_proxy: http://squid.internal:3128 |
153 | -https_proxy: http://squid.internal:3128 |
154 | |
155 | === renamed file 'bundles/lxd/lxd.yaml' => 'bundles/lxd/lxd.yaml.THIS' |
156 | === removed file 'bundles/lxd/neutron-kilo.yaml' |
157 | --- bundles/lxd/neutron-kilo.yaml 2016-02-19 16:49:21 +0000 |
158 | +++ bundles/lxd/neutron-kilo.yaml 1970-01-01 00:00:00 +0000 |
159 | @@ -1,19 +0,0 @@ |
160 | -repositories: |
161 | - - {name: requirements, |
162 | - repository: 'git://github.com/openstack/requirements', |
163 | - branch: stable/kilo} |
164 | - - {name: neutron-fwaas, |
165 | - repository: 'git://github.com/openstack/neutron-fwaas', |
166 | - branch: stable/kilo} |
167 | - - {name: neutron-lbaas, |
168 | - repository: 'git://github.com/openstack/neutron-lbaas', |
169 | - branch: stable/kilo} |
170 | - - {name: neutron-vpnaas, |
171 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
172 | - branch: stable/kilo} |
173 | - - {name: neutron, |
174 | - repository: 'git://github.com/openstack/neutron', |
175 | - branch: stable/kilo} |
176 | -directory: /mnt/openstack-git |
177 | -http_proxy: http://squid.internal:3128 |
178 | -https_proxy: http://squid.internal:3128 |
179 | |
180 | === removed file 'bundles/lxd/neutron-liberty.yaml' |
181 | --- bundles/lxd/neutron-liberty.yaml 2016-02-19 16:49:21 +0000 |
182 | +++ bundles/lxd/neutron-liberty.yaml 1970-01-01 00:00:00 +0000 |
183 | @@ -1,19 +0,0 @@ |
184 | -repositories: |
185 | - - {name: requirements, |
186 | - repository: 'git://github.com/openstack/requirements', |
187 | - branch: stable/liberty} |
188 | - - {name: neutron-fwaas, |
189 | - repository: 'git://github.com/openstack/neutron-fwaas', |
190 | - branch: stable/liberty} |
191 | - - {name: neutron-lbaas, |
192 | - repository: 'git://github.com/openstack/neutron-lbaas', |
193 | - branch: stable/liberty} |
194 | - - {name: neutron-vpnaas, |
195 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
196 | - branch: stable/liberty} |
197 | - - {name: neutron, |
198 | - repository: 'git://github.com/openstack/neutron', |
199 | - branch: stable/liberty} |
200 | -directory: /mnt/openstack-git |
201 | -http_proxy: http://squid.internal:3128 |
202 | -https_proxy: http://squid.internal:3128 |
203 | |
204 | === removed file 'bundles/lxd/neutron-master.yaml' |
205 | --- bundles/lxd/neutron-master.yaml 2016-02-19 16:49:21 +0000 |
206 | +++ bundles/lxd/neutron-master.yaml 1970-01-01 00:00:00 +0000 |
207 | @@ -1,19 +0,0 @@ |
208 | -repositories: |
209 | - - {name: requirements, |
210 | - repository: 'git://github.com/zulcss/requirements', |
211 | - branch: master} |
212 | - - {name: neutron-fwaas, |
213 | - repository: 'git://github.com/openstack/neutron-fwaas', |
214 | - branch: 8.0.0.0b2} |
215 | - - {name: neutron-lbaas, |
216 | - repository: 'git://github.com/openstack/neutron-lbaas', |
217 | - branch: 8.0.0.0b2} |
218 | - - {name: neutron-vpnaas, |
219 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
220 | - branch: 8.0.0.0b2} |
221 | - - {name: neutron, |
222 | - repository: 'git://github.com/openstack/neutron', |
223 | - branch: 8.0.0.0b2} |
224 | -directory: /mnt/openstack-git |
225 | -http_proxy: http://squid.internal:3128 |
226 | -https_proxy: http://squid.internal:3128 |
227 | |
228 | === removed file 'bundles/lxd/nova-kilo.yaml' |
229 | --- bundles/lxd/nova-kilo.yaml 2016-02-19 16:49:21 +0000 |
230 | +++ bundles/lxd/nova-kilo.yaml 1970-01-01 00:00:00 +0000 |
231 | @@ -1,13 +0,0 @@ |
232 | -repositories: |
233 | - - {name: requirements, |
234 | - repository: 'git://github.com/openstack/requirements', |
235 | - branch: stable/kilo} |
236 | - - {name: neutron, |
237 | - repository: 'git://github.com/openstack/neutron', |
238 | - branch: stable/kilo} |
239 | - - {name: nova, |
240 | - repository: 'git://github.com/openstack/nova', |
241 | - branch: stable/kilo} |
242 | -directory: /mnt/openstack-git |
243 | -http_proxy: http://squid.internal:3128 |
244 | -https_proxy: http://squid.internal:3128 |
245 | |
246 | === removed file 'bundles/lxd/nova-liberty.yaml' |
247 | --- bundles/lxd/nova-liberty.yaml 2016-02-19 16:49:21 +0000 |
248 | +++ bundles/lxd/nova-liberty.yaml 1970-01-01 00:00:00 +0000 |
249 | @@ -1,13 +0,0 @@ |
250 | -repositories: |
251 | - - {name: requirements, |
252 | - repository: 'git://github.com/openstack/requirements', |
253 | - branch: stable/liberty} |
254 | - - {name: neutron, |
255 | - repository: 'git://github.com/openstack/neutron', |
256 | - branch: stable/liberty} |
257 | - - {name: nova, |
258 | - repository: 'git://github.com/openstack/nova', |
259 | - branch: stable/liberty} |
260 | -directory: /mnt/openstack-git |
261 | -http_proxy: http://squid.internal:3128 |
262 | -https_proxy: http://squid.internal:3128 |
263 | |
264 | === removed file 'bundles/lxd/nova-master.yaml' |
265 | --- bundles/lxd/nova-master.yaml 2016-02-19 16:49:21 +0000 |
266 | +++ bundles/lxd/nova-master.yaml 1970-01-01 00:00:00 +0000 |
267 | @@ -1,21 +0,0 @@ |
268 | -# Update this file to point to master when Xenial |
269 | -# is available |
270 | -repositories: |
271 | - - {name: requirements, |
272 | - repository: 'git://github.com/zulcss/requirements', |
273 | - branch: master} |
274 | - - {name: neutron, |
275 | - repository: 'git://github.com/openstack/neutron', |
276 | - branch: 8.0.0.0b2} |
277 | - - {name: nova-lxd, |
278 | - repository: 'git://github.com/lxc/nova-lxd', |
279 | - branch: master} |
280 | - - {name: pylxd, |
281 | - repository: 'git://github.com/lxc/pylxd', |
282 | - branch: master} |
283 | - - {name: nova, |
284 | - repository: 'git://github.com/openstack/nova', |
285 | - branch: 13.0.0.0b2} |
286 | -directory: /mnt/openstack-git |
287 | -http_proxy: http://squid.internal:3128 |
288 | -https_proxy: http://squid.internal:3128 |
289 | |
290 | === added file 'bundles/lxd/source/README' |
291 | --- bundles/lxd/source/README 1970-01-01 00:00:00 +0000 |
292 | +++ bundles/lxd/source/README 2016-03-21 15:03:28 +0000 |
293 | @@ -0,0 +1,11 @@ |
294 | +bundles/lxd/qa |
295 | +============== |
296 | + |
297 | +The following bundle are meant to be consumed by UOSCI |
298 | +in automated git deployment testing. They are working |
299 | +bundles, updated throughout the dev cycle. |
300 | + |
301 | +== Branches == |
302 | + |
303 | +To test your branch, replace the master branch with |
304 | +the branch that you want to test in the nova-master.yaml. |
305 | |
306 | === removed file 'bundles/lxd/source/cinder-master.yaml' |
307 | --- bundles/lxd/source/cinder-master.yaml 2015-07-23 20:48:46 +0000 |
308 | +++ bundles/lxd/source/cinder-master.yaml 1970-01-01 00:00:00 +0000 |
309 | @@ -1,10 +0,0 @@ |
310 | -repositories: |
311 | - - {name: requirements, |
312 | - repository: 'git://github.com/openstack/requirements', |
313 | - branch: master} |
314 | - - {name: cinder, |
315 | - repository: 'git://github.com/openstack/cinder', |
316 | - branch: master} |
317 | -directory: /mnt/openstack-git |
318 | -http_proxy: http://squid.internal:3128 |
319 | -https_proxy: http://squid.internal:3128 |
320 | |
321 | === added file 'bundles/lxd/source/default.yaml' |
322 | --- bundles/lxd/source/default.yaml 1970-01-01 00:00:00 +0000 |
323 | +++ bundles/lxd/source/default.yaml 2016-03-21 15:03:28 +0000 |
324 | @@ -0,0 +1,134 @@ |
325 | +# vim: set ts=2 et: |
326 | +# deployer bundle for development ('next') charms |
327 | +# UOSCI relies on this for OS-on-OS deployment testing |
328 | +openstack-services: |
329 | + services: |
330 | + mysql: |
331 | + branch: https://github.com/openstack/charm-percona-cluster;stable |
332 | + constraints: mem=4G |
333 | + options: |
334 | + dataset-size: 50% |
335 | + max-connections: 20000 |
336 | + rabbitmq-server: |
337 | + branch: https://github.com/openstack/charm-rabbitmq-server;stable |
338 | + constraints: mem=1G |
339 | + keystone: |
340 | + branch: https://github.com/openstack/charm-keystone;stable |
341 | + constraints: mem=1G |
342 | + options: |
343 | + admin-password: openstack |
344 | + admin-token: ubuntutesting |
345 | + openstack-dashboard: |
346 | + branch: https://github.com/openstack/charm-openstack-dashboard;stable |
347 | + constraints: mem=1G |
348 | + nova-compute: |
349 | + branch: https://github.com/openstack/charm-nova-compute;stable |
350 | + num_units: 3 |
351 | + constraints: mem=4G |
352 | + options: |
353 | + enable-live-migration: True |
354 | + enable-resize: True |
355 | + migration-auth-type: ssh |
356 | + virt-type: lxd |
357 | + nova-cloud-controller: |
358 | + branch: https://github.com/openstack/charm-nova-cloud-controller;stable |
359 | + constraints: mem=1G |
360 | + options: |
361 | + network-manager: Neutron |
362 | + quantum-security-groups: "yes" |
363 | + neutron-gateway: |
364 | + branch: https://github.com/openstack/charm-neutron-gateway;stable |
365 | + constraints: mem=1G |
366 | + options: |
367 | + instance-mtu: 1300 |
368 | + glance: |
369 | + branch: https://github.com/openstack/charm-glance;stable |
370 | + constraints: mem=1G |
371 | + lxd: |
372 | + branch: https://github.com/openstack/charm-lxd |
373 | + options: |
374 | + block-device: /mnt/disk.img|20G |
375 | + storage-type: btrfs |
376 | + relations: |
377 | + - [ keystone, mysql ] |
378 | + - [ nova-cloud-controller, mysql ] |
379 | + - [ nova-cloud-controller, rabbitmq-server ] |
380 | + - [ nova-cloud-controller, glance ] |
381 | + - [ nova-cloud-controller, keystone ] |
382 | + - [ nova-compute, nova-cloud-controller ] |
383 | + - [ nova-compute, mysql ] |
384 | + - [ nova-compute, lxd ] |
385 | + - - nova-compute |
386 | + - rabbitmq-server:amqp |
387 | + - [ nova-compute, glance ] |
388 | + - [ glance, mysql ] |
389 | + - [ glance, keystone ] |
390 | + - [ neutron-gateway, mysql ] |
391 | + - [ neutron-gateway, nova-cloud-controller ] |
392 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
393 | + - [ openstack-dashboard, keystone ] |
394 | + - [ neutron-api, mysql ] |
395 | + - [ neutron-api, rabbitmq-server ] |
396 | + - [ neutron-api, nova-cloud-controller ] |
397 | + - [ neutron-api, neutron-openvswitch ] |
398 | + - [ neutron-api, keystone ] |
399 | + - [ neutron-api, neutron-gateway ] |
400 | + - [ neutron-openvswitch, nova-compute ] |
401 | + - [ neutron-openvswitch, rabbitmq-server ] |
402 | +# liberty |
403 | +openstack-liberty-git: |
404 | + inherits: openstack-services |
405 | + services: |
406 | + nova-compute: |
407 | + options: |
408 | + openstack-origin-git: include-file://nova-liberty.yaml |
409 | +trusty-liberty: |
410 | + inherits: openstack-liberty-git |
411 | + series: trusty |
412 | + overrides: |
413 | + openstack-origin: cloud:trusty-liberty |
414 | + source: cloud:trusty-liberty |
415 | +trusty-liberty-proposed: |
416 | + inherits: openstack-liberty-git |
417 | + series: trusty |
418 | + overrides: |
419 | + openstack-origin: cloud:trusty-liberty/proposed |
420 | + source: cloud:trusty-liberty/proposed |
421 | +wily-liberty: |
422 | + inherits: openstack-liberty-git |
423 | + series: wily |
424 | + services: |
425 | + mysql: |
426 | + branch: lp:charms/trusty/mysql |
427 | +# master |
428 | +openstack-master-git: |
429 | + inherits: openstack-services |
430 | + services: |
431 | + nova-compute: |
432 | + options: |
433 | + openstack-origin-git: include-file://nova-master.yaml |
434 | +trusty-master: |
435 | + inherits: openstack-master-git |
436 | + series: trusty |
437 | + overrides: |
438 | + openstack-origin: cloud:trusty-mitaka |
439 | + source: cloud:trusty-mitaka |
440 | +trusty-master-proposed: |
441 | + inherits: openstack-master-git |
442 | + series: trusty |
443 | + overrides: |
444 | + openstack-origin: cloud:trusty-mitaka/proposed |
445 | + source: cloud:trusty-mitaka/proposed |
446 | +# xenial |
447 | +xenial-master: |
448 | + inherits: openstack-master-git |
449 | + series: xenial |
450 | + services: |
451 | + mysql: |
452 | + branch: lp:charms/trusty/mysql |
453 | +xenial-master-proposed: |
454 | + inherits: openstack-master-git |
455 | + series: xenial |
456 | + overrides: |
457 | + source: proposed |
458 | + openstack-origin: distro-proposed |
459 | |
460 | === removed file 'bundles/lxd/source/glance-master.yaml' |
461 | --- bundles/lxd/source/glance-master.yaml 2015-07-23 20:48:46 +0000 |
462 | +++ bundles/lxd/source/glance-master.yaml 1970-01-01 00:00:00 +0000 |
463 | @@ -1,10 +0,0 @@ |
464 | -repositories: |
465 | - - {name: requirements, |
466 | - repository: 'git://github.com/openstack/requirements', |
467 | - branch: master} |
468 | - - {name: glance, |
469 | - repository: 'git://github.com/openstack/glance', |
470 | - branch: master} |
471 | -directory: /mnt/openstack-git |
472 | -http_proxy: http://squid.internal:3128 |
473 | -https_proxy: http://squid.internal:3128 |
474 | |
475 | === removed file 'bundles/lxd/source/horizon-master.yaml' |
476 | --- bundles/lxd/source/horizon-master.yaml 2015-07-23 20:48:46 +0000 |
477 | +++ bundles/lxd/source/horizon-master.yaml 1970-01-01 00:00:00 +0000 |
478 | @@ -1,10 +0,0 @@ |
479 | -repositories: |
480 | - - {name: requirements, |
481 | - repository: 'git://github.com/openstack/requirements', |
482 | - branch: master} |
483 | - - {name: horizon, |
484 | - repository: 'git://github.com/openstack/horizon', |
485 | - branch: master} |
486 | -directory: /mnt/openstack-git |
487 | -http_proxy: http://squid.internal:3128 |
488 | -https_proxy: http://squid.internal:3128 |
489 | |
490 | === removed file 'bundles/lxd/source/keystone-master.yaml' |
491 | --- bundles/lxd/source/keystone-master.yaml 2015-07-23 20:48:46 +0000 |
492 | +++ bundles/lxd/source/keystone-master.yaml 1970-01-01 00:00:00 +0000 |
493 | @@ -1,10 +0,0 @@ |
494 | -repositories: |
495 | - - {name: requirements, |
496 | - repository: 'git://github.com/openstack/requirements', |
497 | - branch: master} |
498 | - - {name: keystone, |
499 | - repository: 'git://github.com/openstack/keystone', |
500 | - branch: master} |
501 | -directory: /mnt/openstack-git |
502 | -http_proxy: http://squid.internal:3128 |
503 | -https_proxy: http://squid.internal:3128 |
504 | |
505 | === renamed file 'bundles/lxd/source/lxd.yaml' => 'bundles/lxd/source/lxd.yaml.THIS' |
506 | === removed file 'bundles/lxd/source/neutron-master.yaml' |
507 | --- bundles/lxd/source/neutron-master.yaml 2015-07-23 20:48:46 +0000 |
508 | +++ bundles/lxd/source/neutron-master.yaml 1970-01-01 00:00:00 +0000 |
509 | @@ -1,19 +0,0 @@ |
510 | -repositories: |
511 | - - {name: requirements, |
512 | - repository: 'git://github.com/openstack/requirements', |
513 | - branch: master} |
514 | - - {name: neutron-fwaas, |
515 | - repository: 'git://github.com/openstack/neutron-fwaas', |
516 | - branch: master} |
517 | - - {name: neutron-lbaas, |
518 | - repository: 'git://github.com/openstack/neutron-lbaas', |
519 | - branch: master} |
520 | - - {name: neutron-vpnaas, |
521 | - repository: 'git://github.com/openstack/neutron-vpnaas', |
522 | - branch: master} |
523 | - - {name: neutron, |
524 | - repository: 'git://github.com/openstack/neutron', |
525 | - branch: master} |
526 | -directory: /mnt/openstack-git |
527 | -http_proxy: http://squid.internal:3128 |
528 | -https_proxy: http://squid.internal:3128 |
529 | |
530 | === added file 'bundles/lxd/source/next.yaml' |
531 | --- bundles/lxd/source/next.yaml 1970-01-01 00:00:00 +0000 |
532 | +++ bundles/lxd/source/next.yaml 2016-03-21 15:03:28 +0000 |
533 | @@ -0,0 +1,134 @@ |
534 | +# vim: set ts=2 et: |
535 | +# deployer bundle for development ('next') charms |
536 | +# UOSCI relies on this for OS-on-OS deployment testing |
537 | +openstack-services: |
538 | + services: |
539 | + mysql: |
540 | + branch: https://github.com/openstack/charm-percona-cluster |
541 | + constraints: mem=4G |
542 | + options: |
543 | + dataset-size: 50% |
544 | + max-connections: 20000 |
545 | + rabbitmq-server: |
546 | + branch: https://github.com/openstack/charm-rabbitmq-server |
547 | + constraints: mem=1G |
548 | + keystone: |
549 | + branch: https://github.com/openstack/charm-keystone |
550 | + constraints: mem=1G |
551 | + options: |
552 | + admin-password: openstack |
553 | + admin-token: ubuntutesting |
554 | + openstack-dashboard: |
555 | + branch: https://github.com/openstack/charm-openstack-dashboard |
556 | + constraints: mem=1G |
557 | + nova-compute: |
558 | + branch: https://github.com/openstack/charm-nova-compute |
559 | + num_units: 3 |
560 | + constraints: mem=4G |
561 | + options: |
562 | + enable-live-migration: True |
563 | + enable-resize: True |
564 | + migration-auth-type: ssh |
565 | + virt-type: lxd |
566 | + nova-cloud-controller: |
567 | + branch: https://github.com/openstack/charm-nova-cloud-controller |
568 | + constraints: mem=1G |
569 | + options: |
570 | + network-manager: Neutron |
571 | + quantum-security-groups: "yes" |
572 | + neutron-gateway: |
573 | + branch: https://github.com/openstack/charm-neutron-gateway |
574 | + constraints: mem=1G |
575 | + options: |
576 | + instance-mtu: 1300 |
577 | + glance: |
578 | + branch: https://github.com/openstack/charm-glance |
579 | + constraints: mem=1G |
580 | + lxd: |
581 | + branch: https://github.com/openstack/charm-lxd |
582 | + options: |
583 | + block-device: /mnt/disk.img|20G |
584 | + storage-type: btrfs |
585 | + relations: |
586 | + - [ keystone, mysql ] |
587 | + - [ nova-cloud-controller, mysql ] |
588 | + - [ nova-cloud-controller, rabbitmq-server ] |
589 | + - [ nova-cloud-controller, glance ] |
590 | + - [ nova-cloud-controller, keystone ] |
591 | + - [ nova-compute, nova-cloud-controller ] |
592 | + - [ nova-compute, mysql ] |
593 | + - [ nova-compute, lxd ] |
594 | + - - nova-compute |
595 | + - rabbitmq-server:amqp |
596 | + - [ nova-compute, glance ] |
597 | + - [ glance, mysql ] |
598 | + - [ glance, keystone ] |
599 | + - [ neutron-gateway, mysql ] |
600 | + - [ neutron-gateway, nova-cloud-controller ] |
601 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
602 | + - [ openstack-dashboard, keystone ] |
603 | + - [ neutron-api, mysql ] |
604 | + - [ neutron-api, rabbitmq-server ] |
605 | + - [ neutron-api, nova-cloud-controller ] |
606 | + - [ neutron-api, neutron-openvswitch ] |
607 | + - [ neutron-api, keystone ] |
608 | + - [ neutron-api, neutron-gateway ] |
609 | + - [ neutron-openvswitch, nova-compute ] |
610 | + - [ neutron-openvswitch, rabbitmq-server ] |
611 | +# liberty |
612 | +openstack-liberty-git: |
613 | + inherits: openstack-services |
614 | + services: |
615 | + nova-compute: |
616 | + options: |
617 | + openstack-origin-git: include-file://nova-liberty.yaml |
618 | +trusty-liberty: |
619 | + inherits: openstack-liberty-git |
620 | + series: trusty |
621 | + overrides: |
622 | + openstack-origin: cloud:trusty-liberty |
623 | + source: cloud:trusty-liberty |
624 | +trusty-liberty-proposed: |
625 | + inherits: openstack-liberty-git |
626 | + series: trusty |
627 | + overrides: |
628 | + openstack-origin: cloud:trusty-liberty/proposed |
629 | + source: cloud:trusty-liberty/proposed |
630 | +wily-liberty: |
631 | + inherits: openstack-liberty-git |
632 | + series: wily |
633 | + services: |
634 | + mysql: |
635 | + branch: lp:charms/trusty/mysql |
636 | +# master |
637 | +openstack-master-git: |
638 | + inherits: openstack-services |
639 | + services: |
640 | + nova-compute: |
641 | + options: |
642 | + openstack-origin-git: include-file://nova-master.yaml |
643 | +trusty-master: |
644 | + inherits: openstack-master-git |
645 | + series: trusty |
646 | + overrides: |
647 | + openstack-origin: cloud:trusty-mitaka |
648 | + source: cloud:trusty-mitaka |
649 | +trusty-master-proposed: |
650 | + inherits: openstack-master-git |
651 | + series: trusty |
652 | + overrides: |
653 | + openstack-origin: cloud:trusty-mitaka/proposed |
654 | + source: cloud:trusty-mitaka/proposed |
655 | +# xenial |
656 | +xenial-master: |
657 | + inherits: openstack-master-git |
658 | + series: xenial |
659 | + services: |
660 | + mysql: |
661 | + branch: lp:~james-page/charms/trusty/mysql/forward-compat-xenial |
662 | +xenial-master-proposed: |
663 | + inherits: openstack-master-git |
664 | + series: xenial |
665 | + overrides: |
666 | + source: proposed |
667 | + openstack-origin: distro-proposed |
668 | |
669 | === added file 'bundles/lxd/source/nova-liberty.yaml' |
670 | --- bundles/lxd/source/nova-liberty.yaml 1970-01-01 00:00:00 +0000 |
671 | +++ bundles/lxd/source/nova-liberty.yaml 2016-03-21 15:03:28 +0000 |
672 | @@ -0,0 +1,16 @@ |
673 | +repositories: |
674 | + - {name: requirements, |
675 | + repository: 'git://github.com/zulcss/requirements', |
676 | + branch: stable/liberty} |
677 | + - {name: nova-lxd, |
678 | + repository: 'git://github.com/zulcss/nova-lxd', |
679 | + branch: stable/liberty} |
680 | + - {name: pylxd, |
681 | + repository: 'git://github.com/zulcss/pylxd', |
682 | + branch: stable/liberty} |
683 | + - {name: nova, |
684 | + repository: 'git://github.com/openstack/nova', |
685 | + branch: stable/liberty} |
686 | +directory: /mnt/openstack-git |
687 | +http_proxy: http://squid.internal:3128 |
688 | +https_proxy: http://squid.internal:3128 |
689 | |
690 | === added file 'bundles/lxd/source/nova-master.yaml' |
691 | --- bundles/lxd/source/nova-master.yaml 1970-01-01 00:00:00 +0000 |
692 | +++ bundles/lxd/source/nova-master.yaml 2016-03-21 15:03:28 +0000 |
693 | @@ -0,0 +1,18 @@ |
694 | +# Update this file to point to master when Xenial |
695 | +# is available |
696 | +repositories: |
697 | + - {name: requirements, |
698 | + repository: 'git://github.com/zulcss/requirements', |
699 | + branch: master} |
700 | + - {name: nova-lxd, |
701 | + repository: 'git://github.com/lxc/nova-lxd', |
702 | + branch: master} |
703 | + - {name: pylxd, |
704 | + repository: 'git://github.com/lxc/pylxd', |
705 | + branch: master} |
706 | + - {name: nova, |
707 | + repository: 'git://github.com/openstack/nova', |
708 | + branch: 13.0.0.0b3} |
709 | +directory: /mnt/openstack-git |
710 | +http_proxy: http://squid.internal:3128 |
711 | +https_proxy: http://squid.internal:3128 |
712 | |
713 | === removed file 'bundles/lxd/source/nova-master.yaml' |
714 | --- bundles/lxd/source/nova-master.yaml 2015-07-23 20:48:46 +0000 |
715 | +++ bundles/lxd/source/nova-master.yaml 1970-01-01 00:00:00 +0000 |
716 | @@ -1,19 +0,0 @@ |
717 | -repositories: |
718 | - - {name: requirements, |
719 | - repository: 'git://github.com/openstack/requirements', |
720 | - branch: master} |
721 | - - {name: neutron, |
722 | - repository: 'git://github.com/openstack/neutron', |
723 | - branch: master} |
724 | - - {name: pylxd, |
725 | - repository: 'https://github.com/lxc/pylxd', |
726 | - branch: master} |
727 | - - {name: nova-compute-lxd, |
728 | - repository: 'https://github.com/lxc/nova-compute-lxd', |
729 | - branch: master} |
730 | - - {name: nova, |
731 | - repository: 'git://github.com/openstack/nova', |
732 | - branch: master} |
733 | -directory: /mnt/openstack-git |
734 | -http_proxy: http://squid.internal:3128 |
735 | -https_proxy: http://squid.internal:3128 |
I'd like to stick with the original o-c-t method of keeping YMMV/in-flight stuff in bundles/dev.
Here's what I'd like to see:
bundles/dev/lxd/*
In-flight, development bundle things. Things may move, come and go and disappear here. The dev dir can be the wild west. Nothing in the dev dir is automated. Some things there may be temporary WIP duplicates of bundles/lxd bits, and that is ok.
bundles/lxd/*
Should contain only maintained reference bundles. Other people will ask, we will point them here. We will also test from here. No need for a QA dir, as that is implied for anything in this dir.
bundles/ lxd/source/ next.yaml lxd/source/ stable. yaml
bundles/
Deploy from source bundles. These are/may/will be automated. These should be THE reference lxd bundles for deploy-from-source, next and stable.
bundles/ lxd/next. yaml lxd/stable. yaml
bundles/
This is automated. Keep these here as THE reference lxd bundles for the stable and next charms sets.
All bundles in o-c-t should indicate stable or next in the bundle file name. Most of your work will likely be next, and that's ok. If I need to create a stable bundle based on that, I can do that later without a file name conflict. So, for example, there wouldn't be a lxd.yaml bundle file anywhere in the mix.
Your bot who relies on programmatically predictable and stable file and folder names thanks you a ton. :-)