summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <bryan.strassner@gmail.com>2018-11-06 16:48:16 -0600
committerBryan Strassner <bryan.strassner@gmail.com>2018-11-07 15:37:45 -0600
commit163847c6c42def24aa9586e4fa2bac7ba67d3b0a (patch)
tree1c2b393c8382a538ae2afd79bd9c6c2a937a8ab5
parent7a9db79c8ef5c2a6dce08cf9dbdf4de3fdd36fba (diff)
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
Notes
Notes (review): Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+2: Pete Birley <petebirley@gmail.com> Workflow+1: Pete Birley <petebirley@gmail.com> Code-Review+1: Michael Beaver <michaelbeaver64@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 07 Nov 2018 23:51:05 +0000 Reviewed-on: https://review.openstack.org/616241 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml17
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml88
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml68
3 files changed, 93 insertions, 80 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
index 5255586..a531f43 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
@@ -62,6 +62,23 @@ metadata:
62 dest: 62 dest:
63 path: .values.endpoints.physicalprovisioner.port.api.nodeport 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 # Credentials 82 # Credentials
66 83
67 - src: 84 - src:
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 8c127f7..2886f21 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -22,7 +22,7 @@ data:
22 type: git 22 type: git
23 location: https://git.openstack.org/openstack/openstack-helm-infra 23 location: https://git.openstack.org/openstack/openstack-helm-infra
24 subpath: helm-toolkit 24 subpath: helm-toolkit
25 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 25 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
26 calico: 26 calico:
27 type: git 27 type: git
28 location: https://git.openstack.org/openstack/openstack-helm-infra 28 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
42 type: git 42 type: git
43 location: https://git.openstack.org/openstack/openstack-helm-infra 43 location: https://git.openstack.org/openstack/openstack-helm-infra
44 subpath: helm-toolkit 44 subpath: helm-toolkit
45 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 45 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
46 controller-manager: 46 controller-manager:
47 type: git 47 type: git
48 location: https://git.openstack.org/openstack/airship-promenade 48 location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
52 type: git 52 type: git
53 location: https://git.openstack.org/openstack/openstack-helm-infra 53 location: https://git.openstack.org/openstack/openstack-helm-infra
54 subpath: helm-toolkit 54 subpath: helm-toolkit
55 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 55 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56 coredns: 56 coredns:
57 type: git 57 type: git
58 location: https://git.openstack.org/openstack/airship-promenade 58 location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
62 type: git 62 type: git
63 location: https://git.openstack.org/openstack/openstack-helm-infra 63 location: https://git.openstack.org/openstack/openstack-helm-infra
64 subpath: helm-toolkit 64 subpath: helm-toolkit
65 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 65 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66 haproxy: 66 haproxy:
67 type: git 67 type: git
68 location: https://git.openstack.org/openstack/airship-promenade 68 location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
72 type: git 72 type: git
73 location: https://git.openstack.org/openstack/openstack-helm-infra 73 location: https://git.openstack.org/openstack/openstack-helm-infra
74 subpath: helm-toolkit 74 subpath: helm-toolkit
75 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 75 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76 etcd: 76 etcd:
77 type: git 77 type: git
78 location: https://git.openstack.org/openstack/airship-promenade 78 location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
82 type: git 82 type: git
83 location: https://git.openstack.org/openstack/openstack-helm-infra 83 location: https://git.openstack.org/openstack/openstack-helm-infra
84 subpath: helm-toolkit 84 subpath: helm-toolkit
85 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 85 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86 ingress: 86 ingress:
87 type: git 87 type: git
88 location: https://git.openstack.org/openstack/openstack-helm-infra 88 location: https://git.openstack.org/openstack/openstack-helm-infra
89 subpath: ingress 89 subpath: ingress
90 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 90 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91 ingress-htk: 91 ingress-htk:
92 type: git 92 type: git
93 location: https://git.openstack.org/openstack/openstack-helm-infra 93 location: https://git.openstack.org/openstack/openstack-helm-infra
94 subpath: helm-toolkit 94 subpath: helm-toolkit
95 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 95 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96 proxy: 96 proxy:
97 type: git 97 type: git
98 location: https://git.openstack.org/openstack/airship-promenade 98 location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
102 type: git 102 type: git
103 location: https://git.openstack.org/openstack/openstack-helm-infra 103 location: https://git.openstack.org/openstack/openstack-helm-infra
104 subpath: helm-toolkit 104 subpath: helm-toolkit
105 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 105 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106 scheduler: 106 scheduler:
107 type: git 107 type: git
108 location: https://git.openstack.org/openstack/airship-promenade 108 location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
112 type: git 112 type: git
113 location: https://git.openstack.org/openstack/openstack-helm-infra 113 location: https://git.openstack.org/openstack/openstack-helm-infra
114 subpath: helm-toolkit 114 subpath: helm-toolkit
115 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 115 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
116 ucp: 116 ucp:
117 nfs_provisioner: 117 nfs_provisioner:
118 type: git 118 type: git
119 location: https://git.openstack.org/openstack/openstack-helm-infra 119 location: https://git.openstack.org/openstack/openstack-helm-infra
120 subpath: nfs-provisioner 120 subpath: nfs-provisioner
121 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 121 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
122 nfs_htk: 122 nfs_htk:
123 type: git 123 type: git
124 location: https://git.openstack.org/openstack/openstack-helm-infra 124 location: https://git.openstack.org/openstack/openstack-helm-infra
125 subpath: helm-toolkit 125 subpath: helm-toolkit
126 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 126 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 armada: 127 armada:
128 type: git 128 type: git
129 location: https://git.openstack.org/openstack/airship-armada 129 location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
133 type: git 133 type: git
134 location: https://git.openstack.org/openstack/openstack-helm-infra 134 location: https://git.openstack.org/openstack/openstack-helm-infra
135 subpath: helm-toolkit 135 subpath: helm-toolkit
136 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 136 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137 barbican: 137 barbican:
138 type: git 138 type: git
139 location: https://git.openstack.org/openstack/openstack-helm 139 location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
143 type: git 143 type: git
144 location: https://git.openstack.org/openstack/openstack-helm-infra 144 location: https://git.openstack.org/openstack/openstack-helm-infra
145 subpath: helm-toolkit 145 subpath: helm-toolkit
146 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 146 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
147 #TODO Update to split ceph charts 147 #TODO Update to split ceph charts
148 ceph: 148 ceph:
149 type: git 149 type: git
@@ -164,7 +164,7 @@ data:
164 type: git 164 type: git
165 location: https://git.openstack.org/openstack/openstack-helm-infra 165 location: https://git.openstack.org/openstack/openstack-helm-infra
166 subpath: helm-toolkit 166 subpath: helm-toolkit
167 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 167 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
168 divingbell: 168 divingbell:
169 type: git 169 type: git
170 location: https://git.openstack.org/openstack/airship-divingbell 170 location: https://git.openstack.org/openstack/airship-divingbell
@@ -174,7 +174,7 @@ data:
174 type: git 174 type: git
175 location: https://git.openstack.org/openstack/openstack-helm-infra 175 location: https://git.openstack.org/openstack/openstack-helm-infra
176 subpath: helm-toolkit 176 subpath: helm-toolkit
177 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 177 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
178 drydock: 178 drydock:
179 type: git 179 type: git
180 location: https://git.openstack.org/openstack/airship-drydock 180 location: https://git.openstack.org/openstack/airship-drydock
@@ -189,12 +189,12 @@ data:
189 type: git 189 type: git
190 location: https://git.openstack.org/openstack/openstack-helm-infra 190 location: https://git.openstack.org/openstack/openstack-helm-infra
191 subpath: ingress 191 subpath: ingress
192 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 192 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
193 ingress-htk: 193 ingress-htk:
194 type: git 194 type: git
195 location: https://git.openstack.org/openstack/openstack-helm-infra 195 location: https://git.openstack.org/openstack/openstack-helm-infra
196 subpath: helm-toolkit 196 subpath: helm-toolkit
197 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 197 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
198 postgresql: 198 postgresql:
199 type: git 199 type: git
200 location: https://git.openstack.org/openstack/openstack-helm 200 location: https://git.openstack.org/openstack/openstack-helm
@@ -204,7 +204,7 @@ data:
204 type: git 204 type: git
205 location: https://git.openstack.org/openstack/openstack-helm-infra 205 location: https://git.openstack.org/openstack/openstack-helm-infra
206 subpath: helm-toolkit 206 subpath: helm-toolkit
207 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 207 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
208 promenade: 208 promenade:
209 type: git 209 type: git
210 location: https://git.openstack.org/openstack/airship-promenade 210 location: https://git.openstack.org/openstack/airship-promenade
@@ -214,7 +214,7 @@ data:
214 type: git 214 type: git
215 location: https://git.openstack.org/openstack/openstack-helm-infra 215 location: https://git.openstack.org/openstack/openstack-helm-infra
216 subpath: helm-toolkit 216 subpath: helm-toolkit
217 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 217 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
218 keystone: 218 keystone:
219 type: git 219 type: git
220 location: https://git.openstack.org/openstack/openstack-helm 220 location: https://git.openstack.org/openstack/openstack-helm
@@ -224,17 +224,17 @@ data:
224 type: git 224 type: git
225 location: https://git.openstack.org/openstack/openstack-helm-infra 225 location: https://git.openstack.org/openstack/openstack-helm-infra
226 subpath: helm-toolkit 226 subpath: helm-toolkit
227 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 227 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
228 maas: 228 maas:
229 type: git 229 type: git
230 location: https://git.openstack.org/openstack/airship-maas 230 location: https://git.openstack.org/openstack/airship-maas
231 subpath: charts/maas 231 subpath: charts/maas
232 reference: master 232 reference: 2e003450cceb16b9bda71aa69a939a8466516582
233 maas-htk: 233 maas-htk:
234 type: git 234 type: git
235 location: https://git.openstack.org/openstack/openstack-helm-infra 235 location: https://git.openstack.org/openstack/openstack-helm-infra
236 subpath: helm-toolkit 236 subpath: helm-toolkit
237 reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a 237 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
238 mariadb: 238 mariadb:
239 type: git 239 type: git
240 location: https://git.openstack.org/openstack/openstack-helm 240 location: https://git.openstack.org/openstack/openstack-helm
@@ -244,27 +244,27 @@ data:
244 type: git 244 type: git
245 location: https://git.openstack.org/openstack/openstack-helm-infra 245 location: https://git.openstack.org/openstack/openstack-helm-infra
246 subpath: helm-toolkit 246 subpath: helm-toolkit
247 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 247 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
248 memcached: 248 memcached:
249 type: git 249 type: git
250 location: https://git.openstack.org/openstack/openstack-helm-infra 250 location: https://git.openstack.org/openstack/openstack-helm-infra
251 subpath: memcached 251 subpath: memcached
252 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 252 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253 memcached-htk: 253 memcached-htk:
254 type: git 254 type: git
255 location: https://git.openstack.org/openstack/openstack-helm-infra 255 location: https://git.openstack.org/openstack/openstack-helm-infra
256 subpath: helm-toolkit 256 subpath: helm-toolkit
257 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 257 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258 rabbitmq: 258 rabbitmq:
259 type: git 259 type: git
260 location: https://git.openstack.org/openstack/openstack-helm-infra 260 location: https://git.openstack.org/openstack/openstack-helm-infra
261 subpath: rabbitmq 261 subpath: rabbitmq
262 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 262 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263 rabbitmq-htk: 263 rabbitmq-htk:
264 type: git 264 type: git
265 location: https://git.openstack.org/openstack/openstack-helm-infra 265 location: https://git.openstack.org/openstack/openstack-helm-infra
266 subpath: helm-toolkit 266 subpath: helm-toolkit
267 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 267 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268 shipyard: 268 shipyard:
269 type: git 269 type: git
270 location: https://git.openstack.org/openstack/airship-shipyard 270 location: https://git.openstack.org/openstack/airship-shipyard
@@ -284,7 +284,7 @@ data:
284 type: git 284 type: git
285 location: https://git.openstack.org/openstack/openstack-helm-infra 285 location: https://git.openstack.org/openstack/openstack-helm-infra
286 subpath: helm-toolkit 286 subpath: helm-toolkit
287 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 287 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
288 openstack: 288 openstack:
289 glance: 289 glance:
290 type: git 290 type: git
@@ -295,7 +295,7 @@ data:
295 type: git 295 type: git
296 location: https://git.openstack.org/openstack/openstack-helm-infra 296 location: https://git.openstack.org/openstack/openstack-helm-infra
297 subpath: helm-toolkit 297 subpath: helm-toolkit
298 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 298 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
299 heat: 299 heat:
300 type: git 300 type: git
301 location: https://git.openstack.org/openstack/openstack-helm 301 location: https://git.openstack.org/openstack/openstack-helm
@@ -305,7 +305,7 @@ data:
305 type: git 305 type: git
306 location: https://git.openstack.org/openstack/openstack-helm-infra 306 location: https://git.openstack.org/openstack/openstack-helm-infra
307 subpath: helm-toolkit 307 subpath: helm-toolkit
308 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 308 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
309 horizon: 309 horizon:
310 type: git 310 type: git
311 location: https://git.openstack.org/openstack/openstack-helm 311 location: https://git.openstack.org/openstack/openstack-helm
@@ -315,17 +315,17 @@ data:
315 type: git 315 type: git
316 location: https://git.openstack.org/openstack/openstack-helm-infra 316 location: https://git.openstack.org/openstack/openstack-helm-infra
317 subpath: helm-toolkit 317 subpath: helm-toolkit
318 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 318 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
319 ingress: 319 ingress:
320 type: git 320 type: git
321 location: https://git.openstack.org/openstack/openstack-helm-infra 321 location: https://git.openstack.org/openstack/openstack-helm-infra
322 subpath: ingress 322 subpath: ingress
323 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 323 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
324 ingress-htk: 324 ingress-htk:
325 type: git 325 type: git
326 location: https://git.openstack.org/openstack/openstack-helm-infra 326 location: https://git.openstack.org/openstack/openstack-helm-infra
327 subpath: helm-toolkit 327 subpath: helm-toolkit
328 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 328 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
329 keystone: 329 keystone:
330 type: git 330 type: git
331 location: https://git.openstack.org/openstack/openstack-helm 331 location: https://git.openstack.org/openstack/openstack-helm
@@ -335,7 +335,7 @@ data:
335 type: git 335 type: git
336 location: https://git.openstack.org/openstack/openstack-helm-infra 336 location: https://git.openstack.org/openstack/openstack-helm-infra
337 subpath: helm-toolkit 337 subpath: helm-toolkit
338 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 338 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
339 libvirt: 339 libvirt:
340 type: git 340 type: git
341 location: https://git.openstack.org/openstack/openstack-helm 341 location: https://git.openstack.org/openstack/openstack-helm
@@ -345,7 +345,7 @@ data:
345 type: git 345 type: git
346 location: https://git.openstack.org/openstack/openstack-helm-infra 346 location: https://git.openstack.org/openstack/openstack-helm-infra
347 subpath: helm-toolkit 347 subpath: helm-toolkit
348 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 348 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
349 mariadb: 349 mariadb:
350 type: git 350 type: git
351 location: https://git.openstack.org/openstack/openstack-helm 351 location: https://git.openstack.org/openstack/openstack-helm
@@ -355,17 +355,17 @@ data:
355 type: git 355 type: git
356 location: https://git.openstack.org/openstack/openstack-helm-infra 356 location: https://git.openstack.org/openstack/openstack-helm-infra
357 subpath: helm-toolkit 357 subpath: helm-toolkit
358 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 358 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
359 memcached: 359 memcached:
360 type: git 360 type: git
361 location: https://git.openstack.org/openstack/openstack-helm-infra 361 location: https://git.openstack.org/openstack/openstack-helm-infra
362 subpath: memcached 362 subpath: memcached
363 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 363 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
364 memcached-htk: 364 memcached-htk:
365 type: git 365 type: git
366 location: https://git.openstack.org/openstack/openstack-helm-infra 366 location: https://git.openstack.org/openstack/openstack-helm-infra
367 subpath: helm-toolkit 367 subpath: helm-toolkit
368 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 368 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
369 neutron: 369 neutron:
370 type: git 370 type: git
371 location: https://git.openstack.org/openstack/openstack-helm 371 location: https://git.openstack.org/openstack/openstack-helm
@@ -375,7 +375,7 @@ data:
375 type: git 375 type: git
376 location: https://git.openstack.org/openstack/openstack-helm-infra 376 location: https://git.openstack.org/openstack/openstack-helm-infra
377 subpath: helm-toolkit 377 subpath: helm-toolkit
378 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 378 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
379 nova: 379 nova:
380 type: git 380 type: git
381 location: https://git.openstack.org/openstack/openstack-helm 381 location: https://git.openstack.org/openstack/openstack-helm
@@ -385,7 +385,7 @@ data:
385 type: git 385 type: git
386 location: https://git.openstack.org/openstack/openstack-helm-infra 386 location: https://git.openstack.org/openstack/openstack-helm-infra
387 subpath: helm-toolkit 387 subpath: helm-toolkit
388 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 388 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
389 openvswitch: 389 openvswitch:
390 type: git 390 type: git
391 location: https://git.openstack.org/openstack/openstack-helm 391 location: https://git.openstack.org/openstack/openstack-helm
@@ -395,17 +395,17 @@ data:
395 type: git 395 type: git
396 location: https://git.openstack.org/openstack/openstack-helm-infra 396 location: https://git.openstack.org/openstack/openstack-helm-infra
397 subpath: helm-toolkit 397 subpath: helm-toolkit
398 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 398 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
399 rabbitmq: 399 rabbitmq:
400 type: git 400 type: git
401 location: https://git.openstack.org/openstack/openstack-helm-infra 401 location: https://git.openstack.org/openstack/openstack-helm-infra
402 subpath: rabbitmq 402 subpath: rabbitmq
403 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 403 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
404 rabbitmq-htk: 404 rabbitmq-htk:
405 type: git 405 type: git
406 location: https://git.openstack.org/openstack/openstack-helm-infra 406 location: https://git.openstack.org/openstack/openstack-helm-infra
407 subpath: helm-toolkit 407 subpath: helm-toolkit
408 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 408 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
409 409
410 files: 410 files:
411 kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 411 kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 9364afe..f021712 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -22,7 +22,7 @@ data:
22 type: git 22 type: git
23 location: https://git.openstack.org/openstack/openstack-helm-infra 23 location: https://git.openstack.org/openstack/openstack-helm-infra
24 subpath: helm-toolkit 24 subpath: helm-toolkit
25 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 25 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
26 calico: 26 calico:
27 type: git 27 type: git
28 location: https://git.openstack.org/openstack/openstack-helm-infra 28 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
42 type: git 42 type: git
43 location: https://git.openstack.org/openstack/openstack-helm-infra 43 location: https://git.openstack.org/openstack/openstack-helm-infra
44 subpath: helm-toolkit 44 subpath: helm-toolkit
45 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 45 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
46 controller-manager: 46 controller-manager:
47 type: git 47 type: git
48 location: https://git.openstack.org/openstack/airship-promenade 48 location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
52 type: git 52 type: git
53 location: https://git.openstack.org/openstack/openstack-helm-infra 53 location: https://git.openstack.org/openstack/openstack-helm-infra
54 subpath: helm-toolkit 54 subpath: helm-toolkit
55 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 55 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56 coredns: 56 coredns:
57 type: git 57 type: git
58 location: https://git.openstack.org/openstack/airship-promenade 58 location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
62 type: git 62 type: git
63 location: https://git.openstack.org/openstack/openstack-helm-infra 63 location: https://git.openstack.org/openstack/openstack-helm-infra
64 subpath: helm-toolkit 64 subpath: helm-toolkit
65 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 65 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66 haproxy: 66 haproxy:
67 type: git 67 type: git
68 location: https://git.openstack.org/openstack/airship-promenade 68 location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
72 type: git 72 type: git
73 location: https://git.openstack.org/openstack/openstack-helm-infra 73 location: https://git.openstack.org/openstack/openstack-helm-infra
74 subpath: helm-toolkit 74 subpath: helm-toolkit
75 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 75 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76 etcd: 76 etcd:
77 type: git 77 type: git
78 location: https://git.openstack.org/openstack/airship-promenade 78 location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
82 type: git 82 type: git
83 location: https://git.openstack.org/openstack/openstack-helm-infra 83 location: https://git.openstack.org/openstack/openstack-helm-infra
84 subpath: helm-toolkit 84 subpath: helm-toolkit
85 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 85 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86 ingress: 86 ingress:
87 type: git 87 type: git
88 location: https://git.openstack.org/openstack/openstack-helm-infra 88 location: https://git.openstack.org/openstack/openstack-helm-infra
89 subpath: ingress 89 subpath: ingress
90 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 90 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91 ingress-htk: 91 ingress-htk:
92 type: git 92 type: git
93 location: https://git.openstack.org/openstack/openstack-helm-infra 93 location: https://git.openstack.org/openstack/openstack-helm-infra
94 subpath: helm-toolkit 94 subpath: helm-toolkit
95 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 95 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96 proxy: 96 proxy:
97 type: git 97 type: git
98 location: https://git.openstack.org/openstack/airship-promenade 98 location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
102 type: git 102 type: git
103 location: https://git.openstack.org/openstack/openstack-helm-infra 103 location: https://git.openstack.org/openstack/openstack-helm-infra
104 subpath: helm-toolkit 104 subpath: helm-toolkit
105 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 105 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106 scheduler: 106 scheduler:
107 type: git 107 type: git
108 location: https://git.openstack.org/openstack/airship-promenade 108 location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
112 type: git 112 type: git
113 location: https://git.openstack.org/openstack/openstack-helm-infra 113 location: https://git.openstack.org/openstack/openstack-helm-infra
114 subpath: helm-toolkit 114 subpath: helm-toolkit
115 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 115 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
116 ucp: 116 ucp:
117 nfs_provisioner: 117 nfs_provisioner:
118 type: git 118 type: git
119 location: https://git.openstack.org/openstack/openstack-helm-infra 119 location: https://git.openstack.org/openstack/openstack-helm-infra
120 subpath: nfs-provisioner 120 subpath: nfs-provisioner
121 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 121 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
122 nfs_htk: 122 nfs_htk:
123 type: git 123 type: git
124 location: https://git.openstack.org/openstack/openstack-helm-infra 124 location: https://git.openstack.org/openstack/openstack-helm-infra
125 subpath: helm-toolkit 125 subpath: helm-toolkit
126 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 126 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 armada: 127 armada:
128 type: git 128 type: git
129 location: https://git.openstack.org/openstack/airship-armada 129 location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
133 type: git 133 type: git
134 location: https://git.openstack.org/openstack/openstack-helm-infra 134 location: https://git.openstack.org/openstack/openstack-helm-infra
135 subpath: helm-toolkit 135 subpath: helm-toolkit
136 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 136 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137 barbican: 137 barbican:
138 type: git 138 type: git
139 location: https://git.openstack.org/openstack/openstack-helm 139 location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
143 type: git 143 type: git
144 location: https://git.openstack.org/openstack/openstack-helm-infra 144 location: https://git.openstack.org/openstack/openstack-helm-infra
145 subpath: helm-toolkit 145 subpath: helm-toolkit
146 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 146 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
147 #TODO Update to split ceph charts 147 #TODO Update to split ceph charts
148 ceph: 148 ceph:
149 type: git 149 type: git
@@ -165,7 +165,7 @@ data:
165 type: git 165 type: git
166 location: https://git.openstack.org/openstack/openstack-helm-infra 166 location: https://git.openstack.org/openstack/openstack-helm-infra
167 subpath: helm-toolkit 167 subpath: helm-toolkit
168 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 168 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
169 divingbell: 169 divingbell:
170 type: git 170 type: git
171 location: https://git.openstack.org/openstack/airship-divingbell 171 location: https://git.openstack.org/openstack/airship-divingbell
@@ -175,29 +175,27 @@ data:
175 type: git 175 type: git
176 location: https://git.openstack.org/openstack/openstack-helm-infra 176 location: https://git.openstack.org/openstack/openstack-helm-infra
177 subpath: helm-toolkit 177 subpath: helm-toolkit
178 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 178 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
179 drydock: 179 drydock:
180 type: git 180 type: git
181 location: https://git.openstack.org/openstack/airship-drydock 181 location: https://git.openstack.org/openstack/airship-drydock
182 subpath: charts/drydock 182 subpath: charts/drydock
183 reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b 183 reference: master
184 # TODO waiting for https://review.openstack.org/#/c/595902/ to move to
185 # openstack-helm-infra version.
186 drydock-htk: 184 drydock-htk:
187 type: git 185 type: git
188 location: https://git.openstack.org/openstack/openstack-helm 186 location: https://git.openstack.org/openstack/openstack-helm-infra
189 subpath: helm-toolkit 187 subpath: helm-toolkit
190 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 188 reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
191 ingress: 189 ingress:
192 type: git 190 type: git
193 location: https://git.openstack.org/openstack/openstack-helm-infra 191 location: https://git.openstack.org/openstack/openstack-helm-infra
194 subpath: ingress 192 subpath: ingress
195 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 193 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
196 ingress-htk: 194 ingress-htk:
197 type: git 195 type: git
198 location: https://git.openstack.org/openstack/openstack-helm-infra 196 location: https://git.openstack.org/openstack/openstack-helm-infra
199 subpath: helm-toolkit 197 subpath: helm-toolkit
200 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 198 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
201 postgresql: 199 postgresql:
202 type: git 200 type: git
203 location: https://git.openstack.org/openstack/openstack-helm 201 location: https://git.openstack.org/openstack/openstack-helm
@@ -207,7 +205,7 @@ data:
207 type: git 205 type: git
208 location: https://git.openstack.org/openstack/openstack-helm-infra 206 location: https://git.openstack.org/openstack/openstack-helm-infra
209 subpath: helm-toolkit 207 subpath: helm-toolkit
210 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 208 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
211 promenade: 209 promenade:
212 type: git 210 type: git
213 location: https://git.openstack.org/openstack/airship-promenade 211 location: https://git.openstack.org/openstack/airship-promenade
@@ -217,7 +215,7 @@ data:
217 type: git 215 type: git
218 location: https://git.openstack.org/openstack/openstack-helm-infra 216 location: https://git.openstack.org/openstack/openstack-helm-infra
219 subpath: helm-toolkit 217 subpath: helm-toolkit
220 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 218 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
221 keystone: 219 keystone:
222 type: git 220 type: git
223 location: https://git.openstack.org/openstack/openstack-helm 221 location: https://git.openstack.org/openstack/openstack-helm
@@ -227,19 +225,17 @@ data:
227 type: git 225 type: git
228 location: https://git.openstack.org/openstack/openstack-helm-infra 226 location: https://git.openstack.org/openstack/openstack-helm-infra
229 subpath: helm-toolkit 227 subpath: helm-toolkit
230 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 228 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
231 maas: 229 maas:
232 type: git 230 type: git
233 location: https://git.openstack.org/openstack/airship-maas 231 location: https://git.openstack.org/openstack/airship-maas
234 subpath: charts/maas 232 subpath: charts/maas
235 # TODO(bryan-strassner) set to new version 233 reference: 2e003450cceb16b9bda71aa69a939a8466516582
236 # when https://review.openstack.org/#/c/595398/ is complete
237 reference: refs/changes/98/595398/5
238 maas-htk: 234 maas-htk:
239 type: git 235 type: git
240 location: https://git.openstack.org/openstack/openstack-helm-infra 236 location: https://git.openstack.org/openstack/openstack-helm-infra
241 subpath: helm-toolkit 237 subpath: helm-toolkit
242 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 238 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
243 mariadb: 239 mariadb:
244 type: git 240 type: git
245 location: https://git.openstack.org/openstack/openstack-helm 241 location: https://git.openstack.org/openstack/openstack-helm
@@ -249,27 +245,27 @@ data:
249 type: git 245 type: git
250 location: https://git.openstack.org/openstack/openstack-helm-infra 246 location: https://git.openstack.org/openstack/openstack-helm-infra
251 subpath: helm-toolkit 247 subpath: helm-toolkit
252 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 248 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253 memcached: 249 memcached:
254 type: git 250 type: git
255 location: https://git.openstack.org/openstack/openstack-helm-infra 251 location: https://git.openstack.org/openstack/openstack-helm-infra
256 subpath: memcached 252 subpath: memcached
257 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 253 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258 memcached-htk: 254 memcached-htk:
259 type: git 255 type: git
260 location: https://git.openstack.org/openstack/openstack-helm-infra 256 location: https://git.openstack.org/openstack/openstack-helm-infra
261 subpath: helm-toolkit 257 subpath: helm-toolkit
262 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 258 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263 rabbitmq: 259 rabbitmq:
264 type: git 260 type: git
265 location: https://git.openstack.org/openstack/openstack-helm-infra 261 location: https://git.openstack.org/openstack/openstack-helm-infra
266 subpath: rabbitmq 262 subpath: rabbitmq
267 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 263 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268 rabbitmq-htk: 264 rabbitmq-htk:
269 type: git 265 type: git
270 location: https://git.openstack.org/openstack/openstack-helm-infra 266 location: https://git.openstack.org/openstack/openstack-helm-infra
271 subpath: helm-toolkit 267 subpath: helm-toolkit
272 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 268 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
273 shipyard: 269 shipyard:
274 type: git 270 type: git
275 location: https://git.openstack.org/openstack/airship-shipyard 271 location: https://git.openstack.org/openstack/airship-shipyard
@@ -289,7 +285,7 @@ data:
289 type: git 285 type: git
290 location: https://git.openstack.org/openstack/openstack-helm-infra 286 location: https://git.openstack.org/openstack/openstack-helm-infra
291 subpath: helm-toolkit 287 subpath: helm-toolkit
292 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 288 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
293 289
294 files: 290 files:
295 kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz 291 kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz