Browse Source

Update MAAS helm toolkit version

Updates versions to get alignment between the charts and the
helm toolkit being used. Updates Helm toolkit to a more
current version

Change-Id: I6e1e89c5cce194a89872f4a38668866bb65e6662
Bryan Strassner 5 months ago
parent
commit
163847c6c4

+ 17
- 0
deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml View File

@@ -62,6 +62,23 @@ metadata:
62 62
       dest:
63 63
         path: .values.endpoints.physicalprovisioner.port.api.nodeport
64 64
 
65
+    # MaaS IPs
66
+    - src:
67
+        schema: pegleg/CommonAddresses/v1
68
+        name: common-addresses
69
+        # TODO(mb874d): Can change once we have an accessible VIP from fresh nodes.
70
+        path: .genesis.ip
71
+      dest:
72
+        path: .values.conf.drydock.maasdriver.maas_api_url
73
+        pattern: 'MAAS_IP'
74
+    - src:
75
+        schema: pegleg/CommonAddresses/v1
76
+        name: common-addresses
77
+        path: .node_ports.maas_api
78
+      dest:
79
+        path: .values.conf.drydock.maasdriver.maas_api_url
80
+        pattern: 'MAAS_PORT'
81
+
65 82
     # Credentials
66 83
 
67 84
     - src:

+ 44
- 44
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -22,7 +22,7 @@ data:
22 22
           type: git
23 23
           location: https://git.openstack.org/openstack/openstack-helm-infra
24 24
           subpath: helm-toolkit
25
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
25
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
26 26
         calico:
27 27
           type: git
28 28
           location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
42 42
         type: git
43 43
         location: https://git.openstack.org/openstack/openstack-helm-infra
44 44
         subpath: helm-toolkit
45
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
45
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
46 46
       controller-manager:
47 47
         type: git
48 48
         location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
52 52
         type: git
53 53
         location: https://git.openstack.org/openstack/openstack-helm-infra
54 54
         subpath: helm-toolkit
55
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
55
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56 56
       coredns:
57 57
         type: git
58 58
         location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
62 62
         type: git
63 63
         location: https://git.openstack.org/openstack/openstack-helm-infra
64 64
         subpath: helm-toolkit
65
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
65
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66 66
       haproxy:
67 67
         type: git
68 68
         location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
72 72
         type: git
73 73
         location: https://git.openstack.org/openstack/openstack-helm-infra
74 74
         subpath: helm-toolkit
75
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
75
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76 76
       etcd:
77 77
         type: git
78 78
         location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
82 82
         type: git
83 83
         location: https://git.openstack.org/openstack/openstack-helm-infra
84 84
         subpath: helm-toolkit
85
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
85
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86 86
       ingress:
87 87
         type: git
88 88
         location: https://git.openstack.org/openstack/openstack-helm-infra
89 89
         subpath: ingress
90
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
90
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91 91
       ingress-htk:
92 92
         type: git
93 93
         location: https://git.openstack.org/openstack/openstack-helm-infra
94 94
         subpath: helm-toolkit
95
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
95
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96 96
       proxy:
97 97
         type: git
98 98
         location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
102 102
         type: git
103 103
         location: https://git.openstack.org/openstack/openstack-helm-infra
104 104
         subpath: helm-toolkit
105
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
105
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106 106
       scheduler:
107 107
         type: git
108 108
         location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
112 112
         type: git
113 113
         location: https://git.openstack.org/openstack/openstack-helm-infra
114 114
         subpath: helm-toolkit
115
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
115
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
116 116
     ucp:
117 117
       nfs_provisioner:
118 118
         type: git
119 119
         location: https://git.openstack.org/openstack/openstack-helm-infra
120 120
         subpath: nfs-provisioner
121
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
121
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
122 122
       nfs_htk:
123 123
         type: git
124 124
         location: https://git.openstack.org/openstack/openstack-helm-infra
125 125
         subpath: helm-toolkit
126
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
126
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 127
       armada:
128 128
         type: git
129 129
         location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
133 133
         type: git
134 134
         location: https://git.openstack.org/openstack/openstack-helm-infra
