Browse Source

Override default maas-ingress port, update maas

The default error pages port for the MAAS ingress controller
is conflicting with the cluster ingress controller.

Change to a non-default port and update maas image and chart
versions.

Change-Id: Ia0f90c5ae44e6c50efdb3aacd0266cca7f7eb64a
changes/50/629950/3
Crank, Daniel (dc6350) 4 months ago
parent
commit
53e02f9a9c

+ 3
- 0
.gitignore View File

@@ -5,3 +5,6 @@ doc/build/
5 5
 
6 6
 # OSX folder settings files
7 7
 .DS_Store
8
+
9
+# Other
10
+.vagrant/

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

@@ -165,6 +165,8 @@ data:
165 165
           default: 80
166 166
         https:
167 167
           default: 443
168
+        ingress_default_server:
169
+          default: 8383
168 170
         error_pages:
169 171
           default: 8080
170 172
           podport: 8080

+ 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: 617607e42690befae69c86ad9b21134fdd467cbb
210
+        reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
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:617607e42690befae69c86ad9b21134fdd467cbb
471
+        bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
472 472
         db_init: docker.io/postgres:9.5
473
-        db_sync: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
473
+        db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
474 474
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
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
475
+        export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
476
+        maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
477
+        maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
478
+        maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
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

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

@@ -230,7 +230,7 @@ data:
230 230
         type: git
231 231
         location: https://git.openstack.org/openstack/airship-maas
232 232
         subpath: charts/maas
233
-        reference: 2e003450cceb16b9bda71aa69a939a8466516582
233
+        reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
234 234
       maas-htk:
235 235
         type: git
236 236
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -347,13 +347,12 @@ data:
347 347
         ks_endpoints: docker.io/openstackhelm/heat:ocata
348 348
       maas:
349 349
         db_init: docker.io/postgres:9.5
350
-        db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
351
-        maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
352
-        maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
353
-        bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
354
-        export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
355
-        # TODO: update to verified quay.io/airshipit/sstream-cache image
356
-        maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864
350
+        db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
351
+        maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
352
+        maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
353
+        bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
354
+        export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
355
+        maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
357 356
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
358 357
       keystone:
359 358
         keystone_bootstrap: docker.io/openstackhelm/heat:ocata

Loading…
Cancel
Save