Merge lp:~chris.macnaughton/openstack-mojo-specs/fix-gnocchi into lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802
- fix-gnocchi
- 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
Review via email: mp+340736@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote : | # |
- 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://
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote : | # |
Changed to http://
- 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
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 | 284 | source: ppa:ubuntu-cloud-archive/liberty-staging | 284 | source: ppa:ubuntu-cloud-archive/liberty-staging |
6 | 285 | # mitaka | 285 | # mitaka |
7 | 286 | trusty-mitaka: | 286 | trusty-mitaka: |
9 | 287 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 287 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
10 | 288 | series: trusty | 288 | series: trusty |
11 | 289 | overrides: | 289 | overrides: |
12 | 290 | openstack-origin: cloud:trusty-mitaka | 290 | openstack-origin: cloud:trusty-mitaka |
13 | @@ -300,7 +300,7 @@ | |||
14 | 300 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 300 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
15 | 301 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 301 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
16 | 302 | xenial-mitaka: | 302 | xenial-mitaka: |
18 | 303 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 303 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
19 | 304 | series: xenial | 304 | series: xenial |
20 | 305 | xenial-mitaka-proposed: | 305 | xenial-mitaka-proposed: |
21 | 306 | inherits: xenial-mitaka | 306 | inherits: xenial-mitaka |
22 | @@ -309,7 +309,7 @@ | |||
23 | 309 | openstack-origin: distro-proposed | 309 | openstack-origin: distro-proposed |
24 | 310 | # newton | 310 | # newton |
25 | 311 | xenial-newton: | 311 | xenial-newton: |
27 | 312 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 312 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
28 | 313 | series: xenial | 313 | series: xenial |
29 | 314 | overrides: | 314 | overrides: |
30 | 315 | openstack-origin: cloud:xenial-newton | 315 | openstack-origin: cloud:xenial-newton |
31 | @@ -324,17 +324,9 @@ | |||
32 | 324 | overrides: | 324 | overrides: |
33 | 325 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 325 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
34 | 326 | source: ppa:ubuntu-cloud-archive/newton-staging | 326 | source: ppa:ubuntu-cloud-archive/newton-staging |
35 | 327 | yakkety-newton: | ||
36 | 328 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
37 | 329 | series: yakkety | ||
38 | 330 | yakkety-newton-proposed: | ||
39 | 331 | inherits: yakkety-newton | ||
40 | 332 | overrides: | ||
41 | 333 | source: proposed | ||
42 | 334 | openstack-origin: distro-proposed | ||
43 | 335 | # ocata | 327 | # ocata |
44 | 336 | xenial-ocata: | 328 | xenial-ocata: |
46 | 337 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 329 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
47 | 338 | series: xenial | 330 | series: xenial |
48 | 339 | overrides: | 331 | overrides: |
49 | 340 | openstack-origin: cloud:xenial-ocata | 332 | openstack-origin: cloud:xenial-ocata |
50 | @@ -350,11 +342,11 @@ | |||
51 | 350 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging | 342 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging |
52 | 351 | source: ppa:ubuntu-cloud-archive/ocata-staging | 343 | source: ppa:ubuntu-cloud-archive/ocata-staging |
53 | 352 | zesty-ocata: | 344 | zesty-ocata: |
55 | 353 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 345 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
56 | 354 | series: zesty | 346 | series: zesty |
57 | 355 | # pike | 347 | # pike |
58 | 356 | xenial-pike: | 348 | xenial-pike: |
60 | 357 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 349 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
61 | 358 | series: xenial | 350 | series: xenial |
62 | 359 | overrides: | 351 | overrides: |
63 | 360 | openstack-origin: cloud:xenial-pike | 352 | openstack-origin: cloud:xenial-pike |
64 | @@ -370,15 +362,17 @@ | |||
65 | 370 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging | 362 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging |
66 | 371 | source: ppa:ubuntu-cloud-archive/pike-staging | 363 | source: ppa:ubuntu-cloud-archive/pike-staging |
67 | 372 | artful-pike: | 364 | artful-pike: |
69 | 373 | inherits: openstack-icehouse | 365 | inherits: xenial-pike |
70 | 374 | series: artful | 366 | series: artful |
71 | 375 | xenial-queens: | 367 | xenial-queens: |
73 | 376 | inherits: xenial-pike | 368 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] |
74 | 369 | series: xenial | ||
75 | 377 | overrides: | 370 | overrides: |
76 | 378 | openstack-origin: cloud:xenial-queens/proposed | 371 | openstack-origin: cloud:xenial-queens/proposed |
77 | 379 | source: cloud:xenial-queens/proposed | 372 | source: cloud:xenial-queens/proposed |
78 | 380 | bionic-queens: | 373 | bionic-queens: |
80 | 381 | inherits: xenial-pike | 374 | inherits: xenial-queens |
81 | 375 | series: bionic | ||
82 | 382 | overrides: | 376 | overrides: |
83 | 383 | openstack-origin: distro-proposed | 377 | openstack-origin: distro-proposed |
84 | 384 | source: distro-proposed | 378 | source: distro-proposed |
85 | 385 | 379 | ||
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 | 288 | source: ppa:ubuntu-cloud-archive/liberty-staging | 288 | source: ppa:ubuntu-cloud-archive/liberty-staging |
91 | 289 | # mitaka | 289 | # mitaka |
92 | 290 | trusty-mitaka: | 290 | trusty-mitaka: |
94 | 291 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 291 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
95 | 292 | series: trusty | 292 | series: trusty |
96 | 293 | overrides: | 293 | overrides: |
97 | 294 | openstack-origin: cloud:trusty-mitaka | 294 | openstack-origin: cloud:trusty-mitaka |
98 | @@ -304,7 +304,7 @@ | |||
99 | 304 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 304 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
100 | 305 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 305 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
101 | 306 | xenial-mitaka: | 306 | xenial-mitaka: |
103 | 307 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 307 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
104 | 308 | series: xenial | 308 | series: xenial |
105 | 309 | xenial-mitaka-proposed: | 309 | xenial-mitaka-proposed: |
106 | 310 | inherits: xenial-mitaka | 310 | inherits: xenial-mitaka |
107 | @@ -313,7 +313,7 @@ | |||
108 | 313 | openstack-origin: distro-proposed | 313 | openstack-origin: distro-proposed |
109 | 314 | # newton | 314 | # newton |
110 | 315 | xenial-newton: | 315 | xenial-newton: |
112 | 316 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 316 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
113 | 317 | series: xenial | 317 | series: xenial |
114 | 318 | overrides: | 318 | overrides: |
115 | 319 | openstack-origin: cloud:xenial-newton | 319 | openstack-origin: cloud:xenial-newton |
116 | @@ -328,17 +328,9 @@ | |||
117 | 328 | overrides: | 328 | overrides: |
118 | 329 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 329 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
119 | 330 | source: ppa:ubuntu-cloud-archive/newton-staging | 330 | source: ppa:ubuntu-cloud-archive/newton-staging |
120 | 331 | yakkety-newton: | ||
121 | 332 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
122 | 333 | series: yakkety | ||
123 | 334 | yakkety-newton-proposed: | ||
124 | 335 | inherits: yakkety-newton | ||
125 | 336 | overrides: | ||
126 | 337 | source: proposed | ||
127 | 338 | openstack-origin: distro-proposed | ||
128 | 339 | # ocata | 331 | # ocata |
129 | 340 | xenial-ocata: | 332 | xenial-ocata: |
131 | 341 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 333 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
132 | 342 | series: xenial | 334 | series: xenial |
133 | 343 | overrides: | 335 | overrides: |
134 | 344 | openstack-origin: cloud:xenial-ocata | 336 | openstack-origin: cloud:xenial-ocata |
135 | @@ -354,7 +346,7 @@ | |||
136 | 354 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging | 346 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging |
137 | 355 | source: ppa:ubuntu-cloud-archive/ocata-staging | 347 | source: ppa:ubuntu-cloud-archive/ocata-staging |
138 | 356 | zesty-ocata: | 348 | zesty-ocata: |
140 | 357 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 349 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
141 | 358 | series: zesty | 350 | series: zesty |
142 | 359 | zesty-ocata-proposed: | 351 | zesty-ocata-proposed: |
143 | 360 | inherits: zesty-ocata | 352 | inherits: zesty-ocata |
144 | @@ -363,7 +355,7 @@ | |||
145 | 363 | openstack-origin: distro-proposed | 355 | openstack-origin: distro-proposed |
146 | 364 | # pike | 356 | # pike |
147 | 365 | xenial-pike: | 357 | xenial-pike: |
149 | 366 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 358 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
150 | 367 | series: xenial | 359 | series: xenial |
151 | 368 | overrides: | 360 | overrides: |
152 | 369 | openstack-origin: cloud:xenial-pike | 361 | openstack-origin: cloud:xenial-pike |
153 | @@ -379,7 +371,7 @@ | |||
154 | 379 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging | 371 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging |
155 | 380 | source: ppa:ubuntu-cloud-archive/pike-staging | 372 | source: ppa:ubuntu-cloud-archive/pike-staging |
156 | 381 | artful-pike: | 373 | artful-pike: |
158 | 382 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 374 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
159 | 383 | series: artful | 375 | series: artful |
160 | 384 | artful-pike-proposed: | 376 | artful-pike-proposed: |
161 | 385 | inherits: artful-pike | 377 | inherits: artful-pike |
162 | @@ -387,12 +379,14 @@ | |||
163 | 387 | source: proposed | 379 | source: proposed |
164 | 388 | openstack-origin: distro-proposed | 380 | openstack-origin: distro-proposed |
165 | 389 | xenial-queens: | 381 | xenial-queens: |
167 | 390 | inherits: xenial-pike | 382 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] |
168 | 383 | series: xenial | ||
169 | 391 | overrides: | 384 | overrides: |
170 | 392 | openstack-origin: cloud:xenial-queens/proposed | 385 | openstack-origin: cloud:xenial-queens/proposed |
171 | 393 | source: cloud:xenial-queens/proposed | 386 | source: cloud:xenial-queens/proposed |
172 | 394 | bionic-queens: | 387 | bionic-queens: |
174 | 395 | inherits: xenial-pike | 388 | inherits: xenial-queens |
175 | 389 | series: queens | ||
176 | 396 | overrides: | 390 | overrides: |
177 | 397 | openstack-origin: distro-proposed | 391 | openstack-origin: distro-proposed |
178 | 398 | source: distro-proposed | 392 | source: distro-proposed |
179 | 399 | 393 | ||
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 | 288 | source: ppa:ubuntu-cloud-archive/liberty-staging | 288 | source: ppa:ubuntu-cloud-archive/liberty-staging |
185 | 289 | # mitaka | 289 | # mitaka |
186 | 290 | trusty-mitaka: | 290 | trusty-mitaka: |
188 | 291 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 291 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
189 | 292 | series: trusty | 292 | series: trusty |
190 | 293 | overrides: | 293 | overrides: |
191 | 294 | openstack-origin: cloud:trusty-mitaka | 294 | openstack-origin: cloud:trusty-mitaka |
192 | @@ -304,7 +304,7 @@ | |||
193 | 304 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 304 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
194 | 305 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 305 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
195 | 306 | xenial-mitaka: | 306 | xenial-mitaka: |
197 | 307 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 307 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
198 | 308 | series: xenial | 308 | series: xenial |
199 | 309 | xenial-mitaka-proposed: | 309 | xenial-mitaka-proposed: |
200 | 310 | inherits: xenial-mitaka | 310 | inherits: xenial-mitaka |
201 | @@ -313,7 +313,7 @@ | |||
202 | 313 | openstack-origin: distro-proposed | 313 | openstack-origin: distro-proposed |
203 | 314 | # newton | 314 | # newton |
204 | 315 | xenial-newton: | 315 | xenial-newton: |
206 | 316 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 316 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
207 | 317 | series: xenial | 317 | series: xenial |
208 | 318 | overrides: | 318 | overrides: |
209 | 319 | openstack-origin: cloud:xenial-newton | 319 | openstack-origin: cloud:xenial-newton |
210 | @@ -328,17 +328,9 @@ | |||
211 | 328 | overrides: | 328 | overrides: |
212 | 329 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 329 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
213 | 330 | source: ppa:ubuntu-cloud-archive/newton-staging | 330 | source: ppa:ubuntu-cloud-archive/newton-staging |
214 | 331 | yakkety-newton: | ||
215 | 332 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
216 | 333 | series: yakkety | ||
217 | 334 | yakkety-newton-proposed: | ||
218 | 335 | inherits: yakkety-newton | ||
219 | 336 | overrides: | ||
220 | 337 | source: proposed | ||
221 | 338 | openstack-origin: distro-proposed | ||
222 | 339 | # ocata | 331 | # ocata |
223 | 340 | xenial-ocata: | 332 | xenial-ocata: |
225 | 341 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 333 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
226 | 342 | series: xenial | 334 | series: xenial |
227 | 343 | overrides: | 335 | overrides: |
228 | 344 | openstack-origin: cloud:xenial-ocata | 336 | openstack-origin: cloud:xenial-ocata |
229 | @@ -354,7 +346,7 @@ | |||
230 | 354 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging | 346 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging |
231 | 355 | source: ppa:ubuntu-cloud-archive/ocata-staging | 347 | source: ppa:ubuntu-cloud-archive/ocata-staging |
232 | 356 | zesty-ocata: | 348 | zesty-ocata: |
234 | 357 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 349 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
235 | 358 | series: zesty | 350 | series: zesty |
236 | 359 | zesty-ocata-proposed: | 351 | zesty-ocata-proposed: |
237 | 360 | inherits: zesty-ocata | 352 | inherits: zesty-ocata |
238 | 361 | 353 | ||
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 | 291 | source: ppa:ubuntu-cloud-archive/liberty-staging | 291 | source: ppa:ubuntu-cloud-archive/liberty-staging |
244 | 292 | # mitaka | 292 | # mitaka |
245 | 293 | trusty-mitaka: | 293 | trusty-mitaka: |
247 | 294 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 294 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
248 | 295 | series: trusty | 295 | series: trusty |
249 | 296 | overrides: | 296 | overrides: |
250 | 297 | openstack-origin: cloud:trusty-mitaka | 297 | openstack-origin: cloud:trusty-mitaka |
251 | @@ -307,7 +307,7 @@ | |||
252 | 307 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 307 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
253 | 308 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 308 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
254 | 309 | xenial-mitaka: | 309 | xenial-mitaka: |
256 | 310 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 310 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
257 | 311 | series: xenial | 311 | series: xenial |
258 | 312 | xenial-mitaka-proposed: | 312 | xenial-mitaka-proposed: |
259 | 313 | inherits: xenial-mitaka | 313 | inherits: xenial-mitaka |
260 | @@ -316,7 +316,7 @@ | |||
261 | 316 | openstack-origin: distro-proposed | 316 | openstack-origin: distro-proposed |
262 | 317 | # newton | 317 | # newton |
263 | 318 | xenial-newton: | 318 | xenial-newton: |
265 | 319 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 319 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
266 | 320 | series: xenial | 320 | series: xenial |
267 | 321 | overrides: | 321 | overrides: |
268 | 322 | openstack-origin: cloud:xenial-newton | 322 | openstack-origin: cloud:xenial-newton |
269 | @@ -331,31 +331,23 @@ | |||
270 | 331 | overrides: | 331 | overrides: |
271 | 332 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 332 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
272 | 333 | source: ppa:ubuntu-cloud-archive/newton-staging | 333 | source: ppa:ubuntu-cloud-archive/newton-staging |
273 | 334 | yakkety-newton: | ||
274 | 335 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
275 | 336 | series: yakkety | ||
276 | 337 | yakkety-newton-proposed: | ||
277 | 338 | inherits: yakkety-newton | ||
278 | 339 | overrides: | ||
279 | 340 | source: proposed | ||
280 | 341 | openstack-origin: distro-proposed | ||
281 | 342 | # ocata | 334 | # ocata |
282 | 343 | xenial-ocata: | 335 | xenial-ocata: |
284 | 344 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 336 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
285 | 345 | series: xenial | 337 | series: xenial |
286 | 346 | overrides: | 338 | overrides: |
287 | 347 | openstack-origin: cloud:xenial-ocata | 339 | openstack-origin: cloud:xenial-ocata |
288 | 348 | source: cloud:xenial-ocata | 340 | source: cloud:xenial-ocata |
289 | 349 | zesty-ocata: | 341 | zesty-ocata: |
291 | 350 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 342 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
292 | 351 | series: zesty | 343 | series: zesty |
293 | 352 | # pike | 344 | # pike |
294 | 353 | xenial-pike: | 345 | xenial-pike: |
296 | 354 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 346 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
297 | 355 | series: xenial | 347 | series: xenial |
298 | 356 | overrides: | 348 | overrides: |
299 | 357 | openstack-origin: cloud:xenial-pike | 349 | openstack-origin: cloud:xenial-pike |
300 | 358 | source: cloud:xenial-pike | 350 | source: cloud:xenial-pike |
301 | 359 | artful-pike: | 351 | artful-pike: |
303 | 360 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 352 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
304 | 361 | series: artful | 353 | series: artful |
305 | 362 | 354 | ||
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 | 291 | openstack-origin: cloud:trusty-liberty | 291 | openstack-origin: cloud:trusty-liberty |
311 | 292 | source: cloud:trusty-liberty | 292 | source: cloud:trusty-liberty |
312 | 293 | trusty-mitaka-ha: | 293 | trusty-mitaka-ha: |
314 | 294 | inherits: [ openstack-services, ceilometer-gnocchi ] | 294 | inherits: [ openstack-services, ceilometer-mongodb ] |
315 | 295 | series: trusty | 295 | series: trusty |
316 | 296 | overrides: | 296 | overrides: |
317 | 297 | openstack-origin: cloud:trusty-mitaka/proposed | 297 | openstack-origin: cloud:trusty-mitaka/proposed |
318 | 298 | source: cloud:trusty-mitaka | 298 | source: cloud:trusty-mitaka |
319 | 299 | trusty-mitaka-proposed: | 299 | trusty-mitaka-proposed: |
321 | 300 | inherits: [ openstack-services, ceilometer-gnocchi ] | 300 | inherits: [ openstack-services, ceilometer-mongodb ] |
322 | 301 | series: trusty | 301 | series: trusty |
323 | 302 | overrides: | 302 | overrides: |
324 | 303 | openstack-origin: cloud:trusty-mitaka/proposed | 303 | openstack-origin: cloud:trusty-mitaka/proposed |
325 | 304 | source: cloud:trusty-mitaka/proposed | 304 | source: cloud:trusty-mitaka/proposed |
326 | 305 | xenial-mitaka-ha: | 305 | xenial-mitaka-ha: |
328 | 306 | inherits: [ openstack-services, ceilometer-gnocchi ] | 306 | inherits: [ openstack-services, ceilometer-mongodb ] |
329 | 307 | series: xenial | 307 | series: xenial |
330 | 308 | overrides: | 308 | overrides: |
331 | 309 | ha-bindiface: ens2 | 309 | ha-bindiface: ens2 |
332 | @@ -314,7 +314,7 @@ | |||
333 | 314 | openstack-origin: distro-proposed | 314 | openstack-origin: distro-proposed |
334 | 315 | ha-bindiface: ens2 | 315 | ha-bindiface: ens2 |
335 | 316 | xenial-newton-ha: | 316 | xenial-newton-ha: |
337 | 317 | inherits: [ openstack-services, ceilometer-gnocchi ] | 317 | inherits: [ openstack-services, ceilometer-mongodb ] |
338 | 318 | series: xenial | 318 | series: xenial |
339 | 319 | overrides: | 319 | overrides: |
340 | 320 | ha-bindiface: ens2 | 320 | ha-bindiface: ens2 |
341 | @@ -322,39 +322,39 @@ | |||
342 | 322 | source: cloud:xenial-newton | 322 | source: cloud:xenial-newton |
343 | 323 | # ocata | 323 | # ocata |
344 | 324 | xenial-ocata-ha: | 324 | xenial-ocata-ha: |
346 | 325 | inherits: [ openstack-services, ceilometer-gnocchi ] | 325 | inherits: [ openstack-services, ceilometer-mongodb ] |
347 | 326 | series: xenial | 326 | series: xenial |
348 | 327 | overrides: | 327 | overrides: |
349 | 328 | ha-bindiface: ens2 | 328 | ha-bindiface: ens2 |
350 | 329 | openstack-origin: cloud:xenial-ocata | 329 | openstack-origin: cloud:xenial-ocata |
351 | 330 | source: cloud:xenial-ocata | 330 | source: cloud:xenial-ocata |
352 | 331 | zesty-ocata-ha: | 331 | zesty-ocata-ha: |
354 | 332 | inherits: [ openstack-services, ceilometer-gnocchi ] | 332 | inherits: [ openstack-services, ceilometer-mongodb ] |
355 | 333 | series: zesty | 333 | series: zesty |
356 | 334 | overrides: | 334 | overrides: |
357 | 335 | ha-bindiface: ens2 | 335 | ha-bindiface: ens2 |
358 | 336 | # pike | 336 | # pike |
359 | 337 | xenial-pike-ha: | 337 | xenial-pike-ha: |
361 | 338 | inherits: [ openstack-services, ceilometer-gnocchi ] | 338 | inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ] |
362 | 339 | series: xenial | 339 | series: xenial |
363 | 340 | overrides: | 340 | overrides: |
364 | 341 | ha-bindiface: ens2 | 341 | ha-bindiface: ens2 |
365 | 342 | openstack-origin: cloud:xenial-pike | 342 | openstack-origin: cloud:xenial-pike |
366 | 343 | source: cloud:xenial-pike | 343 | source: cloud:xenial-pike |
367 | 344 | artful-pike-ha: | 344 | artful-pike-ha: |
369 | 345 | inherits: [ openstack-services, ceilometer-gnocchi ] | 345 | inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ] |
370 | 346 | series: artful | 346 | series: artful |
371 | 347 | overrides: | 347 | overrides: |
372 | 348 | ha-bindiface: ens2 | 348 | ha-bindiface: ens2 |
373 | 349 | # queens | 349 | # queens |
376 | 350 | xenial-queens: | 350 | xenial-queens-ha: |
377 | 351 | inherits: xenial-pike-ha | 351 | inherits: [ openstack-services, ceilometer-gnocchi ] |
378 | 352 | series: xenial | 352 | series: xenial |
379 | 353 | overrides: | 353 | overrides: |
380 | 354 | openstack-origin: cloud:xenial-queens/proposed | 354 | openstack-origin: cloud:xenial-queens/proposed |
381 | 355 | source: cloud:xenial-queens/proposed | 355 | source: cloud:xenial-queens/proposed |
384 | 356 | bionic-queens: | 356 | bionic-queens-ha: |
385 | 357 | inherits: xenial-pike-ha | 357 | inherits: xenial-queens-ha |
386 | 358 | series: bionic | 358 | series: bionic |
387 | 359 | overrides: | 359 | overrides: |
388 | 360 | openstack-origin: distro-proposed | 360 | openstack-origin: distro-proposed |
389 | 361 | 361 | ||
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 | 294 | openstack-origin: cloud:trusty-liberty | 294 | openstack-origin: cloud:trusty-liberty |
395 | 295 | source: cloud:trusty-liberty | 295 | source: cloud:trusty-liberty |
396 | 296 | trusty-mitaka-ha: | 296 | trusty-mitaka-ha: |
398 | 297 | inherits: [ openstack-services, ceilometer-gnocchi ] | 297 | inherits: [ openstack-services, ceilometer-mongodb ] |
399 | 298 | series: trusty | 298 | series: trusty |
400 | 299 | overrides: | 299 | overrides: |
401 | 300 | openstack-origin: cloud:trusty-mitaka/proposed | 300 | openstack-origin: cloud:trusty-mitaka/proposed |
402 | 301 | source: cloud:trusty-mitaka | 301 | source: cloud:trusty-mitaka |
403 | 302 | trusty-mitaka-proposed: | 302 | trusty-mitaka-proposed: |
405 | 303 | inherits: [ openstack-services, ceilometer-gnocchi ] | 303 | inherits: [ openstack-services, ceilometer-mongodb ] |
406 | 304 | series: trusty | 304 | series: trusty |
407 | 305 | overrides: | 305 | overrides: |
408 | 306 | openstack-origin: cloud:trusty-mitaka/proposed | 306 | openstack-origin: cloud:trusty-mitaka/proposed |
409 | 307 | source: cloud:trusty-mitaka/proposed | 307 | source: cloud:trusty-mitaka/proposed |
410 | 308 | xenial-mitaka-ha: | 308 | xenial-mitaka-ha: |
412 | 309 | inherits: [ openstack-services, ceilometer-gnocchi ] | 309 | inherits: [ openstack-services, ceilometer-mongodb ] |
413 | 310 | series: xenial | 310 | series: xenial |
414 | 311 | services: | 311 | services: |
415 | 312 | mysql: | 312 | mysql: |
416 | @@ -318,28 +318,28 @@ | |||
417 | 318 | openstack-origin: distro-proposed | 318 | openstack-origin: distro-proposed |
418 | 319 | # newton | 319 | # newton |
419 | 320 | xenial-newton-ha: | 320 | xenial-newton-ha: |
421 | 321 | inherits: [ openstack-services, ceilometer-gnocchi ] | 321 | inherits: [ openstack-services, ceilometer-mongodb ] |
422 | 322 | series: xenial | 322 | series: xenial |
423 | 323 | overrides: | 323 | overrides: |
424 | 324 | openstack-origin: cloud:xenial-newton | 324 | openstack-origin: cloud:xenial-newton |
425 | 325 | source: cloud:xenial-newton | 325 | source: cloud:xenial-newton |
426 | 326 | # ocata | 326 | # ocata |
427 | 327 | xenial-ocata-ha: | 327 | xenial-ocata-ha: |
429 | 328 | inherits: [ openstack-services, ceilometer-gnocchi ] | 328 | inherits: [ openstack-services, ceilometer-mongodb ] |
430 | 329 | series: xenial | 329 | series: xenial |
431 | 330 | overrides: | 330 | overrides: |
432 | 331 | openstack-origin: cloud:xenial-ocata | 331 | openstack-origin: cloud:xenial-ocata |
433 | 332 | source: cloud:xenial-ocata | 332 | source: cloud:xenial-ocata |
434 | 333 | zesty-ocata-ha: | 333 | zesty-ocata-ha: |
436 | 334 | inherits: [ openstack-services, ceilometer-gnocchi ] | 334 | inherits: [ openstack-services, ceilometer-mongodb ] |
437 | 335 | series: zesty | 335 | series: zesty |
438 | 336 | # pike | 336 | # pike |
439 | 337 | xenial-pike-ha: | 337 | xenial-pike-ha: |
441 | 338 | inherits: [ openstack-services, ceilometer-gnocchi ] | 338 | inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ] |
442 | 339 | series: xenial | 339 | series: xenial |
443 | 340 | overrides: | 340 | overrides: |
444 | 341 | openstack-origin: cloud:xenial-pike | 341 | openstack-origin: cloud:xenial-pike |
445 | 342 | source: cloud:xenial-pike | 342 | source: cloud:xenial-pike |
446 | 343 | artful-pike-ha: | 343 | artful-pike-ha: |
448 | 344 | inherits: [ openstack-services, ceilometer-gnocchi ] | 344 | inherits: [ openstack-services, ceilometer-mongodb, ceilometer-gnocchi ] |
449 | 345 | series: artful | 345 | series: artful |
450 | 346 | 346 | ||
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 | 299 | source: ppa:ubuntu-cloud-archive/liberty-staging | 299 | source: ppa:ubuntu-cloud-archive/liberty-staging |
456 | 300 | # mitaka | 300 | # mitaka |
457 | 301 | trusty-mitaka: | 301 | trusty-mitaka: |
459 | 302 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 302 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
460 | 303 | series: trusty | 303 | series: trusty |
461 | 304 | overrides: | 304 | overrides: |
462 | 305 | openstack-origin: cloud:trusty-mitaka | 305 | openstack-origin: cloud:trusty-mitaka |
463 | @@ -315,7 +315,7 @@ | |||
464 | 315 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 315 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
465 | 316 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 316 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
466 | 317 | xenial-mitaka: | 317 | xenial-mitaka: |
468 | 318 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 318 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
469 | 319 | series: xenial | 319 | series: xenial |
470 | 320 | xenial-mitaka-proposed: | 320 | xenial-mitaka-proposed: |
471 | 321 | inherits: xenial-mitaka | 321 | inherits: xenial-mitaka |
472 | @@ -324,7 +324,7 @@ | |||
473 | 324 | openstack-origin: distro-proposed | 324 | openstack-origin: distro-proposed |
474 | 325 | # newton | 325 | # newton |
475 | 326 | xenial-newton: | 326 | xenial-newton: |
477 | 327 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 327 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
478 | 328 | series: xenial | 328 | series: xenial |
479 | 329 | overrides: | 329 | overrides: |
480 | 330 | openstack-origin: cloud:xenial-newton | 330 | openstack-origin: cloud:xenial-newton |
481 | @@ -339,17 +339,9 @@ | |||
482 | 339 | overrides: | 339 | overrides: |
483 | 340 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 340 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
484 | 341 | source: ppa:ubuntu-cloud-archive/newton-staging | 341 | source: ppa:ubuntu-cloud-archive/newton-staging |
485 | 342 | yakkety-newton: | ||
486 | 343 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
487 | 344 | series: yakkety | ||
488 | 345 | yakkety-newton-proposed: | ||
489 | 346 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | ||
490 | 347 | overrides: | ||
491 | 348 | source: proposed | ||
492 | 349 | openstack-origin: distro-proposed | ||
493 | 350 | # ocata | 342 | # ocata |
494 | 351 | xenial-ocata: | 343 | xenial-ocata: |
496 | 352 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 344 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
497 | 353 | series: xenial | 345 | series: xenial |
498 | 354 | overrides: | 346 | overrides: |
499 | 355 | openstack-origin: cloud:xenial-ocata | 347 | openstack-origin: cloud:xenial-ocata |
500 | @@ -365,7 +357,7 @@ | |||
501 | 365 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging | 357 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging |
502 | 366 | source: ppa:ubuntu-cloud-archive/ocata-staging | 358 | source: ppa:ubuntu-cloud-archive/ocata-staging |
503 | 367 | zesty-ocata: | 359 | zesty-ocata: |
505 | 368 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 360 | inherits: [ openstack-icehouse, ceilometer-mongodb ] |
506 | 369 | series: zesty | 361 | series: zesty |
507 | 370 | zesty-ocata-proposed: | 362 | zesty-ocata-proposed: |
508 | 371 | inherits: zesty-ocata | 363 | inherits: zesty-ocata |
509 | @@ -374,7 +366,7 @@ | |||
510 | 374 | openstack-origin: distro-proposed | 366 | openstack-origin: distro-proposed |
511 | 375 | # pike | 367 | # pike |
512 | 376 | xenial-pike: | 368 | xenial-pike: |
514 | 377 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 369 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
515 | 378 | series: xenial | 370 | series: xenial |
516 | 379 | overrides: | 371 | overrides: |
517 | 380 | openstack-origin: cloud:xenial-pike | 372 | openstack-origin: cloud:xenial-pike |
518 | @@ -390,7 +382,7 @@ | |||
519 | 390 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging | 382 | openstack-origin: ppa:ubuntu-cloud-archive/pike-staging |
520 | 391 | source: ppa:ubuntu-cloud-archive/pike-staging | 383 | source: ppa:ubuntu-cloud-archive/pike-staging |
521 | 392 | artful-pike: | 384 | artful-pike: |
523 | 393 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] | 385 | inherits: [ openstack-icehouse, ceilometer-mongodb, ceilometer-gnocchi ] |
524 | 394 | series: artful | 386 | series: artful |
525 | 395 | artful-pike-proposed: | 387 | artful-pike-proposed: |
526 | 396 | inherits: artful-pike | 388 | inherits: artful-pike |
527 | @@ -399,12 +391,14 @@ | |||
528 | 399 | openstack-origin: distro-proposed | 391 | openstack-origin: distro-proposed |
529 | 400 | # queens | 392 | # queens |
530 | 401 | xenial-queens: | 393 | xenial-queens: |
532 | 402 | inherits: xenial-pike | 394 | inherits: [ openstack-icehouse, ceilometer-gnocchi ] |
533 | 395 | series: xenial | ||
534 | 403 | overrides: | 396 | overrides: |
535 | 404 | openstack-origin: cloud:xenial-queens/proposed | 397 | openstack-origin: cloud:xenial-queens/proposed |
536 | 405 | source: cloud:xenial-queens/proposed | 398 | source: cloud:xenial-queens/proposed |
537 | 406 | bionic-queens: | 399 | bionic-queens: |
539 | 407 | inherits: xenial-pike | 400 | inherits: xenial-queens |
540 | 401 | series: bionic | ||
541 | 408 | overrides: | 402 | overrides: |
542 | 409 | openstack-origin: distro-proposed | 403 | openstack-origin: distro-proposed |
543 | 410 | source: distro-proposed | 404 | source: distro-proposed |
544 | 411 | 405 | ||
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 | 299 | source: ppa:ubuntu-cloud-archive/liberty-staging | 299 | source: ppa:ubuntu-cloud-archive/liberty-staging |
550 | 300 | # mitaka | 300 | # mitaka |
551 | 301 | trusty-mitaka: | 301 | trusty-mitaka: |
553 | 302 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | 302 | inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ] |
554 | 303 | series: trusty | 303 | series: trusty |
555 | 304 | overrides: | 304 | overrides: |
556 | 305 | openstack-origin: cloud:trusty-mitaka | 305 | openstack-origin: cloud:trusty-mitaka |
557 | @@ -315,7 +315,7 @@ | |||
558 | 315 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging | 315 | openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
559 | 316 | source: ppa:ubuntu-cloud-archive/mitaka-staging | 316 | source: ppa:ubuntu-cloud-archive/mitaka-staging |
560 | 317 | xenial-mitaka: | 317 | xenial-mitaka: |
562 | 318 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | 318 | inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ] |
563 | 319 | series: xenial | 319 | series: xenial |
564 | 320 | xenial-mitaka-proposed: | 320 | xenial-mitaka-proposed: |
565 | 321 | inherits: xenial-mitaka | 321 | inherits: xenial-mitaka |
566 | @@ -324,7 +324,7 @@ | |||
567 | 324 | openstack-origin: distro-proposed | 324 | openstack-origin: distro-proposed |
568 | 325 | # newton | 325 | # newton |
569 | 326 | xenial-newton: | 326 | xenial-newton: |
571 | 327 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | 327 | inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ] |
572 | 328 | series: xenial | 328 | series: xenial |
573 | 329 | overrides: | 329 | overrides: |
574 | 330 | openstack-origin: cloud:xenial-newton | 330 | openstack-origin: cloud:xenial-newton |
575 | @@ -339,17 +339,9 @@ | |||
576 | 339 | overrides: | 339 | overrides: |
577 | 340 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging | 340 | openstack-origin: ppa:ubuntu-cloud-archive/newton-staging |
578 | 341 | source: ppa:ubuntu-cloud-archive/newton-staging | 341 | source: ppa:ubuntu-cloud-archive/newton-staging |
579 | 342 | yakkety-newton: | ||
580 | 343 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | ||
581 | 344 | series: yakkety | ||
582 | 345 | yakkety-newton-proposed: | ||
583 | 346 | inherits: yakkety-newton | ||
584 | 347 | overrides: | ||
585 | 348 | source: proposed | ||
586 | 349 | openstack-origin: distro-proposed | ||
587 | 350 | # ocata | 342 | # ocata |
588 | 351 | xenial-ocata: | 343 | xenial-ocata: |
590 | 352 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | 344 | inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ] |
591 | 353 | series: xenial | 345 | series: xenial |
592 | 354 | overrides: | 346 | overrides: |
593 | 355 | openstack-origin: cloud:xenial-ocata | 347 | openstack-origin: cloud:xenial-ocata |
594 | @@ -365,7 +357,7 @@ | |||
595 | 365 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging | 357 | openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging |
596 | 366 | source: ppa:ubuntu-cloud-archive/ocata-staging | 358 | source: ppa:ubuntu-cloud-archive/ocata-staging |
597 | 367 | zesty-ocata: | 359 | zesty-ocata: |
599 | 368 | inherits: [ openstack-icehouse-msg-split, ceilometer-gnocchi ] | 360 | inherits: [ openstack-icehouse-msg-split, ceilometer-mongodb ] |
600 | 369 | series: zesty | 361 | series: zesty |
601 | 370 | zesty-ocata-proposed: | 362 | zesty-ocata-proposed: |
602 | 371 | inherits: zesty-ocata | 363 | inherits: zesty-ocata |
@beisner hold off on this one, I think it may need to revert gnocchi on xenial-newton as well