135 135
         subpath: helm-toolkit
136
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
136
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137 137
       barbican:
138 138
         type: git
139 139
         location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
143 143
         type: git
144 144
         location: https://git.openstack.org/openstack/openstack-helm-infra
145 145
         subpath: helm-toolkit
146
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
146
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
147 147
       #TODO Update to split ceph charts
148 148
       ceph:
149 149
         type: git
@@ -164,7 +164,7 @@ data:
164 164
         type: git
165 165
         location: https://git.openstack.org/openstack/openstack-helm-infra
166 166
         subpath: helm-toolkit
167
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
167
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
168 168
       divingbell:
169 169
         type: git
170 170
         location: https://git.openstack.org/openstack/airship-divingbell
@@ -174,7 +174,7 @@ data:
174 174
         type: git
175 175
         location: https://git.openstack.org/openstack/openstack-helm-infra
176 176
         subpath: helm-toolkit
177
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
177
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
178 178
       drydock:
179 179
         type: git
180 180
         location: https://git.openstack.org/openstack/airship-drydock
@@ -189,12 +189,12 @@ data:
189 189
         type: git
190 190
         location: https://git.openstack.org/openstack/openstack-helm-infra
191 191
         subpath: ingress
192
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
192
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
193 193
       ingress-htk:
194 194
         type: git
195 195
         location: https://git.openstack.org/openstack/openstack-helm-infra
196 196
         subpath: helm-toolkit
197
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
197
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
198 198
       postgresql:
199 199
         type: git
200 200
         location: https://git.openstack.org/openstack/openstack-helm
@@ -204,7 +204,7 @@ data:
204 204
         type: git
205 205
         location: https://git.openstack.org/openstack/openstack-helm-infra
206 206
         subpath: helm-toolkit
207
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
207
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
208 208
       promenade:
209 209
         type: git
210 210
         location: https://git.openstack.org/openstack/airship-promenade
@@ -214,7 +214,7 @@ data:
214 214
         type: git
215 215
         location: https://git.openstack.org/openstack/openstack-helm-infra
216 216
         subpath: helm-toolkit
217
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
217
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
218 218
       keystone:
219 219
         type: git
220 220
         location: https://git.openstack.org/openstack/openstack-helm
@@ -224,17 +224,17 @@ data:
224 224
         type: git
225 225
         location: https://git.openstack.org/openstack/openstack-helm-infra
226 226
         subpath: helm-toolkit
227
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
227
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
228 228
       maas:
229 229
         type: git
230 230
         location: https://git.openstack.org/openstack/airship-maas
231 231
         subpath: charts/maas
232
-        reference: master
232
+        reference: 2e003450cceb16b9bda71aa69a939a8466516582
233 233
       maas-htk:
234 234
         type: git
235 235
         location: https://git.openstack.org/openstack/openstack-helm-infra
236 236
         subpath: helm-toolkit
237
-        reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
237
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
238 238
       mariadb:
239 239
         type: git
240 240
         location: https://git.openstack.org/openstack/openstack-helm
@@ -244,27 +244,27 @@ data:
244 244
         type: git
245 245
         location: https://git.openstack.org/openstack/openstack-helm-infra
246 246
         subpath: helm-toolkit
247
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
247
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
248 248
       memcached:
249 249
         type: git
250 250
         location: https://git.openstack.org/openstack/openstack-helm-infra
251 251
         subpath: memcached
252
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
252
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253 253
       memcached-htk:
254 254
         type: git
255 255
         location: https://git.openstack.org/openstack/openstack-helm-infra
256 256
         subpath: helm-toolkit
257
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
257
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258 258
       rabbitmq:
259 259
         type: git
260 260
         location: https://git.openstack.org/openstack/openstack-helm-infra
261 261
         subpath: rabbitmq
262
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
262
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263 263
       rabbitmq-htk:
264 264
         type: git
265 265
         location: https://git.openstack.org/openstack/openstack-helm-infra
266 266
         subpath: helm-toolkit
267
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
267
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268 268
       shipyard:
269 269
         type: git
