summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrank, Daniel (dc6350) <dc6350@att.com>2019-01-10 17:42:59 -0600
committerRoman Gorshunov <roman.gorshunov@att.com>2019-03-08 15:43:45 +0100
commit53e02f9a9cc401280d481b02c472fd6ebea19331 (patch)
treeeac79e21c8e918402110ea9669015df0f822e447
parent539f777c637ffd1927659469072ec6235188b247 (diff)
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
Notes
Notes (review): Code-Review+1: Dan Crank <dan.no@att.com> Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+1: Alexander Hughes <Alexander.Hughes@pm.me> Code-Review+2: Drew Walters <drewwalters96@gmail.com> Workflow+1: Drew Walters <drewwalters96@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 11 Mar 2019 19:41:21 +0000 Reviewed-on: https://review.openstack.org/629950 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--.gitignore3
-rw-r--r--deployment_files/global/v1.0demo/software/config/endpoints.yaml2
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml14
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml15
4 files changed, 19 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index affbedc..b141fc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ doc/build/
5 5
6# OSX folder settings files 6# OSX folder settings files
7.DS_Store 7.DS_Store
8
9# Other
10.vagrant/
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index 7f4d878..b8a11df 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -165,6 +165,8 @@ data:
165 default: 80 165 default: 80
166 https: 166 https:
167 default: 443 167 default: 443
168 ingress_default_server:
169 default: 8383
168 error_pages: 170 error_pages:
169 default: 8080 171 default: 8080
170 podport: 8080 172 podport: 8080
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 9c1f1a3..4a50fa2 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: 617607e42690befae69c86ad9b21134fdd467cbb 210 reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
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:617607e42690befae69c86ad9b21134fdd467cbb 471 bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
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:617607e42690befae69c86ad9b21134fdd467cbb 473 db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
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:617607e42690befae69c86ad9b21134fdd467cbb 475 export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
476 maas_cache: quay.io/airshipit/sstream-cache:617607e42690befae69c86ad9b21134fdd467cbb 476 maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
477 maas_rack: quay.io/airshipit/maas-rack-controller:617607e42690befae69c86ad9b21134fdd467cbb 477 maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
478 maas_region: quay.io/airshipit/maas-region-controller:617607e42690befae69c86ad9b21134fdd467cbb 478 maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
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/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 637386a..24a3bcf 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -230,7 +230,7 @@ data:
230 type: git 230 type: git
231 location: https://git.openstack.org/openstack/airship-maas 231 location: https://git.openstack.org/openstack/airship-maas
232 subpath: charts/maas 232 subpath: charts/maas
233 reference: 2e003450cceb16b9bda71aa69a939a8466516582 233 reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
234 maas-htk: 234 maas-htk:
235 type: git 235 type: git
236 location: https://git.openstack.org/openstack/openstack-helm-infra 236 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -347,13 +347,12 @@ data:
347 ks_endpoints: docker.io/openstackhelm/heat:ocata 347 ks_endpoints: docker.io/openstackhelm/heat:ocata
348 maas: 348 maas:
349 db_init: docker.io/postgres:9.5 349 db_init: docker.io/postgres:9.5
350 db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 350 db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
351 maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 351 maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
352 maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 352 maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
353 bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 353 bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
354 export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 354 export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
355 # TODO: update to verified quay.io/airshipit/sstream-cache image 355 maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
356 maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864
357 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 356 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
358 keystone: 357 keystone:
359 keystone_bootstrap: docker.io/openstackhelm/heat:ocata 358 keystone_bootstrap: docker.io/openstackhelm/heat:ocata