Browse Source

Merge "Uplift various components to newer versions"

Zuul 5 months ago
parent
commit
568f528970

+ 6
- 0
deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml View File

@@ -72,6 +72,12 @@ data:
72 72
       prometheus_mysql_exporter:
73 73
         node_selector_key: ucp-control-plane
74 74
         node_selector_value: enabled
75
+      ingress:
76
+        node_selector_key: ucp-control-plane
77
+        node_selector_value: enabled
78
+      error_server:
79
+        node_selector_key: ucp-control-plane
80
+        node_selector_value: enabled
75 81
     pod:
76 82
       replicas:
77 83
         server: 1

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

@@ -12,107 +12,107 @@ metadata:
12 12
 data:
13 13
   charts:
14 14
     kubernetes:
15
+      apiserver:
16
+        location: https://git.openstack.org/openstack/airship-promenade
17
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
18
+        subpath: charts/apiserver
19
+        type: git
20
+      apiserver-htk:
21
+        location: https://git.openstack.org/openstack/openstack-helm-infra
22
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
23
+        subpath: helm-toolkit
24
+        type: git
15 25
       calico:
16
-        etcd:
17
-          type: git
18
-          location: https://git.openstack.org/openstack/airship-promenade
19
-          subpath: charts/etcd
20
-          reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
21
-        etcd-htk:
22
-          type: git
23
-          location: https://git.openstack.org/openstack/openstack-helm-infra
24
-          subpath: helm-toolkit
25
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
26 26
         calico:
27
-          type: git
28 27
           location: https://git.openstack.org/openstack/openstack-helm-infra
28
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
29 29
           subpath: calico
30
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
30
+          type: git
31 31
         calico-htk:
32
+          location: https://git.openstack.org/openstack/openstack-helm-infra
33
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
34
+          subpath: helm-toolkit
35
+          type: git
36
+        etcd:
37
+          location: https://git.openstack.org/openstack/airship-promenade
38
+          reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
39
+          subpath: charts/etcd
32 40
           type: git
41
+        etcd-htk:
33 42
           location: https://git.openstack.org/openstack/openstack-helm-infra
43
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
34 44
           subpath: helm-toolkit
35
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
36
-      apiserver:
37
-        type: git
38
-        location: https://git.openstack.org/openstack/airship-promenade
39
-        subpath: charts/apiserver
40
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
41
-      apiserver-htk:
42
-        type: git
43
-        location: https://git.openstack.org/openstack/openstack-helm-infra
44
-        subpath: helm-toolkit
45
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
45
+          type: git
46 46
       controller-manager:
47
-        type: git
48 47
         location: https://git.openstack.org/openstack/airship-promenade
48
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
49 49
         subpath: charts/controller_manager
50
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
51
-      controller-manager-htk:
52 50
         type: git
51
+      controller-manager-htk:
53 52
         location: https://git.openstack.org/openstack/openstack-helm-infra
54
-        subpath: helm-toolkit
55 53
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56
-      coredns:
54
+        subpath: helm-toolkit
57 55
         type: git
56
+      coredns:
58 57
         location: https://git.openstack.org/openstack/airship-promenade
58
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
59 59
         subpath: charts/coredns
60
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
61
-      coredns-htk:
62 60
         type: git
61
+      coredns-htk:
63 62
         location: https://git.openstack.org/openstack/openstack-helm-infra
64
-        subpath: helm-toolkit
65 63
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66
-      haproxy:
64
+        subpath: helm-toolkit
67 65
         type: git
66
+      etcd:
68 67
         location: https://git.openstack.org/openstack/airship-promenade
69
-        subpath: charts/haproxy
70
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
71
-      haproxy-htk:
68
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
69
+        subpath: charts/etcd
72 70
         type: git
71
+      etcd-htk:
73 72
         location: https://git.openstack.org/openstack/openstack-helm-infra
74
-        subpath: helm-toolkit
75 73
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76
-      etcd:
74
+        subpath: helm-toolkit
77 75
         type: git
76
+      haproxy:
78 77
         location: https://git.openstack.org/openstack/airship-promenade
