summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <bryan.strassner@gmail.com>2018-11-19 17:12:10 -0600
committerBryan Strassner <bryan.strassner@gmail.com>2018-11-20 15:42:20 -0600
commit221441f1bff351ab366b02d6fd7856b70b06108f (patch)
tree11a8146d2a6f071d94fdd07f79061448084e8580
parent568f52897010b5bf639076200c9cc1cbd49282d2 (diff)
Update apiserver for admission controller
Update the apiserver's command prefix to match between the apiserver chart and the genesis api server. Includes an optimization of virsh commands to parallelize and wait for cloud init to complete (requires Ubuntu 16.04.4) Change-Id: I793d210e15c3c13e8b662bd2459ed8bcba30d434
Notes
Notes (review): Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+2: Mark Burnett <mark.m.burnett@gmail.com> Workflow+1: Mark Burnett <mark.m.burnett@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 27 Nov 2018 15:39:41 +0000 Reviewed-on: https://review.openstack.org/618903 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/profiles/genesis.yaml5
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml27
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml104
-rw-r--r--deployment_files/global/v1.0dev/profiles/genesis.yaml9
-rw-r--r--deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml27
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml68
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/virsh.sh19
7 files changed, 163 insertions, 96 deletions
diff --git a/deployment_files/global/v1.0demo/profiles/genesis.yaml b/deployment_files/global/v1.0demo/profiles/genesis.yaml
index 7420a83..29857a6 100644
--- a/deployment_files/global/v1.0demo/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0demo/profiles/genesis.yaml
@@ -91,8 +91,11 @@ data:
91 - --service-cluster-ip-range=SERVICE_CIDR 91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE 92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC 93 - --authorization-mode=Node,RBAC
94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds 94 - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
95 - --endpoint-reconciler-type=lease 95 - --endpoint-reconciler-type=lease
96 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97 - --repair-malformed-updates=false
98
96 armada: 99 armada:
97 target_manifest: cluster-bootstrap 100 target_manifest: cluster-bootstrap
98 labels: 101 labels:
diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
index adfce25..45f3f61 100644
--- a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
@@ -97,6 +97,22 @@ metadata:
97 dest: 97 dest:
98 path: .values.secrets.service_account.public_key 98 path: .values.secrets.service_account.public_key
99 99
100 # Command prefix
101 - src:
102 schema: pegleg/CommonAddresses/v1
103 name: common-addresses
104 path: .kubernetes.service_cidr
105 dest:
106 path: .values.command_prefix[1]
107 pattern: SERVICE_CIDR
108 - src:
109 schema: pegleg/CommonAddresses/v1
110 name: common-addresses
111 path: .kubernetes.service_node_port_range
112 dest:
113 path: .values.command_prefix[2]
114 pattern: SERVICE_NODE_PORT_RANGE
115
100data: 116data:
101 chart_name: apiserver 117 chart_name: apiserver
102 release: kubernetes-apiserver 118 release: kubernetes-apiserver
@@ -115,9 +131,20 @@ data:
115 labels: 131 labels:
116 release_group: airship-kubernetes-apiserver 132 release_group: airship-kubernetes-apiserver
117 values: 133 values:
134
118 apiserver: 135 apiserver:
119 etcd: 136 etcd:
120 endpoints: https://127.0.0.1:2378 137 endpoints: https://127.0.0.1:2378
138 command_prefix:
139 - /apiserver
140 - --service-cluster-ip-range=SERVICE_CIDR
141 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
142 - --authorization-mode=Node,RBAC
143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144 - --endpoint-reconciler-type=lease
145 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146 - --repair-malformed-updates=false
147
121 dependencies: 148 dependencies:
122 - kubernetes-apiserver-htk 149 - kubernetes-apiserver-htk
123--- 150---
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 68ee4ac..77ad0e1 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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 22 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 28 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 33 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 43 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 53 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 63 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 73 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 83 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 88 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 93 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 103 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 113 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 121 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 126 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
127 armada: 127 armada:
128 location: https://git.openstack.org/openstack/airship-armada 128 location: https://git.openstack.org/openstack/airship-armada
129 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35 129 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
@@ -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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 134 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 144 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 165 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
166 subpath: helm-toolkit 166 subpath: helm-toolkit
167 type: git 167 type: git
168 divingbell: 168 divingbell:
@@ -172,27 +172,27 @@ 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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 175 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
176 subpath: helm-toolkit 176 subpath: helm-toolkit
177 type: git 177 type: git
178 drydock: 178 drydock:
179 location: https://git.openstack.org/openstack/airship-drydock 179 location: https://git.openstack.org/openstack/airship-drydock
180 reference: 756a063c3074ddd847af1dd02c9b576b541cedbd 180 reference: 3470f89519d018c572905566891bafc8a3c51c3b
181 subpath: charts/drydock 181 subpath: charts/drydock
182 type: git 182 type: git
183 drydock-htk: 183 drydock-htk:
184 location: https://git.openstack.org/openstack/openstack-helm-infra 184 location: https://git.openstack.org/openstack/openstack-helm-infra
185 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 185 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
186 subpath: helm-toolkit 186 subpath: helm-toolkit
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 190 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 195 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 205 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
206 subpath: helm-toolkit 206 subpath: helm-toolkit
207 type: git 207 type: git
208 maas: 208 maas:
@@ -212,37 +212,37 @@ data:
212 type: git 212 type: git
213 maas-htk: 213 maas-htk:
214 location: https://git.openstack.org/openstack/openstack-helm-infra 214 location: https://git.openstack.org/openstack/openstack-helm-infra
215 reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 215 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
216 subpath: helm-toolkit 216 subpath: helm-toolkit
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 220 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 225 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 230 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 235 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 240 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 245 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 255 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 260 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 265 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 275 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 285 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 298 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 308 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 318 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 323 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 328 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 338 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 348 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 358 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 363 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 368 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 378 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 388 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 398 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 403 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 408 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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
@@ -470,9 +470,9 @@ data:
470 divingbell: docker.io/ubuntu:16.04 470 divingbell: docker.io/ubuntu:16.04
471 drydock: 471 drydock:
472 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 473 drydock: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
474 drydock_db_init: docker.io/postgres:9.5 474 drydock_db_init: docker.io/postgres:9.5
475 drydock_db_sync: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91 475 drydock_db_sync: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
476 ks_endpoints: docker.io/openstackhelm/heat:ocata 476 ks_endpoints: docker.io/openstackhelm/heat:ocata
477 ks_service: docker.io/openstackhelm/heat:ocata 477 ks_service: docker.io/openstackhelm/heat:ocata
478 ks_user: docker.io/openstackhelm/heat:ocata 478 ks_user: docker.io/openstackhelm/heat:ocata
diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml
index 0d3f8dc..29857a6 100644
--- a/deployment_files/global/v1.0dev/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml
@@ -91,8 +91,11 @@ data:
91 - --service-cluster-ip-range=SERVICE_CIDR 91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE 92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC 93 - --authorization-mode=Node,RBAC
94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds 94 - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
95 - --endpoint-reconciler-type=lease 95 - --endpoint-reconciler-type=lease
96 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97 - --repair-malformed-updates=false
98
96 armada: 99 armada:
97 target_manifest: cluster-bootstrap 100 target_manifest: cluster-bootstrap
98 labels: 101 labels:
@@ -109,11 +112,11 @@ data:
109 - openvswitch=enabled 112 - openvswitch=enabled
110 - promenade-genesis=enabled 113 - promenade-genesis=enabled
111 - ucp-control-plane=enabled 114 - ucp-control-plane=enabled
112 - ceph-mgr=enabled
113 - ceph-mon=enabled 115 - ceph-mon=enabled
114 - ceph-mds=enabled 116 - ceph-mds=enabled
115 - ceph-rgw=enabled
116 - ceph-osd=enabled 117 - ceph-osd=enabled
118 - ceph-rgw=enabled
119 - ceph-mgr=enabled
117 files: 120 files:
118 - path: /var/lib/anchor/calico-etcd-bootstrap 121 - path: /var/lib/anchor/calico-etcd-bootstrap
119 content: "# placeholder for triggering calico etcd bootstrapping\n# this file will be deleted" 122 content: "# placeholder for triggering calico etcd bootstrapping\n# this file will be deleted"
diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
index adfce25..45f3f61 100644
--- a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
@@ -97,6 +97,22 @@ metadata:
97 dest: 97 dest:
98 path: .values.secrets.service_account.public_key 98 path: .values.secrets.service_account.public_key
99 99
100 # Command prefix
101 - src:
102 schema: pegleg/CommonAddresses/v1
103 name: common-addresses
104 path: .kubernetes.service_cidr
105 dest:
106 path: .values.command_prefix[1]
107 pattern: SERVICE_CIDR
108 - src:
109 schema: pegleg/CommonAddresses/v1
110 name: common-addresses
111 path: .kubernetes.service_node_port_range
112 dest:
113 path: .values.command_prefix[2]
114 pattern: SERVICE_NODE_PORT_RANGE
115
100data: 116data:
101 chart_name: apiserver 117 chart_name: apiserver
102 release: kubernetes-apiserver 118 release: kubernetes-apiserver
@@ -115,9 +131,20 @@ data:
115 labels: 131 labels:
116 release_group: airship-kubernetes-apiserver 132 release_group: airship-kubernetes-apiserver
117 values: 133 values:
134
118 apiserver: 135 apiserver:
119 etcd: 136 etcd:
120 endpoints: https://127.0.0.1:2378 137 endpoints: https://127.0.0.1:2378
138 command_prefix:
139 - /apiserver
140 - --service-cluster-ip-range=SERVICE_CIDR
141 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
142 - --authorization-mode=Node,RBAC
143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144 - --endpoint-reconciler-type=lease
145 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146 - --repair-malformed-updates=false
147
121 dependencies: 148 dependencies:
122 - kubernetes-apiserver-htk 149 - kubernetes-apiserver-htk
123--- 150---
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index f021712..07db537 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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 25 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 26e1b9cde63a3d5a55417d25f05cf8787b03256d 30 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 26e1b9cde63a3d5a55417d25f05cf8787b03256d 35 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 45 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 55 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 65 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 75 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 85 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 90 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 95 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 105 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 115 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 121 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 126 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 136 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 146 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 168 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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,27 +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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 178 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: master 183 reference: 3470f89519d018c572905566891bafc8a3c51c3b
184 drydock-htk: 184 drydock-htk:
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: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44 188 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 193 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 198 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 208 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 218 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 228 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 238 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 248 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 253 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 258 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 263 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 268 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e 288 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
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
@@ -327,13 +327,13 @@ data:
327 ks_user: docker.io/openstackhelm/heat:ocata 327 ks_user: docker.io/openstackhelm/heat:ocata
328 barbican_api: docker.io/openstackhelm/barbican:ocata 328 barbican_api: docker.io/openstackhelm/barbican:ocata
329 drydock: 329 drydock:
330 drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 330 drydock: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
331 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 331 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
332 ks_user: docker.io/openstackhelm/heat:ocata 332 ks_user: docker.io/openstackhelm/heat:ocata
333 ks_service: docker.io/openstackhelm/heat:ocata 333 ks_service: docker.io/openstackhelm/heat:ocata
334 ks_endpoints: docker.io/openstackhelm/heat:ocata 334 ks_endpoints: docker.io/openstackhelm/heat:ocata
335 drydock_db_init: docker.io/postgres:9.5 335 drydock_db_init: docker.io/postgres:9.5
336 drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 336 drydock_db_sync: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
337 shipyard: 337 shipyard:
338 airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca 338 airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
339 shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca 339 shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
diff --git a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
index 3f4b4ae..8b89b73 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
@@ -153,7 +153,8 @@ vm_create() {
153 --disk "vol=${VIRSH_POOL}/cloud-init-${NAME}.iso,device=cdrom" &>> "${LOG_FILE}" 153 --disk "vol=${VIRSH_POOL}/cloud-init-${NAME}.iso,device=cdrom" &>> "${LOG_FILE}"
154 154
155 ssh_wait "${NAME}" 155 ssh_wait "${NAME}"
156 ssh_cmd "${NAME}" sync 156 ssh_cmd "${NAME}" cloud-init status --wait
157 ssh_cmd "${NAME}" sync
157 158
158 else 159 else
159 log Creating VM "${NAME}" 160 log Creating VM "${NAME}"
@@ -172,18 +173,24 @@ vm_create() {
172 fi 173 fi
173} 174}
174 175
176vm_create_validate() {
177 NAME=${1}
178 vm_create "${name}"
179 if [[ "$(config_vm_bootstrap ${name})" == "true" ]]
180 then
181 vm_validate "${name}"
182 fi
183}
184
175vm_create_all() { 185vm_create_all() {
176 log Starting all VMs 186 log Starting all VMs
177 187
178 VM_NAMES=($(config_vm_names)) 188 VM_NAMES=($(config_vm_names))
179 for name in ${VM_NAMES[*]} 189 for name in ${VM_NAMES[*]}
180 do 190 do
181 vm_create "${name}" 191 vm_create_validate "${name}" &
182 if [[ "$(config_vm_bootstrap ${name})" == "true" ]]
183 then
184 vm_validate "${name}"
185 fi
186 done 192 done
193 wait
187} 194}
188 195
189vm_start() { 196vm_start() {