270 270
         location: https://git.openstack.org/openstack/airship-shipyard
@@ -284,7 +284,7 @@ data:
284 284
         type: git
285 285
         location: https://git.openstack.org/openstack/openstack-helm-infra
286 286
         subpath: helm-toolkit
287
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
287
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
288 288
     openstack:
289 289
       glance:
290 290
         type: git
@@ -295,7 +295,7 @@ data:
295 295
         type: git
296 296
         location: https://git.openstack.org/openstack/openstack-helm-infra
297 297
         subpath: helm-toolkit
298
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
298
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
299 299
       heat:
300 300
         type: git
301 301
         location: https://git.openstack.org/openstack/openstack-helm
@@ -305,7 +305,7 @@ data:
305 305
         type: git
306 306
         location: https://git.openstack.org/openstack/openstack-helm-infra
307 307
         subpath: helm-toolkit
308
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
308
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
309 309
       horizon:
310 310
         type: git
311 311
         location: https://git.openstack.org/openstack/openstack-helm
@@ -315,17 +315,17 @@ data:
315 315
         type: git
316 316
         location: https://git.openstack.org/openstack/openstack-helm-infra
317 317
         subpath: helm-toolkit
318
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
318
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
319 319
       ingress:
320 320
         type: git
321 321
         location: https://git.openstack.org/openstack/openstack-helm-infra
322 322
         subpath: ingress
323
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
323
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
324 324
       ingress-htk:
325 325
         type: git
326 326
         location: https://git.openstack.org/openstack/openstack-helm-infra
327 327
         subpath: helm-toolkit
328
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
328
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
329 329
       keystone:
330 330
         type: git
331 331
         location: https://git.openstack.org/openstack/openstack-helm
@@ -335,7 +335,7 @@ data:
335 335
         type: git
336 336
         location: https://git.openstack.org/openstack/openstack-helm-infra
337 337
         subpath: helm-toolkit
338
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
338
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
339 339
       libvirt:
340 340
         type: git
341 341
         location: https://git.openstack.org/openstack/openstack-helm
@@ -345,7 +345,7 @@ data:
345 345
         type: git
346 346
         location: https://git.openstack.org/openstack/openstack-helm-infra
347 347
         subpath: helm-toolkit
348
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
348
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
349 349
       mariadb:
350 350
         type: git
351 351
         location: https://git.openstack.org/openstack/openstack-helm
@@ -355,17 +355,17 @@ data:
355 355
         type: git
356 356
         location: https://git.openstack.org/openstack/openstack-helm-infra
357 357
         subpath: helm-toolkit
358
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
358
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
359 359
       memcached:
360 360
         type: git
361 361
         location: https://git.openstack.org/openstack/openstack-helm-infra
362 362
         subpath: memcached
363
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
363
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
364 364
       memcached-htk:
365 365
         type: git
366 366
         location: https://git.openstack.org/openstack/openstack-helm-infra
367 367
         subpath: helm-toolkit
368
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
368
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
369 369
       neutron:
370 370
         type: git
371 371
         location: https://git.openstack.org/openstack/openstack-helm
@@ -375,7 +375,7 @@ data:
375 375
         type: git
376 376
         location: https://git.openstack.org/openstack/openstack-helm-infra
377 377
         subpath: helm-toolkit
378
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
378
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
379 379
       nova:
380 380
         type: git
381 381
         location: https://git.openstack.org/openstack/openstack-helm
@@ -385,7 +385,7 @@ data:
385 385
         type: git
386 386
         location: https://git.openstack.org/openstack/openstack-helm-infra
387 387
         subpath: helm-toolkit
388
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
388
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
389 389
       openvswitch:
390 390
         type: git
391 391
         location: https://git.openstack.org/openstack/openstack-helm
@@ -395,17 +395,17 @@ data:
395 395
         type: git
396 396
         location: https://git.openstack.org/openstack/openstack-helm-infra
397 397
         subpath: helm-toolkit
398
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
398
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
399 399
       rabbitmq:
400 400
         type: git
401 401
         location: https://git.openstack.org/openstack/openstack-helm-infra