79
-        subpath: charts/etcd
80
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
81
-      etcd-htk:
78
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
79
+        subpath: charts/haproxy
82 80
         type: git
81
+      haproxy-htk:
83 82
         location: https://git.openstack.org/openstack/openstack-helm-infra
84
-        subpath: helm-toolkit
85 83
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86
-      ingress:
84
+        subpath: helm-toolkit
87 85
         type: git
86
+      ingress:
88 87
         location: https://git.openstack.org/openstack/openstack-helm-infra
89
-        subpath: ingress
90 88
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91
-      ingress-htk:
89
+        subpath: ingress
92 90
         type: git
91
+      ingress-htk:
93 92
         location: https://git.openstack.org/openstack/openstack-helm-infra
94
-        subpath: helm-toolkit
95 93
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96
-      proxy:
94
+        subpath: helm-toolkit
97 95
         type: git
96
+      proxy:
98 97
         location: https://git.openstack.org/openstack/airship-promenade
98
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
99 99
         subpath: charts/proxy
100
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
101
-      proxy-htk:
102 100
         type: git
101
+      proxy-htk:
103 102
         location: https://git.openstack.org/openstack/openstack-helm-infra
104
-        subpath: helm-toolkit
105 103
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106
-      scheduler:
104
+        subpath: helm-toolkit
107 105
         type: git
106
+      scheduler:
108 107
         location: https://git.openstack.org/openstack/airship-promenade
108
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
109 109
         subpath: charts/scheduler
110
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
111
-      scheduler-htk:
112 110
         type: git
111
+      scheduler-htk:
113 112
         location: https://git.openstack.org/openstack/openstack-helm-infra
114
-        subpath: helm-toolkit
115 113
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
114
+        subpath: helm-toolkit
115
+        type: git
116 116
     ucp:
117 117
       nfs_provisioner:
118 118
         type: git
@@ -125,25 +125,25 @@ data:
125 125
         subpath: helm-toolkit
126 126
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 127
       armada:
128
-        type: git
129 128
         location: https://git.openstack.org/openstack/airship-armada
129
+        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
130 130
         subpath: charts/armada
131
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
132
-      armada-htk:
133 131
         type: git
132
+      armada-htk:
134 133
         location: https://git.openstack.org/openstack/openstack-helm-infra
135
-        subpath: helm-toolkit
136 134
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137
-      barbican:
135
+        subpath: helm-toolkit
138 136
         type: git
137
+      barbican:
139 138
         location: https://git.openstack.org/openstack/openstack-helm
139
+        reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
140 140
         subpath: barbican
141
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
142
-      barbican-htk:
143 141
         type: git
142
+      barbican-htk:
144 143
         location: https://git.openstack.org/openstack/openstack-helm-infra
145
-        subpath: helm-toolkit
146 144
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
145
+        subpath: helm-toolkit
146
+        type: git
147 147
       #TODO Update to split ceph charts
148 148
       ceph:
149 149
         type: git
@@ -156,135 +156,135 @@ data:
156 156
         subpath: helm-toolkit
157 157
         reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
158 158
       deckhand:
159
-        type: git
160 159
         location: https://git.openstack.org/openstack/airship-deckhand
160
+        reference: 464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
161 161
         subpath: charts/deckhand
162
-        reference: a0f00013b5db1def374fbd5b9f0009f704290bb1
163
-      deckhand-htk:
164 162
         type: git
163
+      deckhand-htk:
165 164
         location: https://git.openstack.org/openstack/openstack-helm-infra
166
-        subpath: helm-toolkit
167 165
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
168
-      divingbell:
166
+        subpath: helm-toolkit
169 167
         type: git
168
+      divingbell:
170 169
         location: https://git.openstack.org/openstack/airship-divingbell
170
+        reference: a648dcb2db2b842656bfee08102081023080e4d5
171 171
         subpath: divingbell
172
-        reference: 0ac90c40a0741a929204d139dfa0415562b7044e
173
-      divingbell-htk:
174 172
         type: git
173
+      divingbell-htk:
175 174
         location: https://git.openstack.org/openstack/openstack-helm-infra
176
-        subpath: helm-toolkit
177 175
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
178
-      drydock:
176
+        subpath: helm-toolkit
179 177
         type: git
