Merge lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi into lp:~ost-maintainers/openstack-mojo-specs/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

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

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

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
=== modified file 'helper/bundles/full-next.yaml'
--- helper/bundles/full-next.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/full-next.yaml 2018-03-07 08:34:40 +0000
@@ -284,7 +284,7 @@
284 source: ppa:ubuntu-cloud-archive/liberty-staging284 source: ppa:ubuntu-cloud-archive/liberty-staging
285# mitaka285# mitaka
286trusty-mitaka:286trusty-mitaka:
287 inherits: [ openstack-icehouse, ceilometer-gnocchi ]287 inherits: [ openstack-icehouse, ceilometer-mongodb ]
288 series: trusty288 series: trusty
289 overrides:289 overrides:
290 openstack-origin: cloud:trusty-mitaka290 openstack-origin: cloud:trusty-mitaka
@@ -300,7 +300,7 @@
300 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging300 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
301 source: ppa:ubuntu-cloud-archive/mitaka-staging301 source: ppa:ubuntu-cloud-archive/mitaka-staging
302xenial-mitaka:302xenial-mitaka:
303 inherits: [ openstack-icehouse, ceilometer-gnocchi ]303 inherits: [ openstack-icehouse, ceilometer-mongodb ]
304 series: xenial304 series: xenial
305xenial-mitaka-proposed:305xenial-mitaka-proposed:
306 inherits: xenial-mitaka306 inherits: xenial-mitaka
@@ -309,7 +309,7 @@
309 openstack-origin: distro-proposed309 openstack-origin: distro-proposed
310# newton310# newton
311xenial-newton:311xenial-newton:
312 inherits: [ openstack-icehouse, ceilometer-gnocchi ]312 inherits: [ openstack-icehouse, ceilometer-mongodb ]
313 series: xenial313 series: xenial
314 overrides:314 overrides:
315 openstack-origin: cloud:xenial-newton315 openstack-origin: cloud:xenial-newton
@@ -324,17 +324,9 @@
324 overrides:324 overrides:
325 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging325 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
326 source: ppa:ubuntu-cloud-archive/newton-staging326 source: ppa:ubuntu-cloud-archive/newton-staging
327yakkety-newton:
328 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
329 series: yakkety
330yakkety-newton-proposed:
331 inherits: yakkety-newton
332 overrides:
333 source: proposed
334 openstack-origin: distro-proposed
335# ocata327# ocata
336xenial-ocata:328xenial-ocata:
337 inherits: [ openstack-icehouse, ceilometer-gnocchi ]329 inherits: [ openstack-icehouse, ceilometer-mongodb ]
338 series: xenial330 series: xenial
339 overrides:331 overrides:
340 openstack-origin: cloud:xenial-ocata332 openstack-origin: cloud:xenial-ocata
@@ -350,11 +342,11 @@
350 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging342 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
351 source: ppa:ubuntu-cloud-archive/ocata-staging343 source: ppa:ubuntu-cloud-archive/ocata-staging
352zesty-ocata:344zesty-ocata:
353 inherits: [ openstack-icehouse, ceilometer-gnocchi ]345 inherits: [ openstack-icehouse, ceilometer-mongodb ]
354 series: zesty346 series: zesty
355# pike347# pike
356xenial-pike:348xenial-pike:
357 inherits: [ openstack-icehouse, ceilometer-gnocchi ]349 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
358 series: xenial350 series: xenial
359 overrides:351 overrides:
360 openstack-origin: cloud:xenial-pike352 openstack-origin: cloud:xenial-pike
@@ -370,15 +362,17 @@
370 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging362 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
371 source: ppa:ubuntu-cloud-archive/pike-staging363 source: ppa:ubuntu-cloud-archive/pike-staging
372artful-pike:364artful-pike:
373 inherits: openstack-icehouse365 inherits: xenial-pike
374 series: artful366 series: artful
375xenial-queens:367xenial-queens:
376 inherits: xenial-pike368 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
369 series: xenial
377 overrides:370 overrides:
378 openstack-origin: cloud:xenial-queens/proposed371 openstack-origin: cloud:xenial-queens/proposed
379 source: cloud:xenial-queens/proposed372 source: cloud:xenial-queens/proposed
380bionic-queens:373bionic-queens:
381 inherits: xenial-pike374 inherits: xenial-queens
375 series: bionic
382 overrides:376 overrides:
383 openstack-origin: distro-proposed377 openstack-origin: distro-proposed
384 source: distro-proposed378 source: distro-proposed
385379
=== modified file 'helper/bundles/full-ssl-next.yaml'
--- helper/bundles/full-ssl-next.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/full-ssl-next.yaml 2018-03-07 08:34:40 +0000
@@ -288,7 +288,7 @@
288 source: ppa:ubuntu-cloud-archive/liberty-staging288 source: ppa:ubuntu-cloud-archive/liberty-staging
289# mitaka289# mitaka
290trusty-mitaka:290trusty-mitaka:
291 inherits: [ openstack-icehouse, ceilometer-gnocchi ]291 inherits: [ openstack-icehouse, ceilometer-mongodb ]
292 series: trusty292 series: trusty
293 overrides:293 overrides:
294 openstack-origin: cloud:trusty-mitaka294 openstack-origin: cloud:trusty-mitaka
@@ -304,7 +304,7 @@
304 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging304 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
305 source: ppa:ubuntu-cloud-archive/mitaka-staging305 source: ppa:ubuntu-cloud-archive/mitaka-staging
306xenial-mitaka:306xenial-mitaka:
307 inherits: [ openstack-icehouse, ceilometer-gnocchi ]307 inherits: [ openstack-icehouse, ceilometer-mongodb ]
308 series: xenial308 series: xenial
309xenial-mitaka-proposed:309xenial-mitaka-proposed:
310 inherits: xenial-mitaka310 inherits: xenial-mitaka
@@ -313,7 +313,7 @@
313 openstack-origin: distro-proposed313 openstack-origin: distro-proposed
314# newton314# newton
315xenial-newton:315xenial-newton:
316 inherits: [ openstack-icehouse, ceilometer-gnocchi ]316 inherits: [ openstack-icehouse, ceilometer-mongodb ]
317 series: xenial317 series: xenial
318 overrides:318 overrides:
319 openstack-origin: cloud:xenial-newton319 openstack-origin: cloud:xenial-newton
@@ -328,17 +328,9 @@
328 overrides:328 overrides:
329 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging329 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
330 source: ppa:ubuntu-cloud-archive/newton-staging330 source: ppa:ubuntu-cloud-archive/newton-staging
331yakkety-newton:
332 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
333 series: yakkety
334yakkety-newton-proposed:
335 inherits: yakkety-newton
336 overrides:
337 source: proposed
338 openstack-origin: distro-proposed
339# ocata331# ocata
340xenial-ocata:332xenial-ocata:
341 inherits: [ openstack-icehouse, ceilometer-gnocchi ]333 inherits: [ openstack-icehouse, ceilometer-mongodb ]
342 series: xenial334 series: xenial
343 overrides:335 overrides:
344 openstack-origin: cloud:xenial-ocata336 openstack-origin: cloud:xenial-ocata
@@ -354,7 +346,7 @@
354 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging346 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
355 source: ppa:ubuntu-cloud-archive/ocata-staging347 source: ppa:ubuntu-cloud-archive/ocata-staging
356zesty-ocata:348zesty-ocata:
357 inherits: [ openstack-icehouse, ceilometer-gnocchi ]349 inherits: [ openstack-icehouse, ceilometer-mongodb ]
358 series: zesty350 series: zesty
359zesty-ocata-proposed:351zesty-ocata-proposed:
360 inherits: zesty-ocata352 inherits: zesty-ocata
@@ -363,7 +355,7 @@
363 openstack-origin: distro-proposed355 openstack-origin: distro-proposed
364# pike356# pike
365xenial-pike:357xenial-pike:
366 inherits: [ openstack-icehouse, ceilometer-gnocchi ]358 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
367 series: xenial359 series: xenial
368 overrides:360 overrides:
369 openstack-origin: cloud:xenial-pike361 openstack-origin: cloud:xenial-pike
@@ -379,7 +371,7 @@
379 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging371 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
380 source: ppa:ubuntu-cloud-archive/pike-staging372 source: ppa:ubuntu-cloud-archive/pike-staging
381artful-pike:373artful-pike:
382 inherits: [ openstack-icehouse, ceilometer-gnocchi ]374 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
383 series: artful375 series: artful
384artful-pike-proposed:376artful-pike-proposed:
385 inherits: artful-pike377 inherits: artful-pike
@@ -387,12 +379,14 @@
387 source: proposed379 source: proposed
388 openstack-origin: distro-proposed380 openstack-origin: distro-proposed
389xenial-queens:381xenial-queens:
390 inherits: xenial-pike382 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
383 series: xenial
391 overrides:384 overrides:
392 openstack-origin: cloud:xenial-queens/proposed385 openstack-origin: cloud:xenial-queens/proposed
393 source: cloud:xenial-queens/proposed386 source: cloud:xenial-queens/proposed
394bionic-queens:387bionic-queens:
395 inherits: xenial-pike388 inherits: xenial-queens
389 series: queens
396 overrides:390 overrides:
397 openstack-origin: distro-proposed391 openstack-origin: distro-proposed
398 source: distro-proposed392 source: distro-proposed
399393
=== modified file 'helper/bundles/full-ssl.yaml'
--- helper/bundles/full-ssl.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/full-ssl.yaml 2018-03-07 08:34:40 +0000
@@ -288,7 +288,7 @@
288 source: ppa:ubuntu-cloud-archive/liberty-staging288 source: ppa:ubuntu-cloud-archive/liberty-staging
289# mitaka289# mitaka
290trusty-mitaka:290trusty-mitaka:
291 inherits: [ openstack-icehouse, ceilometer-gnocchi ]291 inherits: [ openstack-icehouse, ceilometer-mongodb ]
292 series: trusty292 series: trusty
293 overrides:293 overrides:
294 openstack-origin: cloud:trusty-mitaka294 openstack-origin: cloud:trusty-mitaka
@@ -304,7 +304,7 @@
304 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging304 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
305 source: ppa:ubuntu-cloud-archive/mitaka-staging305 source: ppa:ubuntu-cloud-archive/mitaka-staging
306xenial-mitaka:306xenial-mitaka:
307 inherits: [ openstack-icehouse, ceilometer-gnocchi ]307 inherits: [ openstack-icehouse, ceilometer-mongodb ]
308 series: xenial308 series: xenial
309xenial-mitaka-proposed:309xenial-mitaka-proposed:
310 inherits: xenial-mitaka310 inherits: xenial-mitaka
@@ -313,7 +313,7 @@
313 openstack-origin: distro-proposed313 openstack-origin: distro-proposed
314# newton314# newton
315xenial-newton:315xenial-newton:
316 inherits: [ openstack-icehouse, ceilometer-gnocchi ]316 inherits: [ openstack-icehouse, ceilometer-mongodb ]
317 series: xenial317 series: xenial
318 overrides:318 overrides:
319 openstack-origin: cloud:xenial-newton319 openstack-origin: cloud:xenial-newton
@@ -328,17 +328,9 @@
328 overrides:328 overrides:
329 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging329 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
330 source: ppa:ubuntu-cloud-archive/newton-staging330 source: ppa:ubuntu-cloud-archive/newton-staging
331yakkety-newton:
332 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
333 series: yakkety
334yakkety-newton-proposed:
335 inherits: yakkety-newton
336 overrides:
337 source: proposed
338 openstack-origin: distro-proposed
339# ocata331# ocata
340xenial-ocata:332xenial-ocata:
341 inherits: [ openstack-icehouse, ceilometer-gnocchi ]333 inherits: [ openstack-icehouse, ceilometer-mongodb ]
342 series: xenial334 series: xenial
343 overrides:335 overrides:
344 openstack-origin: cloud:xenial-ocata336 openstack-origin: cloud:xenial-ocata
@@ -354,7 +346,7 @@
354 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging346 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
355 source: ppa:ubuntu-cloud-archive/ocata-staging347 source: ppa:ubuntu-cloud-archive/ocata-staging
356zesty-ocata:348zesty-ocata:
357 inherits: [ openstack-icehouse, ceilometer-gnocchi ]349 inherits: [ openstack-icehouse, ceilometer-mongodb ]
358 series: zesty350 series: zesty
359zesty-ocata-proposed:351zesty-ocata-proposed:
360 inherits: zesty-ocata352 inherits: zesty-ocata
361353
=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/full.yaml 2018-03-07 08:34:40 +0000
@@ -291,7 +291,7 @@
291 source: ppa:ubuntu-cloud-archive/liberty-staging291 source: ppa:ubuntu-cloud-archive/liberty-staging
292# mitaka292# mitaka
293trusty-mitaka:293trusty-mitaka:
294 inherits: [ openstack-icehouse, ceilometer-gnocchi ]294 inherits: [ openstack-icehouse, ceilometer-mongodb ]
295 series: trusty295 series: trusty
296 overrides:296 overrides:
297 openstack-origin: cloud:trusty-mitaka297 openstack-origin: cloud:trusty-mitaka
@@ -307,7 +307,7 @@
307 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging307 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
308 source: ppa:ubuntu-cloud-archive/mitaka-staging308 source: ppa:ubuntu-cloud-archive/mitaka-staging
309xenial-mitaka:309xenial-mitaka:
310 inherits: [ openstack-icehouse, ceilometer-gnocchi ]310 inherits: [ openstack-icehouse, ceilometer-mongodb ]
311 series: xenial311 series: xenial
312xenial-mitaka-proposed:312xenial-mitaka-proposed:
313 inherits: xenial-mitaka313 inherits: xenial-mitaka
@@ -316,7 +316,7 @@
316 openstack-origin: distro-proposed316 openstack-origin: distro-proposed
317# newton317# newton
318xenial-newton:318xenial-newton:
319 inherits: [ openstack-icehouse, ceilometer-gnocchi ]319 inherits: [ openstack-icehouse, ceilometer-mongodb ]
320 series: xenial320 series: xenial
321 overrides:321 overrides:
322 openstack-origin: cloud:xenial-newton322 openstack-origin: cloud:xenial-newton
@@ -331,31 +331,23 @@
331 overrides:331 overrides:
332 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging332 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
333 source: ppa:ubuntu-cloud-archive/newton-staging333 source: ppa:ubuntu-cloud-archive/newton-staging
334yakkety-newton:
335 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
336 series: yakkety
337yakkety-newton-proposed:
338 inherits: yakkety-newton
339 overrides:
340 source: proposed
341 openstack-origin: distro-proposed
342# ocata334# ocata
343xenial-ocata:335xenial-ocata:
344 inherits: [ openstack-icehouse, ceilometer-gnocchi ]336 inherits: [ openstack-icehouse, ceilometer-mongodb ]
345 series: xenial337 series: xenial
346 overrides:338 overrides:
347 openstack-origin: cloud:xenial-ocata339 openstack-origin: cloud:xenial-ocata
348 source: cloud:xenial-ocata340 source: cloud:xenial-ocata
349zesty-ocata:341zesty-ocata:
350 inherits: [ openstack-icehouse, ceilometer-gnocchi ]342 inherits: [ openstack-icehouse, ceilometer-mongodb ]
351 series: zesty343 series: zesty
352# pike344# pike
353xenial-pike:345xenial-pike:
354 inherits: [ openstack-icehouse, ceilometer-gnocchi ]346 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
355 series: xenial347 series: xenial
356 overrides:348 overrides:
357 openstack-origin: cloud:xenial-pike349 openstack-origin: cloud:xenial-pike
358 source: cloud:xenial-pike350 source: cloud:xenial-pike
359artful-pike:351artful-pike:
360 inherits: [ openstack-icehouse, ceilometer-gnocchi ]352 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
361 series: artful353 series: artful
362354
=== modified file 'helper/bundles/ha-next.yaml'
--- helper/bundles/ha-next.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/ha-next.yaml 2018-03-07 08:34:40 +0000
@@ -291,19 +291,19 @@
291 openstack-origin: cloud:trusty-liberty291 openstack-origin: cloud:trusty-liberty
292 source: cloud:trusty-liberty292 source: cloud:trusty-liberty
293trusty-mitaka-ha:293trusty-mitaka-ha:
294 inherits: [ openstack-services, ceilometer-gnocchi ]294 inherits: [ openstack-services, ceilometer-mongodb ]
295 series: trusty295 series: trusty
296 overrides:296 overrides:
297 openstack-origin: cloud:trusty-mitaka/proposed297 openstack-origin: cloud:trusty-mitaka/proposed
298 source: cloud:trusty-mitaka298 source: cloud:trusty-mitaka
299trusty-mitaka-proposed:299trusty-mitaka-proposed:
300 inherits: [ openstack-services, ceilometer-gnocchi ]300 inherits: [ openstack-services, ceilometer-mongodb ]
301 series: trusty301 series: trusty
302 overrides:302 overrides:
303 openstack-origin: cloud:trusty-mitaka/proposed303 openstack-origin: cloud:trusty-mitaka/proposed
304 source: cloud:trusty-mitaka/proposed304 source: cloud:trusty-mitaka/proposed
305xenial-mitaka-ha:305xenial-mitaka-ha:
306 inherits: [ openstack-services, ceilometer-gnocchi ]306 inherits: [ openstack-services, ceilometer-mongodb ]
307 series: xenial307 series: xenial
308 overrides:308 overrides:
309 ha-bindiface: ens2309 ha-bindiface: ens2
@@ -314,7 +314,7 @@
314 openstack-origin: distro-proposed314 openstack-origin: distro-proposed
315 ha-bindiface: ens2315 ha-bindiface: ens2
316xenial-newton-ha:316xenial-newton-ha:
317 inherits: [ openstack-services, ceilometer-gnocchi ]317 inherits: [ openstack-services, ceilometer-mongodb ]
318 series: xenial318 series: xenial
319 overrides:319 overrides:
320 ha-bindiface: ens2320 ha-bindiface: ens2
@@ -322,39 +322,39 @@
322 source: cloud:xenial-newton322 source: cloud:xenial-newton
323# ocata323# ocata
324xenial-ocata-ha:324xenial-ocata-ha:
325 inherits: [ openstack-services, ceilometer-gnocchi ]325 inherits: [ openstack-services, ceilometer-mongodb ]
326 series: xenial326 series: xenial
327 overrides:327 overrides:
328 ha-bindiface: ens2328 ha-bindiface: ens2
329 openstack-origin: cloud:xenial-ocata329 openstack-origin: cloud:xenial-ocata
330 source: cloud:xenial-ocata330 source: cloud:xenial-ocata
331zesty-ocata-ha:331zesty-ocata-ha:
332 inherits: [ openstack-services, ceilometer-gnocchi ]332 inherits: [ openstack-services, ceilometer-mongodb ]
333 series: zesty333 series: zesty
334 overrides:334 overrides:
335 ha-bindiface: ens2335 ha-bindiface: ens2
336# pike336# pike
337xenial-pike-ha:337xenial-pike-ha:
338 inherits: [ openstack-services, ceilometer-gnocchi ]338 inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
339 series: xenial339 series: xenial
340 overrides:340 overrides:
341 ha-bindiface: ens2341 ha-bindiface: ens2
342 openstack-origin: cloud:xenial-pike342 openstack-origin: cloud:xenial-pike
343 source: cloud:xenial-pike343 source: cloud:xenial-pike
344artful-pike-ha:344artful-pike-ha:
345 inherits: [ openstack-services, ceilometer-gnocchi ]345 inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
346 series: artful346 series: artful
347 overrides:347 overrides:
348 ha-bindiface: ens2348 ha-bindiface: ens2
349# queens349# queens
350xenial-queens:350xenial-queens-ha:
351 inherits: xenial-pike-ha351 inherits: [ openstack-services, ceilometer-gnocchi ]
352 series: xenial352 series: xenial
353 overrides:353 overrides:
354 openstack-origin: cloud:xenial-queens/proposed354 openstack-origin: cloud:xenial-queens/proposed
355 source: cloud:xenial-queens/proposed355 source: cloud:xenial-queens/proposed
356bionic-queens:356bionic-queens-ha:
357 inherits: xenial-pike-ha357 inherits: xenial-queens-ha
358 series: bionic358 series: bionic
359 overrides:359 overrides:
360 openstack-origin: distro-proposed360 openstack-origin: distro-proposed
361361
=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/ha.yaml 2018-03-07 08:34:40 +0000
@@ -294,19 +294,19 @@
294 openstack-origin: cloud:trusty-liberty294 openstack-origin: cloud:trusty-liberty
295 source: cloud:trusty-liberty295 source: cloud:trusty-liberty
296trusty-mitaka-ha:296trusty-mitaka-ha:
297 inherits: [ openstack-services, ceilometer-gnocchi ]297 inherits: [ openstack-services, ceilometer-mongodb ]
298 series: trusty298 series: trusty
299 overrides:299 overrides:
300 openstack-origin: cloud:trusty-mitaka/proposed300 openstack-origin: cloud:trusty-mitaka/proposed
301 source: cloud:trusty-mitaka301 source: cloud:trusty-mitaka
302trusty-mitaka-proposed:302trusty-mitaka-proposed:
303 inherits: [ openstack-services, ceilometer-gnocchi ]303 inherits: [ openstack-services, ceilometer-mongodb ]
304 series: trusty304 series: trusty
305 overrides:305 overrides:
306 openstack-origin: cloud:trusty-mitaka/proposed306 openstack-origin: cloud:trusty-mitaka/proposed
307 source: cloud:trusty-mitaka/proposed307 source: cloud:trusty-mitaka/proposed
308xenial-mitaka-ha:308xenial-mitaka-ha:
309 inherits: [ openstack-services, ceilometer-gnocchi ]309 inherits: [ openstack-services, ceilometer-mongodb ]
310 series: xenial310 series: xenial
311 services:311 services:
312 mysql:312 mysql:
@@ -318,28 +318,28 @@
318 openstack-origin: distro-proposed318 openstack-origin: distro-proposed
319# newton319# newton
320xenial-newton-ha:320xenial-newton-ha:
321 inherits: [ openstack-services, ceilometer-gnocchi ]321 inherits: [ openstack-services, ceilometer-mongodb ]
322 series: xenial322 series: xenial
323 overrides:323 overrides:
324 openstack-origin: cloud:xenial-newton324 openstack-origin: cloud:xenial-newton
325 source: cloud:xenial-newton325 source: cloud:xenial-newton
326# ocata326# ocata
327xenial-ocata-ha:327xenial-ocata-ha:
328 inherits: [ openstack-services, ceilometer-gnocchi ]328 inherits: [ openstack-services, ceilometer-mongodb ]
329 series: xenial329 series: xenial
330 overrides:330 overrides:
331 openstack-origin: cloud:xenial-ocata331 openstack-origin: cloud:xenial-ocata
332 source: cloud:xenial-ocata332 source: cloud:xenial-ocata
333zesty-ocata-ha:333zesty-ocata-ha:
334 inherits: [ openstack-services, ceilometer-gnocchi ]334 inherits: [ openstack-services, ceilometer-mongodb ]
335 series: zesty335 series: zesty
336# pike336# pike
337xenial-pike-ha:337xenial-pike-ha:
338 inherits: [ openstack-services, ceilometer-gnocchi ]338 inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
339 series: xenial339 series: xenial
340 overrides:340 overrides:
341 openstack-origin: cloud:xenial-pike341 openstack-origin: cloud:xenial-pike
342 source: cloud:xenial-pike342 source: cloud:xenial-pike
343artful-pike-ha:343artful-pike-ha:
344 inherits: [ openstack-services, ceilometer-gnocchi ]344 inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ]
345 series: artful345 series: artful
346346
=== modified file 'helper/bundles/ksv3-full-next.yaml'
--- helper/bundles/ksv3-full-next.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/ksv3-full-next.yaml 2018-03-07 08:34:40 +0000
@@ -299,7 +299,7 @@
299 source: ppa:ubuntu-cloud-archive/liberty-staging299 source: ppa:ubuntu-cloud-archive/liberty-staging
300# mitaka300# mitaka
301trusty-mitaka:301trusty-mitaka:
302 inherits: [ openstack-icehouse, ceilometer-gnocchi ]302 inherits: [ openstack-icehouse, ceilometer-mongodb ]
303 series: trusty303 series: trusty
304 overrides:304 overrides:
305 openstack-origin: cloud:trusty-mitaka305 openstack-origin: cloud:trusty-mitaka
@@ -315,7 +315,7 @@
315 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging315 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
316 source: ppa:ubuntu-cloud-archive/mitaka-staging316 source: ppa:ubuntu-cloud-archive/mitaka-staging
317xenial-mitaka:317xenial-mitaka:
318 inherits: [ openstack-icehouse, ceilometer-gnocchi ]318 inherits: [ openstack-icehouse, ceilometer-mongodb ]
319 series: xenial319 series: xenial
320xenial-mitaka-proposed:320xenial-mitaka-proposed:
321 inherits: xenial-mitaka321 inherits: xenial-mitaka
@@ -324,7 +324,7 @@
324 openstack-origin: distro-proposed324 openstack-origin: distro-proposed
325# newton325# newton
326xenial-newton:326xenial-newton:
327 inherits: [ openstack-icehouse, ceilometer-gnocchi ]327 inherits: [ openstack-icehouse, ceilometer-mongodb ]
328 series: xenial328 series: xenial
329 overrides:329 overrides:
330 openstack-origin: cloud:xenial-newton330 openstack-origin: cloud:xenial-newton
@@ -339,17 +339,9 @@
339 overrides:339 overrides:
340 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging340 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
341 source: ppa:ubuntu-cloud-archive/newton-staging341 source: ppa:ubuntu-cloud-archive/newton-staging
342yakkety-newton:
343 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
344 series: yakkety
345yakkety-newton-proposed:
346 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
347 overrides:
348 source: proposed
349 openstack-origin: distro-proposed
350# ocata342# ocata
351xenial-ocata:343xenial-ocata:
352 inherits: [ openstack-icehouse, ceilometer-gnocchi ]344 inherits: [ openstack-icehouse, ceilometer-mongodb ]
353 series: xenial345 series: xenial
354 overrides:346 overrides:
355 openstack-origin: cloud:xenial-ocata347 openstack-origin: cloud:xenial-ocata
@@ -365,7 +357,7 @@
365 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging357 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
366 source: ppa:ubuntu-cloud-archive/ocata-staging358 source: ppa:ubuntu-cloud-archive/ocata-staging
367zesty-ocata:359zesty-ocata:
368 inherits: [ openstack-icehouse, ceilometer-gnocchi ]360 inherits: [ openstack-icehouse, ceilometer-mongodb ]
369 series: zesty361 series: zesty
370zesty-ocata-proposed:362zesty-ocata-proposed:
371 inherits: zesty-ocata363 inherits: zesty-ocata
@@ -374,7 +366,7 @@
374 openstack-origin: distro-proposed366 openstack-origin: distro-proposed
375# pike367# pike
376xenial-pike:368xenial-pike:
377 inherits: [ openstack-icehouse, ceilometer-gnocchi ]369 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
378 series: xenial370 series: xenial
379 overrides:371 overrides:
380 openstack-origin: cloud:xenial-pike372 openstack-origin: cloud:xenial-pike
@@ -390,7 +382,7 @@
390 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging382 openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
391 source: ppa:ubuntu-cloud-archive/pike-staging383 source: ppa:ubuntu-cloud-archive/pike-staging
392artful-pike:384artful-pike:
393 inherits: [ openstack-icehouse, ceilometer-gnocchi ]385 inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ]
394 series: artful386 series: artful
395artful-pike-proposed:387artful-pike-proposed:
396 inherits: artful-pike388 inherits: artful-pike
@@ -399,12 +391,14 @@
399 openstack-origin: distro-proposed391 openstack-origin: distro-proposed
400# queens392# queens
401xenial-queens:393xenial-queens:
402 inherits: xenial-pike394 inherits: [ openstack-icehouse, ceilometer-gnocchi ]
395 series: xenial
403 overrides:396 overrides:
404 openstack-origin: cloud:xenial-queens/proposed397 openstack-origin: cloud:xenial-queens/proposed
405 source: cloud:xenial-queens/proposed398 source: cloud:xenial-queens/proposed
406bionic-queens:399bionic-queens:
407 inherits: xenial-pike400 inherits: xenial-queens
401 series: bionic
408 overrides:402 overrides:
409 openstack-origin: distro-proposed403 openstack-origin: distro-proposed
410 source: distro-proposed404 source: distro-proposed
411405
=== modified file 'helper/bundles/ksv3-full.yaml'
--- helper/bundles/ksv3-full.yaml 2018-02-28 12:22:30 +0000
+++ helper/bundles/ksv3-full.yaml 2018-03-07 08:34:40 +0000
@@ -299,7 +299,7 @@
299 source: ppa:ubuntu-cloud-archive/liberty-staging299 source: ppa:ubuntu-cloud-archive/liberty-staging
300# mitaka300# mitaka
301trusty-mitaka:301trusty-mitaka:
302 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]302 inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
303 series: trusty303 series: trusty
304 overrides:304 overrides:
305 openstack-origin: cloud:trusty-mitaka305 openstack-origin: cloud:trusty-mitaka
@@ -315,7 +315,7 @@
315 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging315 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
316 source: ppa:ubuntu-cloud-archive/mitaka-staging316 source: ppa:ubuntu-cloud-archive/mitaka-staging
317xenial-mitaka:317xenial-mitaka:
318 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]318 inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
319 series: xenial319 series: xenial
320xenial-mitaka-proposed:320xenial-mitaka-proposed:
321 inherits: xenial-mitaka321 inherits: xenial-mitaka
@@ -324,7 +324,7 @@
324 openstack-origin: distro-proposed324 openstack-origin: distro-proposed
325# newton325# newton
326xenial-newton:326xenial-newton:
327 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]327 inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
328 series: xenial328 series: xenial
329 overrides:329 overrides:
330 openstack-origin: cloud:xenial-newton330 openstack-origin: cloud:xenial-newton
@@ -339,17 +339,9 @@
339 overrides:339 overrides:
340 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging340 openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
341 source: ppa:ubuntu-cloud-archive/newton-staging341 source: ppa:ubuntu-cloud-archive/newton-staging
342yakkety-newton:
343 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]
344 series: yakkety
345yakkety-newton-proposed:
346 inherits: yakkety-newton
347 overrides:
348 source: proposed
349 openstack-origin: distro-proposed
350# ocata342# ocata
351xenial-ocata:343xenial-ocata:
352 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]344 inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
353 series: xenial345 series: xenial
354 overrides:346 overrides:
355 openstack-origin: cloud:xenial-ocata347 openstack-origin: cloud:xenial-ocata
@@ -365,7 +357,7 @@
365 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging357 openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
366 source: ppa:ubuntu-cloud-archive/ocata-staging358 source: ppa:ubuntu-cloud-archive/ocata-staging
367zesty-ocata:359zesty-ocata:
368 inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ]360 inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ]
369 series: zesty361 series: zesty
370zesty-ocata-proposed:362zesty-ocata-proposed:
371 inherits: zesty-ocata363 inherits: zesty-ocata

Subscribers

People subscribed via source and target branches