summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-19 19:15:46 +0000
committerGerrit Code Review <review@openstack.org>2018-11-19 19:15:46 +0000
commit568f52897010b5bf639076200c9cc1cbd49282d2 (patch)
treec24a810ac1202da8f8dcd9d52549f7576371fa20
parent7586fef6316825314bc0f871fcadd21f6c2a1063 (diff)
parentada72c91c9a44800867034a3b9a2daa0f5798201 (diff)
Merge "Uplift various components to newer versions"
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml6
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml337
-rw-r--r--deployment_files/site/gate-multinode/software/configs/versions.yaml16
3 files changed, 181 insertions, 178 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
index ff6bb45..e938b70 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
@@ -72,6 +72,12 @@ data:
72 prometheus_mysql_exporter: 72 prometheus_mysql_exporter:
73 node_selector_key: ucp-control-plane 73 node_selector_key: ucp-control-plane
74 node_selector_value: enabled 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 pod: 81 pod:
76 replicas: 82 replicas:
77 server: 1 83 server: 1
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 2886f21..68ee4ac 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -12,107 +12,107 @@ metadata:
12data: 12data:
13 charts: 13 charts:
14 kubernetes: 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 calico: 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 calico: 26 calico:
27 type: git
28 location: https://git.openstack.org/openstack/openstack-helm-infra 27 location: https://git.openstack.org/openstack/openstack-helm-infra
28 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
29 subpath: calico 29 subpath: calico
30 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d 30 type: git
31 calico-htk: 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 type: git 40 type: git
41 etcd-htk:
33 location: https://git.openstack.org/openstack/openstack-helm-infra 42 location: https://git.openstack.org/openstack/openstack-helm-infra
43 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
34 subpath: helm-toolkit 44 subpath: helm-toolkit
35 reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d 45 type: git
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
46 controller-manager: 46 controller-manager:
47 type: git
48 location: https://git.openstack.org/openstack/airship-promenade 47 location: https://git.openstack.org/openstack/airship-promenade
48 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
49 subpath: charts/controller_manager 49 subpath: charts/controller_manager
50 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
51 controller-manager-htk:
52 type: git 50 type: git
51 controller-manager-htk:
53 location: https://git.openstack.org/openstack/openstack-helm-infra 52 location: https://git.openstack.org/openstack/openstack-helm-infra
54 subpath: helm-toolkit
55 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 53 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
56 coredns: 54 subpath: helm-toolkit
57 type: git 55 type: git
56 coredns:
58 location: https://git.openstack.org/openstack/airship-promenade 57 location: https://git.openstack.org/openstack/airship-promenade
58 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
59 subpath: charts/coredns 59 subpath: charts/coredns
60 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
61 coredns-htk:
62 type: git 60 type: git
61 coredns-htk:
63 location: https://git.openstack.org/openstack/openstack-helm-infra 62 location: https://git.openstack.org/openstack/openstack-helm-infra
64 subpath: helm-toolkit
65 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 63 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
66 haproxy: 64 subpath: helm-toolkit
67 type: git 65 type: git
66 etcd:
68 location: https://git.openstack.org/openstack/airship-promenade 67 location: https://git.openstack.org/openstack/airship-promenade
69 subpath: charts/haproxy 68 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
70 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 69 subpath: charts/etcd
71 haproxy-htk:
72 type: git 70 type: git
71 etcd-htk:
73 location: https://git.openstack.org/openstack/openstack-helm-infra 72 location: https://git.openstack.org/openstack/openstack-helm-infra
74 subpath: helm-toolkit
75 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 73 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
76 etcd: 74 subpath: helm-toolkit
77 type: git 75 type: git
76 haproxy:
78 location: https://git.openstack.org/openstack/airship-promenade 77 location: https://git.openstack.org/openstack/airship-promenade
79 subpath: charts/etcd 78 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
80 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 79 subpath: charts/haproxy
81 etcd-htk:
82 type: git 80 type: git
81 haproxy-htk:
83 location: https://git.openstack.org/openstack/openstack-helm-infra 82 location: https://git.openstack.org/openstack/openstack-helm-infra
84 subpath: helm-toolkit
85 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 83 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
86 ingress: 84 subpath: helm-toolkit
87 type: git 85 type: git
86 ingress:
88 location: https://git.openstack.org/openstack/openstack-helm-infra 87 location: https://git.openstack.org/openstack/openstack-helm-infra
89 subpath: ingress
90 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 88 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
91 ingress-htk: 89 subpath: ingress
92 type: git 90 type: git
91 ingress-htk:
93 location: https://git.openstack.org/openstack/openstack-helm-infra 92 location: https://git.openstack.org/openstack/openstack-helm-infra
94 subpath: helm-toolkit
95 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 93 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
96 proxy: 94 subpath: helm-toolkit
97 type: git 95 type: git
96 proxy:
98 location: https://git.openstack.org/openstack/airship-promenade 97 location: https://git.openstack.org/openstack/airship-promenade
98 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
99 subpath: charts/proxy 99 subpath: charts/proxy
100 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
101 proxy-htk:
102 type: git 100 type: git
101 proxy-htk:
103 location: https://git.openstack.org/openstack/openstack-helm-infra 102 location: https://git.openstack.org/openstack/openstack-helm-infra
104 subpath: helm-toolkit
105 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 103 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
106 scheduler: 104 subpath: helm-toolkit
107 type: git 105 type: git
106 scheduler:
108 location: https://git.openstack.org/openstack/airship-promenade 107 location: https://git.openstack.org/openstack/airship-promenade
108 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
109 subpath: charts/scheduler 109 subpath: charts/scheduler
110 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
111 scheduler-htk:
112 type: git 110 type: git
111 scheduler-htk:
113 location: https://git.openstack.org/openstack/openstack-helm-infra 112 location: https://git.openstack.org/openstack/openstack-helm-infra
114 subpath: helm-toolkit
115 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 113 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
114 subpath: helm-toolkit
115 type: git
116 ucp: 116 ucp:
117 nfs_provisioner: 117 nfs_provisioner:
118 type: git 118 type: git
@@ -125,25 +125,25 @@ data:
125 subpath: helm-toolkit 125 subpath: helm-toolkit
126 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 126 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
127 armada: 127 armada:
128 type: git
129 location: https://git.openstack.org/openstack/airship-armada 128 location: https://git.openstack.org/openstack/airship-armada
129 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
130 subpath: charts/armada 130 subpath: charts/armada
131 reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
132 armada-htk:
133 type: git 131 type: git
132 armada-htk:
134 location: https://git.openstack.org/openstack/openstack-helm-infra 133 location: https://git.openstack.org/openstack/openstack-helm-infra
135 subpath: helm-toolkit
136 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 134 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
137 barbican: 135 subpath: helm-toolkit
138 type: git 136 type: git
137 barbican:
139 location: https://git.openstack.org/openstack/openstack-helm 138 location: https://git.openstack.org/openstack/openstack-helm
139 reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
140 subpath: barbican 140 subpath: barbican
141 reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
142 barbican-htk:
143 type: git 141 type: git
142 barbican-htk:
144 location: https://git.openstack.org/openstack/openstack-helm-infra 143 location: https://git.openstack.org/openstack/openstack-helm-infra
145 subpath: helm-toolkit
146 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 144 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
145 subpath: helm-toolkit
146 type: git
147 #TODO Update to split ceph charts 147 #TODO Update to split ceph charts
148 ceph: 148 ceph:
149 type: git 149 type: git
@@ -156,135 +156,135 @@ data:
156 subpath: helm-toolkit 156 subpath: helm-toolkit
157 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 157 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
158 deckhand: 158 deckhand:
159 type: git
160 location: https://git.openstack.org/openstack/airship-deckhand 159 location: https://git.openstack.org/openstack/airship-deckhand
160 reference: 464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
161 subpath: charts/deckhand 161 subpath: charts/deckhand
162 reference: a0f00013b5db1def374fbd5b9f0009f704290bb1
163 deckhand-htk:
164 type: git 162 type: git
163 deckhand-htk:
165 location: https://git.openstack.org/openstack/openstack-helm-infra 164 location: https://git.openstack.org/openstack/openstack-helm-infra
166 subpath: helm-toolkit
167 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 165 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
168 divingbell: 166 subpath: helm-toolkit
169 type: git 167 type: git
168 divingbell:
170 location: https://git.openstack.org/openstack/airship-divingbell 169 location: https://git.openstack.org/openstack/airship-divingbell
170 reference: a648dcb2db2b842656bfee08102081023080e4d5
171 subpath: divingbell 171 subpath: divingbell
172 reference: 0ac90c40a0741a929204d139dfa0415562b7044e
173 divingbell-htk:
174 type: git 172 type: git
173 divingbell-htk:
175 location: https://git.openstack.org/openstack/openstack-helm-infra 174 location: https://git.openstack.org/openstack/openstack-helm-infra
176 subpath: helm-toolkit
177 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 175 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
178 drydock: 176 subpath: helm-toolkit
179 type: git 177 type: git
178 drydock:
180 location: https://git.openstack.org/openstack/airship-drydock 179 location: https://git.openstack.org/openstack/airship-drydock
180 reference: 756a063c3074ddd847af1dd02c9b576b541cedbd
181 subpath: charts/drydock 181 subpath: charts/drydock
182 reference: master
183 drydock-htk:
184 type: git 182 type: git
183 drydock-htk:
185 location: https://git.openstack.org/openstack/openstack-helm-infra 184 location: https://git.openstack.org/openstack/openstack-helm-infra
185 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
186 subpath: helm-toolkit 186 subpath: helm-toolkit
187 reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
188 ingress:
189 type: git 187 type: git
188 ingress:
190 location: https://git.openstack.org/openstack/openstack-helm-infra 189 location: https://git.openstack.org/openstack/openstack-helm-infra
191 subpath: ingress
192 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 190 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
193 ingress-htk: 191 subpath: ingress
194 type: git 192 type: git
193 ingress-htk:
195 location: https://git.openstack.org/openstack/openstack-helm-infra 194 location: https://git.openstack.org/openstack/openstack-helm-infra
196 subpath: helm-toolkit
197 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 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 subpath: helm-toolkit 196 subpath: helm-toolkit
207 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
208 promenade:
209 type: git 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 keystone: 198 keystone:
219 type: git
220 location: https://git.openstack.org/openstack/openstack-helm 199 location: https://git.openstack.org/openstack/openstack-helm
200 reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
221 subpath: keystone 201 subpath: keystone
222 reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
223 keystone-htk:
224 type: git 202 type: git
203 keystone-htk:
225 location: https://git.openstack.org/openstack/openstack-helm-infra 204 location: https://git.openstack.org/openstack/openstack-helm-infra
226 subpath: helm-toolkit
227 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 205 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
228 maas: 206 subpath: helm-toolkit
229 type: git 207 type: git
208 maas:
230 location: https://git.openstack.org/openstack/airship-maas 209 location: https://git.openstack.org/openstack/airship-maas
231 subpath: charts/maas
232 reference: 2e003450cceb16b9bda71aa69a939a8466516582 210 reference: 2e003450cceb16b9bda71aa69a939a8466516582
233 maas-htk: 211 subpath: charts/maas
234 type: git 212 type: git
213 maas-htk:
235 location: https://git.openstack.org/openstack/openstack-helm-infra 214 location: https://git.openstack.org/openstack/openstack-helm-infra
236 subpath: helm-toolkit
237 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 215 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
238 mariadb: 216 subpath: helm-toolkit
239 type: git 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 subpath: mariadb 221 subpath: mariadb
242 reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
243 mariadb-htk:
244 type: git 222 type: git
223 mariadb-htk:
245 location: https://git.openstack.org/openstack/openstack-helm-infra 224 location: https://git.openstack.org/openstack/openstack-helm-infra
246 subpath: helm-toolkit
247 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 225 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
248 memcached: 226 subpath: helm-toolkit
249 type: git 227 type: git
228 memcached:
250 location: https://git.openstack.org/openstack/openstack-helm-infra 229 location: https://git.openstack.org/openstack/openstack-helm-infra
251 subpath: memcached
252 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 230 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253 memcached-htk: 231 subpath: memcached
254 type: git 232 type: git
233 memcached-htk:
255 location: https://git.openstack.org/openstack/openstack-helm-infra 234 location: https://git.openstack.org/openstack/openstack-helm-infra
235 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
256 subpath: helm-toolkit 236 subpath: helm-toolkit
237 type: git
238 postgresql:
239 location: https://git.openstack.org/openstack/openstack-helm-infra
257 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 240 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258 rabbitmq: 241 subpath: postgresql
259 type: git 242 type: git
243 postgresql-htk:
260 location: https://git.openstack.org/openstack/openstack-helm-infra 244 location: https://git.openstack.org/openstack/openstack-helm-infra
261 subpath: rabbitmq
262 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 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 type: git 252 type: git
253 promenade-htk:
265 location: https://git.openstack.org/openstack/openstack-helm-infra 254 location: https://git.openstack.org/openstack/openstack-helm-infra
255 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
266 subpath: helm-toolkit 256 subpath: helm-toolkit
257 type: git
258 rabbitmq:
259 location: https://git.openstack.org/openstack/openstack-helm-infra
267 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 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 type: git 267 type: git
268 shipyard:
270 location: https://git.openstack.org/openstack/airship-shipyard 269 location: https://git.openstack.org/openstack/airship-shipyard
270 reference: 70ec78815dfc9deeb342a3fccfa3cd079a4312d9
271 subpath: charts/shipyard 271 subpath: charts/shipyard
272 reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
273 shipyard-htk:
274 type: git 272 type: git
273 shipyard-htk:
275 location: https://git.openstack.org/openstack/openstack-helm-infra 274 location: https://git.openstack.org/openstack/openstack-helm-infra
275 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
276 subpath: helm-toolkit 276 subpath: helm-toolkit
277 reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207
278 tiller:
279 type: git 277 type: git
278 tiller:
280 location: https://git.openstack.org/openstack/airship-armada 279 location: https://git.openstack.org/openstack/airship-armada
280 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
281 subpath: charts/tiller 281 subpath: charts/tiller
282 reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
283 tiller-htk:
284 type: git 282 type: git
283 tiller-htk:
285 location: https://git.openstack.org/openstack/openstack-helm-infra 284 location: https://git.openstack.org/openstack/openstack-helm-infra
286 subpath: helm-toolkit
287 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 285 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
286 subpath: helm-toolkit
287 type: git
288 openstack: 288 openstack:
289 glance: 289 glance:
290 type: git 290 type: git
@@ -442,29 +442,70 @@ data:
442 images: 442 images:
443 ucp: 443 ucp:
444 armada: 444 armada:
445 api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290 445 api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
446 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 446 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
447 ks_endpoints: docker.io/openstackhelm/heat:ocata 447 ks_endpoints: docker.io/openstackhelm/heat:ocata
448 ks_service: docker.io/openstackhelm/heat:ocata 448 ks_service: docker.io/openstackhelm/heat:ocata
449 ks_user: docker.io/openstackhelm/heat:ocata 449 ks_user: docker.io/openstackhelm/heat:ocata
450 helm: lachlanevenson/k8s-helm:v2.10.0 450 helm: lachlanevenson/k8s-helm:v2.10.0
451 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 451 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
452 promenade: 452 armada:
453 api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
453 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 454 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
454 promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb 455 helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
455 ks_user: docker.io/openstackhelm/heat:ocata 456 image_repo_sync: docker.io/docker:17.07.0
456 ks_service: docker.io/openstackhelm/heat:ocata
457 ks_endpoints: docker.io/openstackhelm/heat:ocata 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 deckhand: 461 deckhand:
459 # pinned back to older version to prevent substitution errors with 462 db_init: docker.io/postgres:9.5
460 # newer version e.g.: fc03c6318a36fa60faf56ee79d91573fe7c60feb 463 db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
461 deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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 db_init: docker.io/postgres:9.5 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 ks_endpoints: docker.io/openstackhelm/heat:ocata 501 ks_endpoints: docker.io/openstackhelm/heat:ocata
466 ks_service: docker.io/openstackhelm/heat:ocata 502 ks_service: docker.io/openstackhelm/heat:ocata
467 ks_user: docker.io/openstackhelm/heat:ocata 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 barbican: 509 barbican:
469 bootstrap: docker.io/openstackhelm/heat:ocata 510 bootstrap: docker.io/openstackhelm/heat:ocata
470 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 511 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@@ -476,36 +517,6 @@ data:
476 ks_service: docker.io/openstackhelm/heat:ocata 517 ks_service: docker.io/openstackhelm/heat:ocata
477 ks_user: docker.io/openstackhelm/heat:ocata 518 ks_user: docker.io/openstackhelm/heat:ocata
478 barbican_api: docker.io/openstackhelm/barbican:ocata 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 keystone: 520 keystone:
510 keystone_bootstrap: docker.io/openstackhelm/heat:ocata 521 keystone_bootstrap: docker.io/openstackhelm/heat:ocata
511 test: docker.io/kolla/ubuntu-source-rally:4.0.0 522 test: docker.io/kolla/ubuntu-source-rally:4.0.0
@@ -518,10 +529,8 @@ data:
518 keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata 529 keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata
519 keystone_api: docker.io/openstackhelm/keystone:ocata 530 keystone_api: docker.io/openstackhelm/keystone:ocata
520 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 531 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
521 tiller:
522 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
523 mariadb: 532 mariadb:
524 mariadb: docker.io/mariadb:10.1.23 533 mariadb: docker.io/openstackhelm/mariadb:10.2.18
525 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 534 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
526 postgresql: 535 postgresql:
527 postgresql: docker.io/postgres:9.5 536 postgresql: docker.io/postgres:9.5
diff --git a/deployment_files/site/gate-multinode/software/configs/versions.yaml b/deployment_files/site/gate-multinode/software/configs/versions.yaml
index ec90d58..c6ecea2 100644
--- a/deployment_files/site/gate-multinode/software/configs/versions.yaml
+++ b/deployment_files/site/gate-multinode/software/configs/versions.yaml
@@ -17,18 +17,6 @@ metadata:
17# versions to match a patchset, for example. Anything specified in the global 17# versions to match a patchset, for example. Anything specified in the global
18# versions can be overridden, such as chart or image versions. 18# versions can be overridden, such as chart or image versions.
19data: 19data:
20 charts: 20 charts: {}
21 ucp: 21 images: {}
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'
34... 22...