402 402
         subpath: rabbitmq
403
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
403
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
404 404
       rabbitmq-htk:
405 405
         type: git
406 406
         location: https://git.openstack.org/openstack/openstack-helm-infra
407 407
         subpath: helm-toolkit
408
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
408
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
409 409
 
410 410
   files:
411 411
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz

+ 32
- 36
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -22,7 +22,7 @@ data:
22 22
           type: git
23 23
           location: https://git.openstack.org/openstack/openstack-helm-infra
24 24
           subpath: helm-toolkit
25
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
25
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
26 26
         calico:
27 27
           type: git
28 28
           location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
42 42
         type: git
43 43
         location: https://git.openstack.org/openstack/openstack-helm-infra
44 44
         subpath: helm-toolkit
45
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
45
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
46 46
       controller-manager:
47 47
         type: git
48 48
         location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
52 52
         type: git
53 53
         location: https://git.openstack.org/openstack/openstack-helm-infra
54 54
         subpath: helm-toolkit
55
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
55
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56 56
       coredns:
57 57
         type: git
58 58
         location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
62 62
         type: git
63 63
         location: https://git.openstack.org/openstack/openstack-helm-infra
64 64
         subpath: helm-toolkit
65
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
65
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66 66
       haproxy:
67 67
         type: git
68 68
         location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
72 72
         type: git
73 73
         location: https://git.openstack.org/openstack/openstack-helm-infra
74 74
         subpath: helm-toolkit
75
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
75
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76 76
       etcd:
77 77
         type: git
78 78
         location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
82 82
         type: git
83 83
         location: https://git.openstack.org/openstack/openstack-helm-infra
84 84
         subpath: helm-toolkit
85
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
85
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86 86
       ingress:
87 87
         type: git
88 88
         location: https://git.openstack.org/openstack/openstack-helm-infra
89 89
         subpath: ingress
90
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
90
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91 91
       ingress-htk:
92 92
         type: git
93 93
         location: https://git.openstack.org/openstack/openstack-helm-infra
94 94
         subpath: helm-toolkit
95
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
95
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96 96
       proxy:
97 97
         type: git
98 98
         location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
102 102
         type: git
103 103
         location: https://git.openstack.org/openstack/openstack-helm-infra
104 104
         subpath: helm-toolkit
105
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
105
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106 106
       scheduler:
107 107
         type: git
108 108
         location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
112 112
         type: git
113 113
         location: https://git.openstack.org/openstack/openstack-helm-infra
114 114
         subpath: helm-toolkit
115
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
115
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
116 116
     ucp:
117 117
       nfs_provisioner:
118 118
         type: git
119 119
         location: https://git.openstack.org/openstack/openstack-helm-infra
120 120
         subpath: nfs-provisioner
121
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
121
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
122 122
       nfs_htk:
123 123
         type: git
124 124
         location: https://git.openstack.org/openstack/openstack-helm-infra
125 125
         subpath: helm-toolkit
126
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
126
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 127
       armada:
128 128
         type: git
129 129
         location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
133 133
         type: git
134 134
         location: https://git.openstack.org/openstack/openstack-helm-infra
135 135
         subpath: helm-toolkit
136
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
136
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137 137
       barbican:
138 138
         type: git
139 139
         location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
143 143
         type: git
144 144
         location: https://git.openstack.org/openstack/openstack-helm-infra
145 145
         subpath: helm-toolkit
146
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
146
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
147 147
       #TODO Update to split ceph charts
148 148
       ceph:
149 149
         type: git
@@ -165,7 +165,7 @@ data:
165 165
         type: git
166 166
         location: https://git.openstack.org/openstack/openstack-helm-infra
167 167
         subpath: helm-toolkit
168
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
168
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
169 169
       divingbell:
170 170
         type: git
171 171
         location: https://git.openstack.org/openstack/airship-divingbell
@@ -175,29 +175,27 @@ data:
175 175
         type: git
176 176
         location: https://git.openstack.org/openstack/openstack-helm-infra
177 177
         subpath: helm-toolkit
178
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
178
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
179 179
       drydock:
