summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 14:53:39 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 14:53:39 +0000
commit8695f97b83403efef12dad6f7ccf0fc055e6315f (patch)
tree0053b3658d0a96b929ae94e1b7f47dc57b572576
parent62267041dc5bfb4a06230c738f39d47625db0a98 (diff)
parentb857672967634e5ba5ee60aeaa1cd760cc864455 (diff)
Merge "Support maas mobility"
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml9
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml4
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml2
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml27
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml12
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml2
-rw-r--r--deployment_files/global/v1.0demo/software/config/endpoints.yaml12
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml19
-rw-r--r--deployment_files/site/gate-multinode/networks/common-addresses.yaml5
-rw-r--r--deployment_files/site/gate-multinode/networks/physical/network.yaml2
-rw-r--r--deployment_files/site/gate-multinode/software/charts/kubernetes/ingress/ingress.yaml24
-rw-r--r--deployment_files/site/gate-multinode/software/charts/ucp/drydock/drydock.yaml2
-rw-r--r--deployment_files/site/gate-multinode/software/charts/ucp/drydock/maas.yaml35
-rw-r--r--deployment_files/site/gate-multinode/software/configs/versions.yaml9
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/config.sh1
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/ingress.sh2
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/virsh.sh4
-rw-r--r--tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json6
-rw-r--r--tools/multi_nodes_gate/airship_gate/templates/ingress_corefile.sub2
19 files changed, 110 insertions, 69 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml
index 2d145e9..a520aa6 100644
--- a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml
@@ -56,13 +56,6 @@ metadata:
56 dest: 56 dest:
57 path: .values.conf.coredns.corefile 57 path: .values.conf.coredns.corefile
58 pattern: 'UPSTREAM1' 58 pattern: 'UPSTREAM1'
59 - src:
60 schema: pegleg/CommonAddresses/v1
61 name: common-addresses
62 path: .dns.upstream_servers[1]
63 dest:
64 path: .values.conf.coredns.corefile
65 pattern: 'UPSTREAM2'
66data: 59data:
67 chart_name: coredns 60 chart_name: coredns
68 release: coredns 61 release: coredns
@@ -95,11 +88,9 @@ data:
95 pods insecure 88 pods insecure
96 fallthrough in-addr.arpa ip6.arpa 89 fallthrough in-addr.arpa ip6.arpa
97 upstream UPSTREAM1 90 upstream UPSTREAM1
98 upstream UPSTREAM2
99 } 91 }
100 prometheus :9153 92 prometheus :9153
101 proxy . UPSTREAM1 93 proxy . UPSTREAM1
102 proxy . UPSTREAM2
103 cache 30 94 cache 30
104 } 95 }
105 dependencies: 96 dependencies:
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 ed0a893..fd82d85 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
@@ -6,6 +6,8 @@ metadata:
6 layeringDefinition: 6 layeringDefinition:
7 abstract: false 7 abstract: false
8 layer: global 8 layer: global
9 labels:
10 name: ingress-kube-system
9 storagePolicy: cleartext 11 storagePolicy: cleartext
10 substitutions: 12 substitutions:
11 # Chart source 13 # Chart source
@@ -50,7 +52,7 @@ data:
50 nginx.ingress.kubernetes.io/proxy-read-timeout: "603" 52 nginx.ingress.kubernetes.io/proxy-read-timeout: "603"
51 pod: 53 pod:
52 replicas: 54 replicas:
53 error_page: 2 55 error_page: 1
54 dependencies: 56 dependencies:
55 - ingress-kube-system-htk 57 - ingress-kube-system-htk
56--- 58---
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml
index fc110ea..2e43c59 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml
@@ -7,6 +7,8 @@ metadata:
7 abstract: false 7 abstract: false
8 layer: global 8 layer: global
9 storagePolicy: cleartext 9 storagePolicy: cleartext
10 labels:
11 name: ucp-ingress
10 substitutions: 12 substitutions:
11 # Chart source 13 # Chart source
12 - src: 14 - src:
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
index 6840e10..5255586 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
@@ -62,23 +62,6 @@ metadata:
62 dest: 62 dest:
63 path: .values.endpoints.physicalprovisioner.port.api.nodeport 63 path: .values.endpoints.physicalprovisioner.port.api.nodeport
64 64
65 # MaaS IPs
66 - src:
67 schema: pegleg/CommonAddresses/v1
68 name: common-addresses
69 # TODO(mb874d): Can change once we have an accessible VIP from fresh nodes.
70 path: .genesis.ip
71 dest:
72 path: .values.conf.drydock.maasdriver.maas_api_url
73 pattern: 'MAAS_IP'
74 - src:
75 schema: pegleg/CommonAddresses/v1
76 name: common-addresses
77 path: .node_ports.maas_api
78 dest:
79 path: .values.conf.drydock.maasdriver.maas_api_url
80 pattern: 'MAAS_PORT'
81
82 # Credentials 65 # Credentials
83 66
84 - src: 67 - src:
@@ -103,9 +86,15 @@ metadata:
103 - src: 86 - src:
104 schema: pegleg/AccountCatalogue/v1 87 schema: pegleg/AccountCatalogue/v1
105 name: ucp_service_accounts 88 name: ucp_service_accounts
89 path: .ucp.keystone.admin
90 dest:
91 path: .values.endpoints.identity.auth.admin
92 - src:
93 schema: pegleg/AccountCatalogue/v1
94 name: ucp_service_accounts
106 path: .ucp.drydock.keystone 95 path: .ucp.drydock.keystone
107 dest: 96 dest:
108 path: .values.endpoints.identity.auth.user 97 path: .values.endpoints.identity.auth.drydock
109 98
110 # Secrets 99 # Secrets
111 - dest: 100 - dest:
@@ -121,7 +110,7 @@ metadata:
121 name: ucp_postgres_admin_password 110 name: ucp_postgres_admin_password
122 path: . 111 path: .
123 - dest: 112 - dest:
124 path: .values.endpoints.identity.auth.user.password 113 path: .values.endpoints.identity.auth.drydock.password
125 src: 114 src:
126 schema: deckhand/Passphrase/v1 115 schema: deckhand/Passphrase/v1
127 name: ucp_drydock_keystone_password 116 name: ucp_drydock_keystone_password
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml
index 256e8f0..f25798a 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml
@@ -102,9 +102,15 @@ metadata:
102 - src: 102 - src:
103 schema: pegleg/EndpointCatalogue/v1 103 schema: pegleg/EndpointCatalogue/v1
104 name: ucp_endpoints 104 name: ucp_endpoints
105 path: .ucp.maas_region_ui 105 path: .ucp.maas_region
106 dest: 106 dest:
107 path: .values.endpoints.maas_region_ui 107 path: .values.endpoints.maas_region
108 - src:
109 schema: pegleg/EndpointCatalogue/v1
110 name: ucp_endpoints
111 path: .ucp.physicalprovisioner
112 dest:
113 path: .values.endpoints.physicalprovisioner
108 114
109 # Account and credential substitutions 115 # Account and credential substitutions
110 - src: 116 - src:
@@ -131,7 +137,7 @@ metadata:
131 name: ucp_service_accounts 137 name: ucp_service_accounts
132 path: .ucp.maas.admin 138 path: .ucp.maas.admin
133 dest: 139 dest:
134 path: .values.endpoints.maas_region_ui.auth.admin 140 path: .values.endpoints.maas_region.auth.admin
135 141
136 # Secrets 142 # Secrets
137 - dest: 143 - dest:
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml
index 828b351..f927c24 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml
@@ -11,8 +11,8 @@ data:
11 description: Airship Services 11 description: Airship Services
12 sequenced: true 12 sequenced: true
13 chart_group: 13 chart_group:
14 - ucp-maas
15 - ucp-tiller 14 - ucp-tiller
15 - ucp-maas
16 - ucp-armada 16 - ucp-armada
17 - ucp-barbican 17 - ucp-barbican
18 - ucp-deckhand 18 - ucp-deckhand
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index 5cf471b..f3389c1 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -17,6 +17,7 @@ data:
17 internal: keystone-api 17 internal: keystone-api
18 host_fqdn_override: 18 host_fqdn_override:
19 default: null 19 default: null
20 public: keystone.gate.local
20 path: 21 path:
21 default: /v3 22 default: /v3
22 scheme: 23 scheme:
@@ -119,19 +120,19 @@ data:
119 api: 120 api:
120 default: 9000 121 default: 9000
121 nodeport: 31900 122 nodeport: 31900
123 public: 80
122 path: 124 path:
123 default: /api/v1.0 125 default: /api/v1.0
124 scheme: 126 scheme:
125 default: http 127 default: http
126 host_fqdn_override: 128 host_fqdn_override:
127 default: null 129 default: null
128 maas_region_ui: 130 public: drydock.gate.local
129 name: maas-region-ui 131 maas_region:
132 name: maas-region
130 hosts: 133 hosts:
131 default: maas-region-ui 134 default: maas-region
132 public: maas 135 public: maas
133 path:
134 default: /MAAS
135 scheme: 136 scheme:
136 default: "http" 137 default: "http"
137 port: 138 port:
@@ -168,6 +169,7 @@ data:
168 default: http 169 default: http
169 host_fqdn_override: 170 host_fqdn_override:
170 default: null 171 default: null
172 public: shipyard.gate.local
171 airflow_web: 173 airflow_web:
172 name: airflow-web 174 name: airflow-web
173 hosts: 175 hosts:
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index da3c482..e4cf832 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -150,7 +150,6 @@ data:
150 location: https://git.openstack.org/openstack/openstack-helm 150 location: https://git.openstack.org/openstack/openstack-helm
151 subpath: ceph 151 subpath: ceph
152 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 152 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
153 #TODO Update to new HTK with split ceph charts
154 ceph-htk: 153 ceph-htk:
155 type: git 154 type: git
156 location: https://git.openstack.org/openstack/openstack-helm 155 location: https://git.openstack.org/openstack/openstack-helm
@@ -180,14 +179,12 @@ data:
180 type: git 179 type: git
181 location: https://git.openstack.org/openstack/airship-drydock 180 location: https://git.openstack.org/openstack/airship-drydock
182 subpath: charts/drydock 181 subpath: charts/drydock
183 reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b 182 reference: master
184 # TODO waiting for https://review.openstack.org/#/c/595902/ to move to
185 # openstack-helm-infra version.
186 drydock-htk: 183 drydock-htk:
187 type: git 184 type: git
188 location: https://git.openstack.org/openstack/openstack-helm 185 location: https://git.openstack.org/openstack/openstack-helm-infra
189 subpath: helm-toolkit 186 subpath: helm-toolkit
190 reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 187 reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
191 ingress: 188 ingress:
192 type: git 189 type: git
193 location: https://git.openstack.org/openstack/openstack-helm-infra 190 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -212,7 +209,7 @@ data:
212 type: git 209 type: git
213 location: https://git.openstack.org/openstack/airship-promenade 210 location: https://git.openstack.org/openstack/airship-promenade
214 subpath: charts/promenade 211 subpath: charts/promenade
215 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 212 reference: 24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
216 promenade-htk: 213 promenade-htk:
217 type: git 214 type: git
218 location: https://git.openstack.org/openstack/openstack-helm-infra 215 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -232,14 +229,12 @@ data:
232 type: git 229 type: git
233 location: https://git.openstack.org/openstack/airship-maas 230 location: https://git.openstack.org/openstack/airship-maas
234 subpath: charts/maas 231 subpath: charts/maas
235 # TODO(bryan-strassner) set to new version 232 reference: master
236 # when https://review.openstack.org/#/c/595398/ is complete
237 reference: refs/changes/98/595398/5
238 maas-htk: 233 maas-htk:
239 type: git 234 type: git
240 location: https://git.openstack.org/openstack/openstack-helm-infra 235 location: https://git.openstack.org/openstack/openstack-helm-infra
241 subpath: helm-toolkit 236 subpath: helm-toolkit
242 reference: 9f6194ff770d3776ae3572bcbe841a9289357244 237 reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
243 mariadb: 238 mariadb:
244 type: git 239 type: git
245 location: https://git.openstack.org/openstack/openstack-helm 240 location: https://git.openstack.org/openstack/openstack-helm
@@ -456,7 +451,7 @@ data:
456 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 451 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
457 promenade: 452 promenade:
458 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 453 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
459 promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26 454 promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
460 ks_user: docker.io/openstackhelm/heat:ocata 455 ks_user: docker.io/openstackhelm/heat:ocata
461 ks_service: docker.io/openstackhelm/heat:ocata 456 ks_service: docker.io/openstackhelm/heat:ocata
462 ks_endpoints: docker.io/openstackhelm/heat:ocata 457 ks_endpoints: docker.io/openstackhelm/heat:ocata
diff --git a/deployment_files/site/gate-multinode/networks/common-addresses.yaml b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
index 67f4a07..8b22fa5 100644
--- a/deployment_files/site/gate-multinode/networks/common-addresses.yaml
+++ b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
@@ -17,9 +17,8 @@ data:
17 cluster_domain: cluster.local 17 cluster_domain: cluster.local
18 service_ip: 10.96.0.10 18 service_ip: 10.96.0.10
19 upstream_servers: 19 upstream_servers:
20 - 8.8.8.8 20 - 172.24.1.9
21 - 8.8.4.4 21 upstream_servers_joined: 172.24.1.9
22 upstream_servers_joined: 8.8.8.8,8.8.4.4
23 22
24 genesis: 23 genesis:
25 hostname: n0 24 hostname: n0
diff --git a/deployment_files/site/gate-multinode/networks/physical/network.yaml b/deployment_files/site/gate-multinode/networks/physical/network.yaml
index 0036769..6eb0a24 100644
--- a/deployment_files/site/gate-multinode/networks/physical/network.yaml
+++ b/deployment_files/site/gate-multinode/networks/physical/network.yaml
@@ -40,5 +40,5 @@ data:
40 metric: 10 40 metric: 10
41 dns: 41 dns:
42 domain: gate.local 42 domain: gate.local
43 servers: '8.8.8.8 8.8.4.4' 43 servers: '172.24.1.9'
44... 44...
diff --git a/deployment_files/site/gate-multinode/software/charts/kubernetes/ingress/ingress.yaml b/deployment_files/site/gate-multinode/software/charts/kubernetes/ingress/ingress.yaml
new file mode 100644
index 0000000..ed8008c
--- /dev/null
+++ b/deployment_files/site/gate-multinode/software/charts/kubernetes/ingress/ingress.yaml
@@ -0,0 +1,24 @@
1---
2schema: armada/Chart/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ingress-kube-system
6 replacement: true
7 layeringDefinition:
8 abstract: false
9 layer: site
10 parentSelector:
11 name: ingress-kube-system
12 actions:
13 - method: merge
14 path: .
15 storagePolicy: cleartext
16data:
17 values:
18 network:
19 ingress:
20 disable-ipv6: "true"
21 vip:
22 manage: true
23 addr: '172.24.1.6/32'
24...
diff --git a/deployment_files/site/gate-multinode/software/charts/ucp/drydock/drydock.yaml b/deployment_files/site/gate-multinode/software/charts/ucp/drydock/drydock.yaml
index 2c2a1ce..eb24512 100644
--- a/deployment_files/site/gate-multinode/software/charts/ucp/drydock/drydock.yaml
+++ b/deployment_files/site/gate-multinode/software/charts/ucp/drydock/drydock.yaml
@@ -26,6 +26,8 @@ data:
26 secret_ssh_key: true 26 secret_ssh_key: true
27 conf: 27 conf:
28 drydock: 28 drydock:
29 maasdriver:
30 maas_api_url: 'http://maas.gate.local:9085/MAAS/api/2.0/'
29 plugins: 31 plugins:
30 oob_driver: 32 oob_driver:
31 - 'drydock_provisioner.drivers.oob.pyghmi_driver.driver.PyghmiDriver' 33 - 'drydock_provisioner.drivers.oob.pyghmi_driver.driver.PyghmiDriver'
diff --git a/deployment_files/site/gate-multinode/software/charts/ucp/drydock/maas.yaml b/deployment_files/site/gate-multinode/software/charts/ucp/drydock/maas.yaml
index f6da4ce..64fe75b 100644
--- a/deployment_files/site/gate-multinode/software/charts/ucp/drydock/maas.yaml
+++ b/deployment_files/site/gate-multinode/software/charts/ucp/drydock/maas.yaml
@@ -25,11 +25,36 @@ data:
25 manifests: 25 manifests:
26 secret_ssh_key: true 26 secret_ssh_key: true
27 conf: 27 conf:
28 cache: 28 maas:
29 enabled: true 29 dns: {dns_servers: '172.24.1.9'}
30 dns: 30 ntp: {use_external_only: 'true' }
31 dns_servers: 172.24.1.9 31 cache: {enabled: true}
32 network: 32 network:
33 maas_ingress: 33 maas_ingress:
34 addr: 172.24.1.5/32 34 addr: '172.24.1.5/32'
35 endpoints:
36 maas_region:
37 host_fqdn_override:
38 public: maas.gate.local
39 port:
40 region_api:
41 public: 9085
42 maas_ingress:
43 hosts:
44 default: maas-ingress
45 error_pages: maas-ingress-error
46 host_fqdn_override:
47 public: null
48 port:
49 http:
50 default: 9080
51 https:
52 default: 9443
53 error_pages:
54 default: 8080
55 podport: 8080
56 healthz:
57 podport: 10259
58 status:
59 podport: 18089
35... 60...
diff --git a/deployment_files/site/gate-multinode/software/configs/versions.yaml b/deployment_files/site/gate-multinode/software/configs/versions.yaml
index da4549d..ec90d58 100644
--- a/deployment_files/site/gate-multinode/software/configs/versions.yaml
+++ b/deployment_files/site/gate-multinode/software/configs/versions.yaml
@@ -21,9 +21,14 @@ data:
21 ucp: 21 ucp:
22 maas: 22 maas:
23 location: https://git.openstack.org/openstack/airship-maas 23 location: https://git.openstack.org/openstack/airship-maas
24 reference: refs/changes/53/600253/1 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
25 images: 29 images:
26 ucp: 30 ucp:
27 maas: 31 maas:
28 maas_region: docker.io/sthussey/maas-region-controller:dev 32 maas_region: 'docker.io/sthussey/maas-region-controller:dev'
33 maas_cache: 'quay.io/airshipit/sstream-cache:master'
29... 34...
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index ec165b1..25f917a 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -16,6 +16,7 @@ export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18}
16export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry} 16export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
17export VIRSH_POOL=${VIRSH_POOL:-airship} 17export VIRSH_POOL=${VIRSH_POOL:-airship}
18export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship} 18export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
19export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 208.67.220.220"}
19 20
20config_vm_memory() { 21config_vm_memory() {
21 nodename=${1} 22 nodename=${1}
diff --git a/tools/multi_nodes_gate/airship_gate/lib/ingress.sh b/tools/multi_nodes_gate/airship_gate/lib/ingress.sh
index e28bd46..dd5dc9c 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/ingress.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/ingress.sh
@@ -30,5 +30,5 @@ ingress_dns_start() {
30 ssh_cmd "${nodename}" mkdir -p "${remote_work_dir}" 30 ssh_cmd "${nodename}" mkdir -p "${remote_work_dir}"
31 rsync_cmd "$DNS_ZONE_FILE" "${nodename}:${remote_zone_file}" 31 rsync_cmd "$DNS_ZONE_FILE" "${nodename}:${remote_zone_file}"
32 rsync_cmd "$COREFILE" "${nodename}:${remote_corefile}" 32 rsync_cmd "$COREFILE" "${nodename}:${remote_corefile}"
33 ssh_cmd "${nodename}" docker run -d -v /var/tmp/coredns:/data -w /data --network host -P $IMAGE_COREDNS -conf $(basename $remote_corefile) 33 ssh_cmd "${nodename}" docker run -d -v /var/tmp/coredns:/data -w /data --network host --restart always -P $IMAGE_COREDNS -conf $(basename $remote_corefile)
34} 34}
diff --git a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
index 9e0eb21..3f4b4ae 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
@@ -117,11 +117,11 @@ vm_clean() {
117} 117}
118 118
119vm_clean_all() { 119vm_clean_all() {
120 log Removing all VMs in parallel 120 log Removing all VMs
121 VM_NAMES=($(config_vm_names)) 121 VM_NAMES=($(config_vm_names))
122 for NAME in ${VM_NAMES[*]} 122 for NAME in ${VM_NAMES[*]}
123 do 123 do
124 vm_clean "${NAME}" & 124 vm_clean "${NAME}"
125 done 125 done
126 wait 126 wait
127} 127}
diff --git a/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json b/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
index fdc9e57..f44dcf4 100644
--- a/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
+++ b/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
@@ -6,10 +6,8 @@
6 }, 6 },
7 "ingress": { 7 "ingress": {
8 "domain": "gate.local", 8 "domain": "gate.local",
9 "172.24.1.5": [ 9 "172.24.1.5": ["maas"],
10 "maas", 10 "172.24.1.6": ["drydock","shipyard","keystone"]
11 "drydock"
12 ]
13 }, 11 },
14 "stages": [ 12 "stages": [
15 { 13 {
diff --git a/tools/multi_nodes_gate/airship_gate/templates/ingress_corefile.sub b/tools/multi_nodes_gate/airship_gate/templates/ingress_corefile.sub
index 6f12b23..146e8a5 100644
--- a/tools/multi_nodes_gate/airship_gate/templates/ingress_corefile.sub
+++ b/tools/multi_nodes_gate/airship_gate/templates/ingress_corefile.sub
@@ -4,6 +4,6 @@ ${DNS_DOMAIN} {
4} 4}
5 5
6. { 6. {
7 forward . /etc/resolv.conf 7 forward . ${UPSTREAM_DNS}
8 log 8 log
9} 9}