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
This commit is contained in:
parent
539f777c63
commit
53e02f9a9c
|
@ -5,3 +5,6 @@ doc/build/
|
||||||
|
|
||||||
# OSX folder settings files
|
# OSX folder settings files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
# Other
|
||||||
|
.vagrant/
|
||||||
|
|
|
@ -165,6 +165,8 @@ data:
|
||||||
default: 80
|
default: 80
|
||||||
https:
|
https:
|
||||||
default: 443
|
default: 443
|
||||||
|
ingress_default_server:
|
||||||
|
default: 8383
|
||||||
error_pages:
|
error_pages:
|
||||||
default: 8080
|
default: 8080
|
||||||
podport: 8080
|
podport: 8080
|
||||||
|
|
|
@ -207,7 +207,7 @@ data:
|
||||||
type: git
|
type: git
|
||||||
maas:
|
maas:
|
||||||
location: https://git.openstack.org/openstack/airship-maas
|
location: https://git.openstack.org/openstack/airship-maas
|
||||||
reference: 617607e42690befae69c86ad9b21134fdd467cbb
|
reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
subpath: charts/maas
|
subpath: charts/maas
|
||||||
type: git
|
type: git
|
||||||
maas-htk:
|
maas-htk:
|
||||||
|
@ -468,14 +468,14 @@ data:
|
||||||
ks_service: docker.io/openstackhelm/heat:ocata
|
ks_service: docker.io/openstackhelm/heat:ocata
|
||||||
ks_user: docker.io/openstackhelm/heat:ocata
|
ks_user: docker.io/openstackhelm/heat:ocata
|
||||||
maas:
|
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_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
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
export_api_key: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_cache: quay.io/airshipit/sstream-cache:617607e42690befae69c86ad9b21134fdd467cbb
|
maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb
|
maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
promenade:
|
promenade:
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
image_repo_sync: docker.io/docker:17.07.0
|
image_repo_sync: docker.io/docker:17.07.0
|
||||||
|
|
|
@ -230,7 +230,7 @@ data:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/airship-maas
|
location: https://git.openstack.org/openstack/airship-maas
|
||||||
subpath: charts/maas
|
subpath: charts/maas
|
||||||
reference: 2e003450cceb16b9bda71aa69a939a8466516582
|
reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas-htk:
|
maas-htk:
|
||||||
type: git
|
type: git
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
|
@ -347,13 +347,12 @@ data:
|
||||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||||
maas:
|
maas:
|
||||||
db_init: docker.io/postgres:9.5
|
db_init: docker.io/postgres:9.5
|
||||||
db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
|
db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
|
maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
|
maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
|
bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
|
export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
# TODO: update to verified quay.io/airshipit/sstream-cache image
|
maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
||||||
maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864
|
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
keystone:
|
keystone:
|
||||||
keystone_bootstrap: docker.io/openstackhelm/heat:ocata
|
keystone_bootstrap: docker.io/openstackhelm/heat:ocata
|
||||||
|
|
Loading…
Reference in New Issue