180 180
         type: git
181 181
         location: https://git.openstack.org/openstack/airship-drydock
182 182
         subpath: charts/drydock
183
-        reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b
184
-      # TODO waiting for https://review.openstack.org/#/c/595902/ to move to
185
-      #      openstack-helm-infra version.
183
+        reference: master
186 184
       drydock-htk:
187 185
         type: git
188
-        location: https://git.openstack.org/openstack/openstack-helm
186
+        location: https://git.openstack.org/openstack/openstack-helm-infra
189 187
         subpath: helm-toolkit
190
-        reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
188
+        reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
191 189
       ingress:
192 190
         type: git
193 191
         location: https://git.openstack.org/openstack/openstack-helm-infra
194 192
         subpath: ingress
195
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
193
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
196 194
       ingress-htk:
197 195
         type: git
198 196
         location: https://git.openstack.org/openstack/openstack-helm-infra
199 197
         subpath: helm-toolkit
200
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
198
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
201 199
       postgresql:
202 200
         type: git
203 201
         location: https://git.openstack.org/openstack/openstack-helm
@@ -207,7 +205,7 @@ data:
207 205
         type: git
208 206
         location: https://git.openstack.org/openstack/openstack-helm-infra
209 207
         subpath: helm-toolkit
210
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
208
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
211 209
       promenade:
212 210
         type: git
213 211
         location: https://git.openstack.org/openstack/airship-promenade
@@ -217,7 +215,7 @@ data:
217 215
         type: git
218 216
         location: https://git.openstack.org/openstack/openstack-helm-infra
219 217
         subpath: helm-toolkit
220
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
218
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
221 219
       keystone:
222 220
         type: git
223 221
         location: https://git.openstack.org/openstack/openstack-helm
@@ -227,19 +225,17 @@ data:
227 225
         type: git
228 226
         location: https://git.openstack.org/openstack/openstack-helm-infra
229 227
         subpath: helm-toolkit
230
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
228
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
231 229
       maas:
232 230
         type: git
233 231
         location: https://git.openstack.org/openstack/airship-maas
234 232
         subpath: charts/maas
235
-        # TODO(bryan-strassner) set to new version
236
-        #     when https://review.openstack.org/#/c/595398/ is complete
237
-        reference: refs/changes/98/595398/5
233
+        reference: 2e003450cceb16b9bda71aa69a939a8466516582
238 234
       maas-htk:
239 235
         type: git
240 236
         location: https://git.openstack.org/openstack/openstack-helm-infra
241 237
         subpath: helm-toolkit
242
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
238
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
243 239
       mariadb:
244 240
         type: git
245 241
         location: https://git.openstack.org/openstack/openstack-helm
@@ -249,27 +245,27 @@ data:
249 245
         type: git
250 246
         location: https://git.openstack.org/openstack/openstack-helm-infra
251 247
         subpath: helm-toolkit
252
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
248
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253 249
       memcached:
254 250
         type: git
255 251
         location: https://git.openstack.org/openstack/openstack-helm-infra
256 252
         subpath: memcached
257
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
253
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258 254
       memcached-htk:
259 255
         type: git
260 256
         location: https://git.openstack.org/openstack/openstack-helm-infra
261 257
         subpath: helm-toolkit
262
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
258
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263 259
       rabbitmq:
264 260
         type: git
265 261
         location: https://git.openstack.org/openstack/openstack-helm-infra
266 262
         subpath: rabbitmq
267
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
263
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268 264
       rabbitmq-htk:
269 265
         type: git
270 266
         location: https://git.openstack.org/openstack/openstack-helm-infra
271 267
         subpath: helm-toolkit
272
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
268
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
273 269
       shipyard:
274 270
         type: git
275 271
         location: https://git.openstack.org/openstack/airship-shipyard
@@ -289,7 +285,7 @@ data:
289 285
         type: git
290 286
         location: https://git.openstack.org/openstack/openstack-helm-infra
291 287
         subpath: helm-toolkit
292
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
288
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
293 289
 
294 290
   files:
295 291
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz

Loading…
Cancel
Save