airship/airship-in-a-bottle
Code Issues Proposed changes

Override default maas-ingress port, update maas

Browse Source 
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
This commit is contained in:
Crank, Daniel (dc6350) 2019-01-10 17:42:59 -06:00 committed by Roman Gorshunov
parent 539f777c63
commit 53e02f9a9c
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

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

@ -165,6 +165,8 @@ data:
default: 80
https:
default: 443
ingress_default_server:
default: 8383
error_pages:
default: 8080
podport: 8080

14
deployment_files/global/v1.0demo/software/config/versions.yaml
View File

@ -207,7 +207,7 @@ data:
type: git
maas:
location: https://git.openstack.org/openstack/airship-maas
reference: 617607e42690befae69c86ad9b21134fdd467cbb
reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
subpath: charts/maas
type: git
maas-htk:
@ -468,14 +468,14 @@ data:
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
maas:
bootstrap: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
db_init: docker.io/postgres:9.5
db_sync: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
export_api_key: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
maas_cache: quay.io/airshipit/sstream-cache:617607e42690befae69c86ad9b21134fdd467cbb
maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb
maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
promenade:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
image_repo_sync: docker.io/docker:17.07.0

15
deployment_files/global/v1.0dev/software/config/versions.yaml
View File

@ -230,7 +230,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-maas
subpath: charts/maas
reference: 2e003450cceb16b9bda71aa69a939a8466516582
reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -347,13 +347,12 @@ data:
ks_endpoints: docker.io/openstackhelm/heat:ocata
maas:
db_init: docker.io/postgres:9.5
db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
# TODO: update to verified quay.io/airshipit/sstream-cache image
maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864
db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
keystone:
keystone_bootstrap: docker.io/openstackhelm/heat:ocata