Openstack Mojo Testing

Merge lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi into lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802

  1. fix-gnocchi
  2. Merge into openstack-mojo-specs-1802
Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 356
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi
Merge into: lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802
Diff against target: 602 lines (+70/-112)
8 files modified
helper/bundles/full-next.yaml (+11/-17)
helper/bundles/full-ssl-next.yaml (+11/-17)
helper/bundles/full-ssl.yaml (+5/-13)
helper/bundles/full.yaml (+7/-15)
helper/bundles/ha-next.yaml (+12/-12)
helper/bundles/ha.yaml (+8/-8)
helper/bundles/ksv3-full-next.yaml (+11/-17)
helper/bundles/ksv3-full.yaml (+5/-13)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+340736@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

@beisner hold off on this one, I think it may need to revert gnocchi on xenial-newton as well

lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi updated
354. By Chris MacNaughton

xenial-newton also needs the mongo version

also remove yakkety specs from bundle

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

I'm running this in OSCI @ http://10.245.162.49:8080/job/mojo_runner/5097/ with xenial-mitaka

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Changed to http://10.245.162.49:8080/job/mojo_runner/5099/ - running plain next, rather than ssl-next

lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi updated
355. By Chris MacNaughton

Merge 18-02

356. By Chris MacNaughton

remove gnocchi from full-next on xenial-mitaka/newton too

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

After timeout from OSCI, manually confirmed that this fixes full_next on xenial-mitaka

lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi updated
357. By Chris MacNaughton

revert gnocchi change pre-queens

358. By Chris MacNaughton

