Browse Source

MAAS ingress related fixes for airship-in-a-bottle

Change-Id: I9f2c798ec41e95448f801344af5c30b25603c3c7
Kaspars Skels 4 months ago
parent
commit
fc7e347226

+ 1
- 0
deployment_files/global/v1.0demo/software/config/endpoints.yaml View File

@@ -132,6 +132,7 @@ data:
132 132
       name: maas-region
133 133
       hosts:
134 134
         default: maas-region
135
+        public: maas-region
135 136
       scheme:
136 137
         default: "http"
137 138
       port:

+ 7
- 7
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -207,7 +207,7 @@ data:
207 207
         type: git
208 208
       maas:
209 209
         location: https://git.openstack.org/openstack/airship-maas
210
-        reference: refs/changes/83/619283/11
210
+        reference: 617607e42690befae69c86ad9b21134fdd467cbb
211 211
         subpath: charts/maas
212 212
         type: git
213 213
       maas-htk:
@@ -468,14 +468,14 @@ data:
468 468
         ks_service: docker.io/openstackhelm/heat:ocata
469 469
         ks_user: docker.io/openstackhelm/heat:ocata
470 470
       maas:
471
-        bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
471
+        bootstrap: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
472 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 474
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
475
-        export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
476
-        maas_cache: quay.io/airshipit/sstream-cache:2e003450cceb16b9bda71aa69a939a8466516582
477
-        maas_rack: docker.io/sthussey/maas-rack-controller:dev
478
-        maas_region: 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:617607e42690befae69c86ad9b21134fdd467cbb
477
+        maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb
478
+        maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
479 479
       promenade:
480 480
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
481 481
         image_repo_sync: docker.io/docker:17.07.0

+ 33
- 0
deployment_files/site/demo/software/charts/kubernetes/ingress/ingress.yaml View File

@@ -0,0 +1,33 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
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
25
+data:
26
+  values:
27
+    network:
28
+      ingress:
29
+        disable-ipv6: "true"
30
+      vip:
31
+        manage: true
32
+        addr: REPLACEME
33
+...

+ 30
- 0
deployment_files/site/demo/software/charts/ucp/drydock/maas.yaml View File

@@ -0,0 +1,30 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
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
25
+data:
26
+  values:
27
+    network:
28
+      maas_ingress:
29
+        addr: REPLACEME
30
+...

+ 1
- 0
manifests/common/deploy-airship.sh View File

@@ -190,6 +190,7 @@ data:
190 190
   hostip: ${HOSTIP}
191 191
   hostcidr: ${HOSTCIDR}
192 192
   interface: ${NODE_NET_IFACE}
193
+  maas-ingress: '192.169.1.5/32'
193 194
 EOF
194 195
 }
195 196
 

+ 1
- 1
tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json View File

@@ -67,7 +67,7 @@
67 67
     },
68 68
     "n0" : {
69 69
       "memory": 32768,
70
-      "vcpus": 12,
70
+      "vcpus": 16,
71 71
       "mac": "52:54:00:00:a4:31",
72 72
       "ip": "172.24.1.10",
73 73
       "io_profile": "fast",

+ 1
- 1
tools/multi_nodes_gate/airship_gate/stages/shipyard-deploy-site.sh View File

@@ -19,4 +19,4 @@ source "${GATE_UTILS}"
19 19
 
20 20
 cd "${TEMP_DIR}"
21 21
 
22
-shipyard_action_wait deploy_site 3600
22
+shipyard_action_wait deploy_site 7200

Loading…
Cancel
Save