178
+      drydock:
180 179
         location: https://git.openstack.org/openstack/airship-drydock
180
+        reference: 756a063c3074ddd847af1dd02c9b576b541cedbd
181 181
         subpath: charts/drydock
182
-        reference: master
183
-      drydock-htk:
184 182
         type: git
183
+      drydock-htk:
185 184
         location: https://git.openstack.org/openstack/openstack-helm-infra
185
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
186 186
         subpath: helm-toolkit
187
-        reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
188
-      ingress:
189 187
         type: git
188
+      ingress:
190 189
         location: https://git.openstack.org/openstack/openstack-helm-infra
191
-        subpath: ingress
192 190
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
193
-      ingress-htk:
191
+        subpath: ingress
194 192
         type: git
193
+      ingress-htk:
195 194
         location: https://git.openstack.org/openstack/openstack-helm-infra
196
-        subpath: helm-toolkit
197 195
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
198
-      postgresql:
199
-        type: git
200
-        location: https://git.openstack.org/openstack/openstack-helm
201
-        subpath: postgresql
202
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
203
-      postgresql-htk:
204
-        type: git
205
-        location: https://git.openstack.org/openstack/openstack-helm-infra
206 196
         subpath: helm-toolkit
207
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
208
-      promenade:
209 197
         type: git
210
-        location: https://git.openstack.org/openstack/airship-promenade
211
-        subpath: charts/promenade
212
-        reference: 24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
213
-      promenade-htk:
214
-        type: git
215
-        location: https://git.openstack.org/openstack/openstack-helm-infra
216
-        subpath: helm-toolkit
217
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
218 198
       keystone:
219
-        type: git
220 199
         location: https://git.openstack.org/openstack/openstack-helm
200
+        reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
221 201
         subpath: keystone
222
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
223
-      keystone-htk:
224 202
         type: git
203
+      keystone-htk:
225 204
         location: https://git.openstack.org/openstack/openstack-helm-infra
226
-        subpath: helm-toolkit
227 205
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
228
-      maas:
206
+        subpath: helm-toolkit
229 207
         type: git
208
+      maas:
230 209
         location: https://git.openstack.org/openstack/airship-maas
231
-        subpath: charts/maas
232 210
         reference: 2e003450cceb16b9bda71aa69a939a8466516582
233
-      maas-htk:
211
+        subpath: charts/maas
234 212
         type: git
213
+      maas-htk:
235 214
         location: https://git.openstack.org/openstack/openstack-helm-infra
236
-        subpath: helm-toolkit
237 215
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
238
-      mariadb:
216
+        subpath: helm-toolkit
239 217
         type: git
240
-        location: https://git.openstack.org/openstack/openstack-helm
218
+      mariadb:
219
+        location: https://git.openstack.org/openstack/openstack-helm-infra
220
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
241 221
         subpath: mariadb
242
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
243
-      mariadb-htk:
244 222
         type: git
223
+      mariadb-htk:
245 224
         location: https://git.openstack.org/openstack/openstack-helm-infra
246
-        subpath: helm-toolkit
247 225
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
248
-      memcached:
226
+        subpath: helm-toolkit
249 227
         type: git
228
+      memcached:
250 229
         location: https://git.openstack.org/openstack/openstack-helm-infra
251
-        subpath: memcached
252 230
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253
-      memcached-htk:
231
+        subpath: memcached
254 232
         type: git
233
+      memcached-htk:
255 234
         location: https://git.openstack.org/openstack/openstack-helm-infra
235
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
256 236
         subpath: helm-toolkit
237
+        type: git
238
+      postgresql:
239
+        location: https://git.openstack.org/openstack/openstack-helm-infra
257 240
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258
-      rabbitmq:
241
+        subpath: postgresql
259 242
         type: git
243
+      postgresql-htk:
260 244
         location: https://git.openstack.org/openstack/openstack-helm-infra
261
-        subpath: rabbitmq
262 245
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263
-      rabbitmq-htk:
246
+        subpath: helm-toolkit
247
+        type: git
248
+      promenade:
249
+        location: https://git.openstack.org/openstack/airship-promenade
250
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
251
+        subpath: charts/promenade
264 252
         type: git