add gnocchi in pike

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 'helper/bundles/full-next.yaml'
2--- helper/bundles/full-next.yaml 2018-02-28 12:22:30 +0000
3+++ helper/bundles/full-next.yaml 2018-03-07 08:34:40 +0000
4@@ -284,7 +284,7 @@
5 source: ppa:ubuntu-cloud-archive/liberty-staging
6 # mitaka
7 trusty-mitaka:
8- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
9+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
10 series: trusty
11 overrides:
12 openstack-origin: cloud:trusty-mitaka
13@@ -300,7 +300,7 @@
14 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
15 source: ppa:ubuntu-cloud-archive/mitaka-staging
16 xenial-mitaka:
17- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
18+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
19 series: xenial
20 xenial-mitaka-proposed:
21 inherits: xenial-mitaka
22@@ -309,7 +309,7 @@
23 openstack-origin: distro-proposed
24 # newton
25 xenial-newton:
26- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
27+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
28 series: xenial
29 overrides:
30 openstack-origin: cloud:xenial-newton
31@@ -324,17 +324,9 @@
32 overrides:
33 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
34 source: ppa:ubuntu-cloud-archive/newton-staging
35-yakkety-newton:
36- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
37- series: yakkety
38-yakkety-newton-proposed:
39- inherits: yakkety-newton
40- overrides:
41- source: proposed
42- openstack-origin: distro-proposed
43 # ocata
44 xenial-ocata:
45- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
46+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
47 series: xenial
48 overrides:
49 openstack-origin: cloud:xenial-ocata
50@@ -350,11 +342,11 @@
51 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
52 source: ppa:ubuntu-cloud-archive/ocata-staging
53 zesty-ocata:
54- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
55+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
56 series: zesty
57 # pike
58 xenial-pike:
59- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
60+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
61 series: xenial
62 overrides:
63 openstack-origin: cloud:xenial-pike
64@@ -370,15 +362,17 @@
65 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
66 source: ppa:ubuntu-cloud-archive/pike-staging
67 artful-pike:
68- inherits: openstack-icehouse
69+ inherits: xenial-pike
70 series: artful
71 xenial-queens:
72- inherits: xenial-pike
73+ inherits: [ openstack-icehouse, ceilometer-gnocchi ]
74+ series: xenial
75 overrides:
76 openstack-origin: cloud:xenial-queens/proposed
77 source: cloud:xenial-queens/proposed
78 bionic-queens:
79- inherits: xenial-pike
80+ inherits: xenial-queens
81+ series: bionic
82 overrides:
83 openstack-origin: distro-proposed
84 source: distro-proposed
85
86=== modified file 'helper/bundles/full-ssl-next.yaml'
87--- helper/bundles/full-ssl-next.yaml 2018-02-28 12:22:30 +0000
88+++ helper/bundles/full-ssl-next.yaml 2018-03-07 08:34:40 +0000
89@@ -288,7 +288,7 @@
90 source: ppa:ubuntu-cloud-archive/liberty-staging
91 # mitaka
92 trusty-mitaka:
93- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
94+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
95 series: trusty
96 overrides:
97 openstack-origin: cloud:trusty-mitaka
98@@ -304,7 +304,7 @@
99 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
100 source: ppa:ubuntu-cloud-archive/mitaka-staging
101 xenial-mitaka:
102- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
103+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
104 series: xenial
105 xenial-mitaka-proposed:
106 inherits: xenial-mitaka
107@@ -313,7 +313,7 @@
108 openstack-origin: distro-proposed
109 # newton
110 xenial-newton:
111- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
112+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
113 series: xenial
114 overrides:
115 openstack-origin: cloud:xenial-newton
116@@ -328,17 +328,9 @@
117 overrides:
118 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
119 source: ppa:ubuntu-cloud-archive/newton-staging
120-yakkety-newton:
121- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
122- series: yakkety
123-yakkety-newton-proposed:
124- inherits: yakkety-newton
125- overrides:
126- source: proposed
127- openstack-origin: distro-proposed
128 # ocata
129 xenial-ocata:
130- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
131+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
132 series: xenial
133 overrides:
134 openstack-origin: cloud:xenial-ocata
135@@ -354,7 +346,7 @@
136 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
137 source: ppa:ubuntu-cloud-archive/ocata-staging
138 zesty-ocata:
139- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
140+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
141 series: zesty
142 zesty-ocata-proposed:
143 inherits: zesty-ocata
144@@ -363,7 +355,7 @@
145 openstack-origin: distro-proposed
146 # pike
147 xenial-pike:
148- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
149+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
150 series: xenial
151 overrides:
152 openstack-origin: cloud:xenial-pike
153@@ -379,7 +371,7 @@
154 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
155 source: ppa:ubuntu-cloud-archive/pike-staging
156 artful-pike:
157- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
158+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
159 series: artful
160 artful-pike-proposed:
161 inherits: artful-pike
162@@ -387,12 +379,14 @@
163 source: proposed
164 openstack-origin: distro-proposed
165 xenial-queens:
166- inherits: xenial-pike
167+ inherits: [ openstack-icehouse, ceilometer-gnocchi ]
168+ series: xenial
169 overrides:
170 openstack-origin: cloud:xenial-queens/proposed
171 source: cloud:xenial-queens/proposed
172 bionic-queens:
173- inherits: xenial-pike
174+ inherits: xenial-queens
175+ series: queens
176 overrides:
177 openstack-origin: distro-proposed
178 source: distro-proposed
179
180=== modified file 'helper/bundles/full-ssl.yaml'
181--- helper/bundles/full-ssl.yaml 2018-02-28 12:22:30 +0000
182+++ helper/bundles/full-ssl.yaml 2018-03-07 08:34:40 +0000
183@@ -288,7 +288,7 @@
184 source: ppa:ubuntu-cloud-archive/liberty-staging
185 # mitaka
186 trusty-mitaka:
187- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
188+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
189 series: trusty
190 overrides:
191 openstack-origin: cloud:trusty-mitaka
192@@ -304,7 +304,7 @@
193 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
194 source: ppa:ubuntu-cloud-archive/mitaka-staging
195 xenial-mitaka:
196- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
197+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
198 series: xenial
199 xenial-mitaka-proposed:
200 inherits: xenial-mitaka
201@@ -313,7 +313,7 @@
202 openstack-origin: distro-proposed
203 # newton
204 xenial-newton:
205- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
206+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
207 series: xenial
208 overrides:
209 openstack-origin: cloud:xenial-newton
210@@ -328,17 +328,9 @@
211 overrides:
212 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
213 source: ppa:ubuntu-cloud-archive/newton-staging
214-yakkety-newton:
215- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
216- series: yakkety
217-yakkety-newton-proposed:
218- inherits: yakkety-newton
219- overrides:
220- source: proposed
221- openstack-origin: distro-proposed
222 # ocata
223 xenial-ocata:
224- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
225+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
226 series: xenial
227 overrides:
228 openstack-origin: cloud:xenial-ocata
229@@ -354,7 +346,7 @@
230 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
231 source: ppa:ubuntu-cloud-archive/ocata-staging
232 zesty-ocata:
233- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
234+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
235 series: zesty
236 zesty-ocata-proposed:
237 inherits: zesty-ocata
238
239=== modified file 'helper/bundles/full.yaml'
240--- helper/bundles/full.yaml 2018-02-28 12:22:30 +0000
241+++ helper/bundles/full.yaml 2018-03-07 08:34:40 +0000
242@@ -291,7 +291,7 @@
243 source: ppa:ubuntu-cloud-archive/liberty-staging
244 # mitaka
245 trusty-mitaka:
246- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
247+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
248 series: trusty
249 overrides:
250 openstack-origin: cloud:trusty-mitaka
251@@ -307,7 +307,7 @@
252 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
253 source: ppa:ubuntu-cloud-archive/mitaka-staging
254 xenial-mitaka:
255- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
256+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
257 series: xenial
258 xenial-mitaka-proposed:
259 inherits: xenial-mitaka
260@@ -316,7 +316,7 @@
261 openstack-origin: distro-proposed
262 # newton
263 xenial-newton:
264- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
265+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
266 series: xenial
267 overrides:
268 openstack-origin: cloud:xenial-newton
269@@ -331,31 +331,23 @@
270 overrides:
271 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
272 source: ppa:ubuntu-cloud-archive/newton-staging
273-yakkety-newton:
274- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
275- series: yakkety
276-yakkety-newton-proposed:
277- inherits: yakkety-newton
278- overrides:
279- source: proposed
280- openstack-origin: distro-proposed
281 # ocata
282 xenial-ocata:
283- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
284+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
285 series: xenial
286 overrides:
287 openstack-origin: cloud:xenial-ocata
288 source: cloud:xenial-ocata
289 zesty-ocata:
290- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
291+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
292 series: zesty
293 # pike
294 xenial-pike:
295- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
296+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
297 series: xenial
298 overrides:
299 openstack-origin: cloud:xenial-pike
300 source: cloud:xenial-pike
301 artful-pike:
302- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
303+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
304 series: artful
305
306=== modified file 'helper/bundles/ha-next.yaml'
307--- helper/bundles/ha-next.yaml 2018-02-28 12:22:30 +0000
308+++ helper/bundles/ha-next.yaml 2018-03-07 08:34:40 +0000
309@@ -291,19 +291,19 @@
310 openstack-origin: cloud:trusty-liberty
311 source: cloud:trusty-liberty
312 trusty-mitaka-ha:
313- inherits: [ openstack-services, ceilometer-gnocchi ]
314+ inherits: [ openstack-services, ceilometer-mongodb ]
315 series: trusty
316 overrides:
317 openstack-origin: cloud:trusty-mitaka/proposed
318 source: cloud:trusty-mitaka
319 trusty-mitaka-proposed:
320- inherits: [ openstack-services, ceilometer-gnocchi ]
321+ inherits: [ openstack-services, ceilometer-mongodb ]
322 series: trusty
323 overrides:
324 openstack-origin: cloud:trusty-mitaka/proposed
325 source: cloud:trusty-mitaka/proposed
326 xenial-mitaka-ha:
327- inherits: [ openstack-services, ceilometer-gnocchi ]
328+ inherits: [ openstack-services, ceilometer-mongodb ]
329 series: xenial
330 overrides:
331 ha-bindiface: ens2
332@@ -314,7 +314,7 @@
333 openstack-origin: distro-proposed
334 ha-bindiface: ens2
335 xenial-newton-ha:
336- inherits: [ openstack-services, ceilometer-gnocchi ]
337+ inherits: [ openstack-services, ceilometer-mongodb ]
338 series: xenial
339 overrides:
340 ha-bindiface: ens2
341@@ -322,39 +322,39 @@
342 source: cloud:xenial-newton
343 # ocata
344 xenial-ocata-ha:
345- inherits: [ openstack-services, ceilometer-gnocchi ]
346+ inherits: [ openstack-services, ceilometer-mongodb ]
347 series: xenial
348 overrides:
349 ha-bindiface: ens2
350 openstack-origin: cloud:xenial-ocata
351 source: cloud:xenial-ocata
352 zesty-ocata-ha:
353- inherits: [ openstack-services, ceilometer-gnocchi ]
354+ inherits: [ openstack-services, ceilometer-mongodb ]
355 series: zesty
356 overrides:
357 ha-bindiface: ens2
358 # pike
359 xenial-pike-ha:
360- inherits: [ openstack-services, ceilometer-gnocchi ]
361+ inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
362 series: xenial
363 overrides:
364 ha-bindiface: ens2
365 openstack-origin: cloud:xenial-pike
366 source: cloud:xenial-pike
367 artful-pike-ha:
368- inherits: [ openstack-services, ceilometer-gnocchi ]
369+ inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
370 series: artful
371 overrides:
372 ha-bindiface: ens2
373 # queens
374-xenial-queens:
375- inherits: xenial-pike-ha
376+xenial-queens-ha:
377+ inherits: [ openstack-services, ceilometer-gnocchi ]
378 series: xenial
379 overrides:
380 openstack-origin: cloud:xenial-queens/proposed
381 source: cloud:xenial-queens/proposed
382-bionic-queens:
383- inherits: xenial-pike-ha
384+bionic-queens-ha:
385+ inherits: xenial-queens-ha
386 series: bionic
387 overrides:
388 openstack-origin: distro-proposed
389
390=== modified file 'helper/bundles/ha.yaml'
391--- helper/bundles/ha.yaml 2018-02-28 12:22:30 +0000
392+++ helper/bundles/ha.yaml 2018-03-07 08:34:40 +0000
393@@ -294,19 +294,19 @@
394 openstack-origin: cloud:trusty-liberty
395 source: cloud:trusty-liberty
396 trusty-mitaka-ha:
397- inherits: [ openstack-services, ceilometer-gnocchi ]
398+ inherits: [ openstack-services, ceilometer-mongodb ]
399 series: trusty
400 overrides:
401 openstack-origin: cloud:trusty-mitaka/proposed
402 source: cloud:trusty-mitaka
403 trusty-mitaka-proposed:
404- inherits: [ openstack-services, ceilometer-gnocchi ]
405+ inherits: [ openstack-services, ceilometer-mongodb ]
406 series: trusty
407 overrides:
408 openstack-origin: cloud:trusty-mitaka/proposed
409 source: cloud:trusty-mitaka/proposed
410 xenial-mitaka-ha:
411- inherits: [ openstack-services, ceilometer-gnocchi ]
412+ inherits: [ openstack-services, ceilometer-mongodb ]
413 series: xenial
414 services:
415 mysql:
416@@ -318,28 +318,28 @@
417 openstack-origin: distro-proposed
418 # newton
419 xenial-newton-ha:
420- inherits: [ openstack-services, ceilometer-gnocchi ]
421+ inherits: [ openstack-services, ceilometer-mongodb ]
422 series: xenial
423 overrides:
424 openstack-origin: cloud:xenial-newton
425 source: cloud:xenial-newton
426 # ocata
427 xenial-ocata-ha:
428- inherits: [ openstack-services, ceilometer-gnocchi ]
429+ inherits: [ openstack-services, ceilometer-mongodb ]
430 series: xenial
431 overrides:
432 openstack-origin: cloud:xenial-ocata
433 source: cloud:xenial-ocata
434 zesty-ocata-ha:
435- inherits: [ openstack-services, ceilometer-gnocchi ]
436+ inherits: [ openstack-services, ceilometer-mongodb ]
437 series: zesty
438 # pike
439 xenial-pike-ha:
440- inherits: [ openstack-services, ceilometer-gnocchi ]
441+ inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
442 series: xenial
443 overrides:
444 openstack-origin: cloud:xenial-pike
445 source: cloud:xenial-pike
446 artful-pike-ha:
447- inherits: [ openstack-services, ceilometer-gnocchi ]
448+ inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
449 series: artful
450
451=== modified file 'helper/bundles/ksv3-full-next.yaml'
452--- helper/bundles/ksv3-full-next.yaml 2018-02-28 12:22:30 +0000
453+++ helper/bundles/ksv3-full-next.yaml 2018-03-07 08:34:40 +0000
454@@ -299,7 +299,7 @@
455 source: ppa:ubuntu-cloud-archive/liberty-staging
456 # mitaka
457 trusty-mitaka:
458- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
459+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
460 series: trusty
461 overrides:
462 openstack-origin: cloud:trusty-mitaka
463@@ -315,7 +315,7 @@
464 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
465 source: ppa:ubuntu-cloud-archive/mitaka-staging
466 xenial-mitaka:
467- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
468+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
469 series: xenial
470 xenial-mitaka-proposed:
471 inherits: xenial-mitaka
472@@ -324,7 +324,7 @@
473 openstack-origin: distro-proposed
474 # newton
475 xenial-newton:
476- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
477+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
478 series: xenial
479 overrides:
480 openstack-origin: cloud:xenial-newton
481@@ -339,17 +339,9 @@
482 overrides:
483 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
484 source: ppa:ubuntu-cloud-archive/newton-staging
485-yakkety-newton:
486- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
487- series: yakkety
488-yakkety-newton-proposed:
489- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
490- overrides:
491- source: proposed
492- openstack-origin: distro-proposed
493 # ocata
494 xenial-ocata:
495- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
496+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
497 series: xenial
498 overrides:
499 openstack-origin: cloud:xenial-ocata
500@@ -365,7 +357,7 @@
501 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
502 source: ppa:ubuntu-cloud-archive/ocata-staging
503 zesty-ocata:
504- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
505+ inherits: [ openstack-icehouse, ceilometer-mongodb ]
506 series: zesty
507 zesty-ocata-proposed:
508 inherits: zesty-ocata
509@@ -374,7 +366,7 @@
510 openstack-origin: distro-proposed
511 # pike
512 xenial-pike:
513- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
514+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
515 series: xenial
516 overrides:
517 openstack-origin: cloud:xenial-pike
518@@ -390,7 +382,7 @@
519 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
520 source: ppa:ubuntu-cloud-archive/pike-staging
521 artful-pike:
522- inherits: [ openstack-icehouse, ceilometer-gnocchi ]
523+ inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
524 series: artful
525 artful-pike-proposed:
526 inherits: artful-pike
527@@ -399,12 +391,14 @@
528 openstack-origin: distro-proposed
529 # queens
530 xenial-queens:
531- inherits: xenial-pike
532+ inherits: [ openstack-icehouse, ceilometer-gnocchi ]
533+ series: xenial
534 overrides:
535 openstack-origin: cloud:xenial-queens/proposed
536 source: cloud:xenial-queens/proposed
537 bionic-queens:
538- inherits: xenial-pike
539+ inherits: xenial-queens
540+ series: bionic
541 overrides:
542 openstack-origin: distro-proposed
543 source: distro-proposed
544
545=== modified file 'helper/bundles/ksv3-full.yaml'
546--- helper/bundles/ksv3-full.yaml 2018-02-28 12:22:30 +0000
547+++ helper/bundles/ksv3-full.yaml 2018-03-07 08:34:40 +0000
548@@ -299,7 +299,7 @@
549 source: ppa:ubuntu-cloud-archive/liberty-staging
550 # mitaka
551 trusty-mitaka:
552- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
553+ inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
554 series: trusty
555 overrides:
556 openstack-origin: cloud:trusty-mitaka
557@@ -315,7 +315,7 @@
558 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
559 source: ppa:ubuntu-cloud-archive/mitaka-staging
560 xenial-mitaka:
561- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
562+ inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
563 series: xenial
564 xenial-mitaka-proposed:
565 inherits: xenial-mitaka
566@@ -324,7 +324,7 @@
567 openstack-origin: distro-proposed
568 # newton
569 xenial-newton:
570- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
571+ inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
572 series: xenial
573 overrides:
574 openstack-origin: cloud:xenial-newton
575@@ -339,17 +339,9 @@
576 overrides:
577 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
578 source: ppa:ubuntu-cloud-archive/newton-staging
579-yakkety-newton:
580- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
581- series: yakkety
582-yakkety-newton-proposed:
583- inherits: yakkety-newton
584- overrides:
585- source: proposed
586- openstack-origin: distro-proposed
587 # ocata
588 xenial-ocata:
589- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
590+ inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
591 series: xenial
592 overrides:
593 openstack-origin: cloud:xenial-ocata
594@@ -365,7 +357,7 @@
595 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
596 source: ppa:ubuntu-cloud-archive/ocata-staging
597 zesty-ocata:
598- inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
599+ inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
600 series: zesty
601 zesty-ocata-proposed:
602 inherits: zesty-ocata

Subscribers

People subscribed via source and target branches