summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@gmail.com>2018-12-12 13:51:38 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2018-12-12 13:51:38 -0600
commitfc7e347226f5f65ed4578d58b93165e05a56dee4 (patch)
treeea66ba265e5403c959c804ff20903bcef356dea3
parent05172723330b4332948a7182ed8d8999c7e31166 (diff)
MAAS ingress related fixes for airship-in-a-bottle
Notes
Notes (review): Code-Review+1: Ahmad Mahmoudi <am495p@att.com> Code-Review+2: Craig Anderson <craig.anderson@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: Thu, 13 Dec 2018 16:57:15 +0000 Reviewed-on: https://review.openstack.org/624529 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/config/endpoints.yaml1
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml14
-rw-r--r--deployment_files/site/demo/software/charts/kubernetes/ingress/ingress.yaml33
-rw-r--r--deployment_files/site/demo/software/charts/ucp/drydock/maas.yaml30
-rwxr-xr-xmanifests/common/deploy-airship.sh1
-rw-r--r--tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json2
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh2
7 files changed, 74 insertions, 9 deletions
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index 8ad6c03..d6cbf1b 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -132,6 +132,7 @@ data:
132 name: maas-region 132 name: maas-region
133 hosts: 133 hosts:
134 default: maas-region 134 default: maas-region
135 public: maas-region
135 scheme: 136 scheme:
136 default: "http" 137 default: "http"
137 port: 138 port:
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 82a413c..946e5bb 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -207,7 +207,7 @@ data:
207 type: git 207 type: git
208 maas: 208 maas:
209 location: https://git.openstack.org/openstack/airship-maas 209 location: https://git.openstack.org/openstack/airship-maas
210 reference: refs/changes/83/619283/11 210 reference: 617607e42690befae69c86ad9b21134fdd467cbb
211 subpath: charts/maas 211 subpath: charts/maas
212 type: git 212 type: git
213 maas-htk: 213 maas-htk:
@@ -468,14 +468,14 @@ data:
468 ks_service: docker.io/openstackhelm/heat:ocata 468 ks_service: docker.io/openstackhelm/heat:ocata
469 ks_user: docker.io/openstackhelm/heat:ocata 469 ks_user: docker.io/openstackhelm/heat:ocata
470 maas: 470 maas:
471 bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582 471 bootstrap: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
472 db_init: docker.io/postgres:9.5 472 db_init: docker.io/postgres:9.5
473 db_sync: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582 473 db_sync: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
474 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 474 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
475 export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582 475 export_api_key: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
476 maas_cache: quay.io/airshipit/sstream-cache:2e003450cceb16b9bda71aa69a939a8466516582 476 maas_cache: quay.io/airshipit/sstream-cache:617607e42690befae69c86ad9b21134fdd467cbb
477 maas_rack: docker.io/sthussey/maas-rack-controller:dev 477 maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb
478 maas_region: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582 478 maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
479 promenade: 479 promenade:
480 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 480 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
481 image_repo_sync: docker.io/docker:17.07.0 481 image_repo_sync: docker.io/docker:17.07.0
diff --git a/deployment_files/site/demo/software/charts/kubernetes/ingress/ingress.yaml b/deployment_files/site/demo/software/charts/kubernetes/ingress/ingress.yaml
new file mode 100644
index 0000000..c197318
--- /dev/null
+++ b/deployment_files/site/demo/software/charts/kubernetes/ingress/ingress.yaml
@@ -0,0 +1,33 @@
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
16 substitutions:
17 # Chart source
18 - src:
19 schema: dev/Configurables/v1
20 name: dev-configurables
21 path: .hostcidr
22 dest:
23 path: .values.network.vip.addr
24 pattern: REPLACEME
25data:
26 values:
27 network:
28 ingress:
29 disable-ipv6: "true"
30 vip:
31 manage: true
32 addr: REPLACEME
33...
diff --git a/deployment_files/site/demo/software/charts/ucp/drydock/maas.yaml b/deployment_files/site/demo/software/charts/ucp/drydock/maas.yaml
new file mode 100644
index 0000000..7449636
--- /dev/null
+++ b/deployment_files/site/demo/software/charts/ucp/drydock/maas.yaml
@@ -0,0 +1,30 @@
1---
2schema: armada/Chart/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp-maas
6 replacement: true
7 layeringDefinition:
8 abstract: false
9 layer: site
10 parentSelector:
11 name: ucp-maas
12 actions:
13 - method: merge
14 path: .
15 storagePolicy: cleartext
16 substitutions:
17 # Chart source
18 - src:
19 schema: dev/Configurables/v1
20 name: dev-configurables
21 path: .maas-ingress
22 dest:
23 path: .values.network.maas_ingress.addr
24 pattern: REPLACEME
25data:
26 values:
27 network:
28 maas_ingress:
29 addr: REPLACEME
30...
diff --git a/manifests/common/deploy-airship.sh b/manifests/common/deploy-airship.sh
index a2991e5..0cab9cb 100755
--- a/manifests/common/deploy-airship.sh
+++ b/manifests/common/deploy-airship.sh
@@ -190,6 +190,7 @@ data:
190 hostip: ${HOSTIP} 190 hostip: ${HOSTIP}
191 hostcidr: ${HOSTCIDR} 191 hostcidr: ${HOSTCIDR}
192 interface: ${NODE_NET_IFACE} 192 interface: ${NODE_NET_IFACE}
193 maas-ingress: '192.169.1.5/32'
193EOF 194EOF
194} 195}
195 196
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 9f0ae84..09d9b6f 100644
--- a/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
+++ b/tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
@@ -67,7 +67,7 @@
67 }, 67 },
68 "n0" : { 68 "n0" : {
69 "memory": 32768, 69 "memory": 32768,
70 "vcpus": 12, 70 "vcpus": 16,
71 "mac": "52:54:00:00:a4:31", 71 "mac": "52:54:00:00:a4:31",
72 "ip": "172.24.1.10", 72 "ip": "172.24.1.10",
73 "io_profile": "fast", 73 "io_profile": "fast",
diff --git a/tools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh b/tools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh
index 0254277..365d393 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh
@@ -19,4 +19,4 @@ source "${GATE_UTILS}"
19 19
20cd "${TEMP_DIR}" 20cd "${TEMP_DIR}"
21 21
22shipyard_action_wait deploy_site 3600 22shipyard_action_wait deploy_site 7200