253
+      promenade-htk:
265 254
         location: https://git.openstack.org/openstack/openstack-helm-infra
255
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
266 256
         subpath: helm-toolkit
257
+        type: git
258
+      rabbitmq:
259
+        location: https://git.openstack.org/openstack/openstack-helm-infra
267 260
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268
-      shipyard:
261
+        subpath: rabbitmq
262
+        type: git
263
+      rabbitmq-htk:
264
+        location: https://git.openstack.org/openstack/openstack-helm-infra
265
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
266
+        subpath: helm-toolkit
269 267
         type: git
268
+      shipyard:
270 269
         location: https://git.openstack.org/openstack/airship-shipyard
270
+        reference: 70ec78815dfc9deeb342a3fccfa3cd079a4312d9
271 271
         subpath: charts/shipyard
272
-        reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
273
-      shipyard-htk:
274 272
         type: git
273
+      shipyard-htk:
275 274
         location: https://git.openstack.org/openstack/openstack-helm-infra
275
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
276 276
         subpath: helm-toolkit
277
-        reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207
278
-      tiller:
279 277
         type: git
278
+      tiller:
280 279
         location: https://git.openstack.org/openstack/airship-armada
280
+        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
281 281
         subpath: charts/tiller
282
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
283
-      tiller-htk:
284 282
         type: git
283
+      tiller-htk:
285 284
         location: https://git.openstack.org/openstack/openstack-helm-infra
286
-        subpath: helm-toolkit
287 285
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
286
+        subpath: helm-toolkit
287
+        type: git
288 288
     openstack:
289 289
       glance:
290 290
         type: git
@@ -442,29 +442,70 @@ data:
442 442
   images:
443 443
     ucp:
444 444
       armada:
445
-        api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290
445
+        api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
446 446
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
447 447
         ks_endpoints: docker.io/openstackhelm/heat:ocata
448 448
         ks_service: docker.io/openstackhelm/heat:ocata
449 449
         ks_user: docker.io/openstackhelm/heat:ocata
450 450
         helm: lachlanevenson/k8s-helm:v2.10.0
451 451
         tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
452
-      promenade:
452
+      armada:
453
+        api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
453 454
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
454
-        promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
455
-        ks_user: docker.io/openstackhelm/heat:ocata
456
-        ks_service: docker.io/openstackhelm/heat:ocata
455
+        helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
456
+        image_repo_sync: docker.io/docker:17.07.0
457 457
         ks_endpoints: docker.io/openstackhelm/heat:ocata
458
+        ks_service: docker.io/openstackhelm/heat:ocata
459
+        ks_user: docker.io/openstackhelm/heat:ocata
460
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
458 461
       deckhand:
459
-        # pinned back to older version to prevent substitution errors with
460
-        # newer version e.g.: fc03c6318a36fa60faf56ee79d91573fe7c60feb
461
-        deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
462
+        db_init: docker.io/postgres:9.5
463
+        db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
464
+        deckhand: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
465
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
466
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
467
+        ks_service: docker.io/openstackhelm/heat:ocata
468
+        ks_user: docker.io/openstackhelm/heat:ocata
469
+      divingbell:
470
+        divingbell: docker.io/ubuntu:16.04
471
+      drydock:
462 472
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
473
+        drydock: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
474
+        drydock_db_init: docker.io/postgres:9.5
475
+        drydock_db_sync: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
476
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
477
+        ks_service: docker.io/openstackhelm/heat:ocata
478
+        ks_user: docker.io/openstackhelm/heat:ocata
479
+      maas:
480
+        bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
463 481
         db_init: docker.io/postgres:9.5
