summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2018-12-10 10:40:14 -0600
committerBryan Strassner <strassner.bryan@gmail.com>2019-02-22 22:42:02 +0000
commitb87c4d5b759ae8596c52abfb38468a433e48cd06 (patch)
tree0d64ba50e2fd944e6161448343677def3efb6045
parent58f33ddc5c7b256502f1ef9cf2b7e74626c4e2f4 (diff)
Update AIAB OSH ingress to newer version
In the v1.0demo globals, updates the ingress used with the OSH components to an updated version that supports better header customization. Change-Id: I2a8ca0522685b4111580abddf1da0ba42241f38d
Notes
Notes (review): Code-Review+2: Roman Gorshunov <roman.gorshunov@att.com> Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+1: Vladyslav Drok <vdrok@mirantis.com> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Workflow+1: Matt McEuen <matt.mceuen@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 27 Feb 2019 01:11:32 +0000 Reviewed-on: https://review.openstack.org/624126 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml7
-rw-r--r--deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml7
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml100
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml62
4 files changed, 88 insertions, 88 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml
index fd82d85..63c3842 100644
--- a/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml
@@ -17,6 +17,13 @@ metadata:
17 path: .charts.kubernetes.ingress 17 path: .charts.kubernetes.ingress
18 dest: 18 dest:
19 path: .source 19 path: .source
20 # Images
21 - src:
22 schema: pegleg/SoftwareVersions/v1
23 name: software-versions
24 path: .images.osh.ingress
25 dest:
26 path: .values.images.tags
20data: 27data:
21 chart_name: ingress-kube-system 28 chart_name: ingress-kube-system
22 release: ingress-kube-system 29 release: ingress-kube-system
diff --git a/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml
index 962b330..264e5dc 100644
--- a/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/osh/ingress/ingress.yaml
@@ -15,13 +15,6 @@ metadata:
15 path: .charts.openstack.ingress 15 path: .charts.openstack.ingress
16 dest: 16 dest:
17 path: .source 17 path: .source
18 # Images
19 - src:
20 schema: pegleg/SoftwareVersions/v1
21 name: software-versions
22 path: .images.osh.ingress
23 dest:
24 path: .values.images.tags
25data: 18data:
26 chart_name: openstack-ingress-controller 19 chart_name: openstack-ingress-controller
27 release: openstack-ingress-controller 20 release: openstack-ingress-controller
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index b635b75..25a84ba 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -19,18 +19,18 @@ data:
19 type: git 19 type: git
20 apiserver-htk: 20 apiserver-htk:
21 location: https://git.openstack.org/openstack/openstack-helm-infra 21 location: https://git.openstack.org/openstack/openstack-helm-infra
22 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 22 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
23 subpath: helm-toolkit 23 subpath: helm-toolkit
24 type: git 24 type: git
25 calico: 25 calico:
26 calico: 26 calico:
27 location: https://git.openstack.org/openstack/openstack-helm-infra 27 location: https://git.openstack.org/openstack/openstack-helm-infra
28 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 28 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
29 subpath: calico 29 subpath: calico
30 type: git 30 type: git
31 calico-htk: 31 calico-htk:
32 location: https://git.openstack.org/openstack/openstack-helm-infra 32 location: https://git.openstack.org/openstack/openstack-helm-infra
33 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 33 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
34 subpath: helm-toolkit 34 subpath: helm-toolkit
35 type: git 35 type: git
36 etcd: 36 etcd:
@@ -40,7 +40,7 @@ data:
40 type: git 40 type: git
41 etcd-htk: 41 etcd-htk:
42 location: https://git.openstack.org/openstack/openstack-helm-infra 42 location: https://git.openstack.org/openstack/openstack-helm-infra
43 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 43 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
44 subpath: helm-toolkit 44 subpath: helm-toolkit
45 type: git 45 type: git
46 controller-manager: 46 controller-manager:
@@ -50,7 +50,7 @@ data:
50 type: git 50 type: git
51 controller-manager-htk: 51 controller-manager-htk:
52 location: https://git.openstack.org/openstack/openstack-helm-infra 52 location: https://git.openstack.org/openstack/openstack-helm-infra
53 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 53 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
54 subpath: helm-toolkit 54 subpath: helm-toolkit
55 type: git 55 type: git
56 coredns: 56 coredns:
@@ -60,7 +60,7 @@ data:
60 type: git 60 type: git
61 coredns-htk: 61 coredns-htk:
62 location: https://git.openstack.org/openstack/openstack-helm-infra 62 location: https://git.openstack.org/openstack/openstack-helm-infra
63 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 63 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
64 subpath: helm-toolkit 64 subpath: helm-toolkit
65 type: git 65 type: git
66 etcd: 66 etcd:
@@ -70,7 +70,7 @@ data:
70 type: git 70 type: git
71 etcd-htk: 71 etcd-htk:
72 location: https://git.openstack.org/openstack/openstack-helm-infra 72 location: https://git.openstack.org/openstack/openstack-helm-infra
73 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 73 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
74 subpath: helm-toolkit 74 subpath: helm-toolkit
75 type: git 75 type: git
76 haproxy: 76 haproxy:
@@ -80,17 +80,17 @@ data:
80 type: git 80 type: git
81 haproxy-htk: 81 haproxy-htk:
82 location: https://git.openstack.org/openstack/openstack-helm-infra 82 location: https://git.openstack.org/openstack/openstack-helm-infra
83 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 83 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
84 subpath: helm-toolkit 84 subpath: helm-toolkit
85 type: git 85 type: git
86 ingress: 86 ingress:
87 location: https://git.openstack.org/openstack/openstack-helm-infra 87 location: https://git.openstack.org/openstack/openstack-helm-infra
88 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 88 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
89 subpath: ingress 89 subpath: ingress
90 type: git 90 type: git
91 ingress-htk: 91 ingress-htk:
92 location: https://git.openstack.org/openstack/openstack-helm-infra 92 location: https://git.openstack.org/openstack/openstack-helm-infra
93 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 93 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
94 subpath: helm-toolkit 94 subpath: helm-toolkit
95 type: git 95 type: git
96 proxy: 96 proxy:
@@ -100,7 +100,7 @@ data:
100 type: git 100 type: git
101 proxy-htk: 101 proxy-htk:
102 location: https://git.openstack.org/openstack/openstack-helm-infra 102 location: https://git.openstack.org/openstack/openstack-helm-infra
103 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 103 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
104 subpath: helm-toolkit 104 subpath: helm-toolkit
105 type: git 105 type: git
106 scheduler: 106 scheduler:
@@ -110,7 +110,7 @@ data:
110 type: git 110 type: git
111 scheduler-htk: 111 scheduler-htk:
112 location: https://git.openstack.org/openstack/openstack-helm-infra 112 location: https://git.openstack.org/openstack/openstack-helm-infra
113 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 113 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
114 subpath: helm-toolkit 114 subpath: helm-toolkit
115 type: git 115 type: git
116 ucp: 116 ucp:
@@ -118,12 +118,12 @@ data:
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 121 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 126 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
127 armada: 127 armada:
128 location: https://git.openstack.org/openstack/airship-armada 128 location: https://git.openstack.org/openstack/airship-armada
129 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 129 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
@@ -131,7 +131,7 @@ data:
131 type: git 131 type: git
132 armada-htk: 132 armada-htk:
133 location: https://git.openstack.org/openstack/openstack-helm-infra 133 location: https://git.openstack.org/openstack/openstack-helm-infra
134 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 134 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
135 subpath: helm-toolkit 135 subpath: helm-toolkit
136 type: git 136 type: git
137 barbican: 137 barbican:
@@ -141,7 +141,7 @@ data:
141 type: git 141 type: git
142 barbican-htk: 142 barbican-htk:
143 location: https://git.openstack.org/openstack/openstack-helm-infra 143 location: https://git.openstack.org/openstack/openstack-helm-infra
144 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 144 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
145 subpath: helm-toolkit 145 subpath: helm-toolkit
146 type: git 146 type: git
147 #TODO Update to split ceph charts 147 #TODO Update to split ceph charts
@@ -162,7 +162,7 @@ data:
162 type: git 162 type: git
163 deckhand-htk: 163 deckhand-htk:
164 location: https://git.openstack.org/openstack/openstack-helm-infra 164 location: https://git.openstack.org/openstack/openstack-helm-infra
165 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 165 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
166 subpath: helm-toolkit 166 subpath: helm-toolkit
167 type: git 167 type: git
168 divingbell: 168 divingbell:
@@ -172,7 +172,7 @@ data:
172 type: git 172 type: git
173 divingbell-htk: 173 divingbell-htk:
174 location: https://git.openstack.org/openstack/openstack-helm-infra 174 location: https://git.openstack.org/openstack/openstack-helm-infra
175 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 175 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
176 subpath: helm-toolkit 176 subpath: helm-toolkit
177 type: git 177 type: git
178 drydock: 178 drydock:
@@ -187,12 +187,12 @@ data:
187 type: git 187 type: git
188 ingress: 188 ingress:
189 location: https://git.openstack.org/openstack/openstack-helm-infra 189 location: https://git.openstack.org/openstack/openstack-helm-infra
190 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 190 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
191 subpath: ingress 191 subpath: ingress
192 type: git 192 type: git
193 ingress-htk: 193 ingress-htk:
194 location: https://git.openstack.org/openstack/openstack-helm-infra 194 location: https://git.openstack.org/openstack/openstack-helm-infra
195 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 195 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
196 subpath: helm-toolkit 196 subpath: helm-toolkit
197 type: git 197 type: git
198 keystone: 198 keystone:
@@ -202,7 +202,7 @@ data:
202 type: git 202 type: git
203 keystone-htk: 203 keystone-htk:
204 location: https://git.openstack.org/openstack/openstack-helm-infra 204 location: https://git.openstack.org/openstack/openstack-helm-infra
205 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 205 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
206 subpath: helm-toolkit 206 subpath: helm-toolkit
207 type: git 207 type: git
208 maas: 208 maas:
@@ -217,32 +217,32 @@ data:
217 type: git 217 type: git
218 mariadb: 218 mariadb:
219 location: https://git.openstack.org/openstack/openstack-helm-infra 219 location: https://git.openstack.org/openstack/openstack-helm-infra
220 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 220 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
221 subpath: mariadb 221 subpath: mariadb
222 type: git 222 type: git
223 mariadb-htk: 223 mariadb-htk:
224 location: https://git.openstack.org/openstack/openstack-helm-infra 224 location: https://git.openstack.org/openstack/openstack-helm-infra
225 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 225 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
226 subpath: helm-toolkit 226 subpath: helm-toolkit
227 type: git 227 type: git
228 memcached: 228 memcached:
229 location: https://git.openstack.org/openstack/openstack-helm-infra 229 location: https://git.openstack.org/openstack/openstack-helm-infra
230 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 230 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
231 subpath: memcached 231 subpath: memcached
232 type: git 232 type: git
233 memcached-htk: 233 memcached-htk:
234 location: https://git.openstack.org/openstack/openstack-helm-infra 234 location: https://git.openstack.org/openstack/openstack-helm-infra
235 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 235 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
236 subpath: helm-toolkit 236 subpath: helm-toolkit
237 type: git 237 type: git
238 postgresql: 238 postgresql:
239 location: https://git.openstack.org/openstack/openstack-helm-infra 239 location: https://git.openstack.org/openstack/openstack-helm-infra
240 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 240 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
241 subpath: postgresql 241 subpath: postgresql
242 type: git 242 type: git
243 postgresql-htk: 243 postgresql-htk:
244 location: https://git.openstack.org/openstack/openstack-helm-infra 244 location: https://git.openstack.org/openstack/openstack-helm-infra
245 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 245 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
246 subpath: helm-toolkit 246 subpath: helm-toolkit
247 type: git 247 type: git
248 promenade: 248 promenade:
@@ -252,17 +252,17 @@ data:
252 type: git 252 type: git
253 promenade-htk: 253 promenade-htk:
254 location: https://git.openstack.org/openstack/openstack-helm-infra 254 location: https://git.openstack.org/openstack/openstack-helm-infra
255 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 255 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
256 subpath: helm-toolkit 256 subpath: helm-toolkit
257 type: git 257 type: git
258 rabbitmq: 258 rabbitmq:
259 location: https://git.openstack.org/openstack/openstack-helm-infra 259 location: https://git.openstack.org/openstack/openstack-helm-infra
260 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 260 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
261 subpath: rabbitmq 261 subpath: rabbitmq
262 type: git 262 type: git
263 rabbitmq-htk: 263 rabbitmq-htk:
264 location: https://git.openstack.org/openstack/openstack-helm-infra 264 location: https://git.openstack.org/openstack/openstack-helm-infra
265 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 265 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
266 subpath: helm-toolkit 266 subpath: helm-toolkit
267 type: git 267 type: git
268 shipyard: 268 shipyard:
@@ -272,7 +272,7 @@ data:
272 type: git 272 type: git
273 shipyard-htk: 273 shipyard-htk:
274 location: https://git.openstack.org/openstack/openstack-helm-infra 274 location: https://git.openstack.org/openstack/openstack-helm-infra
275 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 275 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
276 subpath: helm-toolkit 276 subpath: helm-toolkit
277 type: git 277 type: git
278 tiller: 278 tiller:
@@ -282,7 +282,7 @@ data:
282 type: git 282 type: git
283 tiller-htk: 283 tiller-htk:
284 location: https://git.openstack.org/openstack/openstack-helm-infra 284 location: https://git.openstack.org/openstack/openstack-helm-infra
285 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 285 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
286 subpath: helm-toolkit 286 subpath: helm-toolkit
287 type: git 287 type: git
288 openstack: 288 openstack:
@@ -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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 298 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 308 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 318 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 323 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 328 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 338 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 348 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 358 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 363 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 368 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 378 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 388 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 398 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 403 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 408 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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
@@ -430,7 +430,7 @@ data:
430 openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:v2.8.1 430 openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:v2.8.1
431 os_barbican: &os_barbican docker.io/openstackhelm/barbican:ocata 431 os_barbican: &os_barbican docker.io/openstackhelm/barbican:ocata
432 libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1 432 libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1
433 ingress_controller: &ingress_controller quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 433 ingress_controller: &ingress_controller quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.20.0
434 ingress_error_pages: &ingress_error_pages gcr.io/google-containers/defaultbackend:1.0 434 ingress_error_pages: &ingress_error_pages gcr.io/google-containers/defaultbackend:1.0
435 # should probably be moved to https://quay.io/repository/airshipit/ 435 # should probably be moved to https://quay.io/repository/airshipit/
436 storage_init: &storage_init docker.io/port/ceph-config-helper:v1.10.2 436 storage_init: &storage_init docker.io/port/ceph-config-helper:v1.10.2
@@ -654,8 +654,8 @@ data:
654 dep_check: *dep_check 654 dep_check: *dep_check
655 mariadb: 655 mariadb:
656 mariadb: *mariadb_db 656 mariadb: *mariadb_db
657 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 657 ingress: *ingress_controller
658 error_pages: gcr.io/google-containers/defaultbackend:1.0 658 error_pages: *ingress_error_pages
659 prometheus_create_mysql_user: *mariadb_db 659 prometheus_create_mysql_user: *mariadb_db
660 prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0 660 prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0
661 prometheus_mysql_exporter_helm_tests: *heat 661 prometheus_mysql_exporter_helm_tests: *heat
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 8be93b9..9df5ec7 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -22,17 +22,17 @@ 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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 25 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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
29 subpath: calico 29 subpath: calico
30 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 30 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
31 calico-htk: 31 calico-htk:
32 type: git 32 type: git
33 location: https://git.openstack.org/openstack/openstack-helm-infra 33 location: https://git.openstack.org/openstack/openstack-helm-infra
34 subpath: helm-toolkit 34 subpath: helm-toolkit
35 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 35 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
36 apiserver: 36 apiserver:
37 type: git 37 type: git
38 location: https://git.openstack.org/openstack/airship-promenade 38 location: https://git.openstack.org/openstack/airship-promenade
@@ -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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 45 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 55 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 65 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 75 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 85 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 90 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 95 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 105 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 115 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 121 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 126 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 136 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 146 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 168 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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,7 +175,7 @@ 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: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 178 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
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
@@ -185,17 +185,17 @@ data:
185 type: git 185 type: git
186 location: https://git.openstack.org/openstack/openstack-helm-infra 186 location: https://git.openstack.org/openstack/openstack-helm-infra
187 subpath: helm-toolkit 187 subpath: helm-toolkit
188 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 188 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
189 ingress: 189 ingress:
190 type: git 190 type: git
191 location: https://git.openstack.org/openstack/openstack-helm-infra 191 location: https://git.openstack.org/openstack/openstack-helm-infra
192 subpath: ingress 192 subpath: ingress
193 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 193 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
194 ingress-htk: 194 ingress-htk:
195 type: git 195 type: git
196 location: https://git.openstack.org/openstack/openstack-helm-infra 196 location: https://git.openstack.org/openstack/openstack-helm-infra
197 subpath: helm-toolkit 197 subpath: helm-toolkit
198 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 198 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
199 postgresql: 199 postgresql:
200 type: git 200 type: git
201 location: https://git.openstack.org/openstack/openstack-helm 201 location: https://git.openstack.org/openstack/openstack-helm
@@ -205,7 +205,7 @@ data:
205 type: git 205 type: git
206 location: https://git.openstack.org/openstack/openstack-helm-infra 206 location: https://git.openstack.org/openstack/openstack-helm-infra
207 subpath: helm-toolkit 207 subpath: helm-toolkit
208 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 208 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
209 promenade: 209 promenade:
210 type: git 210 type: git
211 location: https://git.openstack.org/openstack/airship-promenade 211 location: https://git.openstack.org/openstack/airship-promenade
@@ -215,7 +215,7 @@ data:
215 type: git 215 type: git
216 location: https://git.openstack.org/openstack/openstack-helm-infra 216 location: https://git.openstack.org/openstack/openstack-helm-infra
217 subpath: helm-toolkit 217 subpath: helm-toolkit
218 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 218 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
219 keystone: 219 keystone:
220 type: git 220 type: git
221 location: https://git.openstack.org/openstack/openstack-helm 221 location: https://git.openstack.org/openstack/openstack-helm
@@ -225,7 +225,7 @@ data:
225 type: git 225 type: git
226 location: https://git.openstack.org/openstack/openstack-helm-infra 226 location: https://git.openstack.org/openstack/openstack-helm-infra
227 subpath: helm-toolkit 227 subpath: helm-toolkit
228 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 228 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
229 maas: 229 maas:
230 type: git 230 type: git
231 location: https://git.openstack.org/openstack/airship-maas 231 location: https://git.openstack.org/openstack/airship-maas
@@ -235,7 +235,7 @@ data:
235 type: git 235 type: git
236 location: https://git.openstack.org/openstack/openstack-helm-infra 236 location: https://git.openstack.org/openstack/openstack-helm-infra
237 subpath: helm-toolkit 237 subpath: helm-toolkit
238 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 238 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
239 mariadb: 239 mariadb:
240 type: git 240 type: git
241 location: https://git.openstack.org/openstack/openstack-helm 241 location: https://git.openstack.org/openstack/openstack-helm
@@ -245,27 +245,27 @@ data:
245 type: git 245 type: git
246 location: https://git.openstack.org/openstack/openstack-helm-infra 246 location: https://git.openstack.org/openstack/openstack-helm-infra
247 subpath: helm-toolkit 247 subpath: helm-toolkit
248 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 248 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
249 memcached: 249 memcached:
250 type: git 250 type: git
251 location: https://git.openstack.org/openstack/openstack-helm-infra 251 location: https://git.openstack.org/openstack/openstack-helm-infra
252 subpath: memcached 252 subpath: memcached
253 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 253 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
254 memcached-htk: 254 memcached-htk:
255 type: git 255 type: git
256 location: https://git.openstack.org/openstack/openstack-helm-infra 256 location: https://git.openstack.org/openstack/openstack-helm-infra
257 subpath: helm-toolkit 257 subpath: helm-toolkit
258 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 258 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
259 rabbitmq: 259 rabbitmq:
260 type: git 260 type: git
261 location: https://git.openstack.org/openstack/openstack-helm-infra 261 location: https://git.openstack.org/openstack/openstack-helm-infra
262 subpath: rabbitmq 262 subpath: rabbitmq
263 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 263 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
264 rabbitmq-htk: 264 rabbitmq-htk:
265 type: git 265 type: git
266 location: https://git.openstack.org/openstack/openstack-helm-infra 266 location: https://git.openstack.org/openstack/openstack-helm-infra
267 subpath: helm-toolkit 267 subpath: helm-toolkit
268 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 268 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
269 shipyard: 269 shipyard:
270 type: git 270 type: git
271 location: https://git.openstack.org/openstack/airship-shipyard 271 location: https://git.openstack.org/openstack/airship-shipyard
@@ -285,7 +285,7 @@ data:
285 type: git 285 type: git
286 location: https://git.openstack.org/openstack/openstack-helm-infra 286 location: https://git.openstack.org/openstack/openstack-helm-infra
287 subpath: helm-toolkit 287 subpath: helm-toolkit
288 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 288 reference: cd4ec0b4b22f44673f66f42240a11131a6950ed9
289 289
290 files: 290 files:
291 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