464
-        db_sync: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
482
+        db_sync: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
483
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
484
+        export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
485
+        maas_cache: quay.io/airshipit/sstream-cache:2e003450cceb16b9bda71aa69a939a8466516582
486
+        maas_rack: quay.io/airshipit/maas-rack-controller:2e003450cceb16b9bda71aa69a939a8466516582
487
+        maas_region: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
488
+      promenade:
489
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
490
+        image_repo_sync: docker.io/docker:17.07.0
491
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
492
+        ks_service: docker.io/openstackhelm/heat:ocata
493
+        ks_user: docker.io/openstackhelm/heat:ocata
494
+        promenade: quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22
495
+      shipyard:
496
+        airflow: quay.io/airshipit/airflow:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
497
+        airflow_db_init: docker.io/postgres:9.5
498
+        airflow_db_sync: quay.io/airshipit/airflow:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
499
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
500
+        image_repo_sync: docker.io/docker:17.07.0
465 501
         ks_endpoints: docker.io/openstackhelm/heat:ocata
466 502
         ks_service: docker.io/openstackhelm/heat:ocata
467 503
         ks_user: docker.io/openstackhelm/heat:ocata
504
+        shipyard: quay.io/airshipit/shipyard:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
505
+        shipyard_db_init: docker.io/postgres:9.5
506
+        shipyard_db_sync: quay.io/airshipit/shipyard:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
507
+      tiller:
508
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
468 509
       barbican:
469 510
         bootstrap: docker.io/openstackhelm/heat:ocata
470 511
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@@ -476,36 +517,6 @@ data:
476 517
         ks_service: docker.io/openstackhelm/heat:ocata
477 518
         ks_user: docker.io/openstackhelm/heat:ocata
478 519
         barbican_api: docker.io/openstackhelm/barbican:ocata
479
-      drydock:
480
-        drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
481
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
482
-        ks_user: docker.io/openstackhelm/heat:ocata
483
-        ks_service: docker.io/openstackhelm/heat:ocata
484
-        ks_endpoints: docker.io/openstackhelm/heat:ocata
485
-        drydock_db_init: docker.io/postgres:9.5
486
-        drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
487
-      shipyard:
488
-        airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
489
-        shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
490
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
491
-        shipyard_db_init: docker.io/postgres:9.5
492
-        shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
493
-        airflow_db_init: docker.io/postgres:9.5
494
-        airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
495
-        ks_user: docker.io/openstackhelm/heat:ocata
496
-        ks_service: docker.io/openstackhelm/heat:ocata
497
-        ks_endpoints: docker.io/openstackhelm/heat:ocata
498
-      maas:
499
-        db_init: docker.io/postgres:9.5
500
-        db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
501
-        maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
502
-        maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
503
-        bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
504
-        export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
505
-        maas_cache: quay.io/airshipit/sstream-cache:dfb92ce07f87648f3423be11e51425923bc9f8b1
506
-        ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
507
-        error_pages: gcr.io/google_containers/defaultbackend:1.0
508
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
509 520
       keystone:
510 521
         keystone_bootstrap: docker.io/openstackhelm/heat:ocata
511 522
         test: docker.io/kolla/ubuntu-source-rally:4.0.0
@@ -518,10 +529,8 @@ data:
518 529
         keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata
519 530
         keystone_api: docker.io/openstackhelm/keystone:ocata
520 531
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
521
-      tiller:
522
-        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
523 532
       mariadb:
524
-        mariadb: docker.io/mariadb:10.1.23
533
+        mariadb: docker.io/openstackhelm/mariadb:10.2.18
525 534
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
526 535
       postgresql:
527 536
         postgresql: docker.io/postgres:9.5

+ 2
- 14
deployment_files/site/gate-multinode/software/configs/versions.yaml View File

@@ -17,18 +17,6 @@ metadata:
17 17
 # versions to match a patchset, for example. Anything specified in the global
18 18
 # versions can be overridden, such as chart or image versions.
19 19
 data:
20
-  charts:
21
-    ucp:
22
-      maas:
23
-        location: https://git.openstack.org/openstack/airship-maas
24
-        reference: refs/changes/53/600253/39
25
-      maas-htk:
26
-        location: https://git.openstack.org/openstack/openstack-helm-infra
27
-        subpath: helm-toolkit
28
-        reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
29
-  images:
30
-    ucp:
31
-      maas:
32
-        maas_region: 'docker.io/sthussey/maas-region-controller:dev'
33
-        maas_cache: 'quay.io/airshipit/sstream-cache:master'
20
+  charts: {}
21
+  images: {}
34 22
 ...

Loading…
Cancel
Save