From 0cc58150d7e13133705e3708fa1a62c2f686c833 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Tue, 19 Mar 2019 18:51:21 +0000 Subject: [PATCH] Fix AIAB gate Heat test & MariaDB failures 1. Downgrade ingress controller for MariaDB Current MariaDB charts [1] do not support the latest nginx ingress controller, e.g. Vts related parameters were removed in June [2] from the controller. An updated version matches the version that is configured in mariadb chart by default. [1] https://github.com/openstack/openstack-helm-infra/blob /6a1a46a8ce390fd5d5fa5736796f5747874ce1fb/mariadb/files/nginx.tmpl [2] https://github.com/kubernetes/ingress-nginx/commit /63b38e1c21e6486607ac4485161f88663d6ef5a9 2. Specify rally test version for heat, default version is not compatible with test scripts in htk. Change-Id: I58ae26dd7de4bada98f940a4d2030f38e54ba4a0 --- .../software/charts/osh/component-infrastructure/heat.yaml | 4 ++++ .../global/v1.0demo/software/config/versions.yaml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml index 9f2a01f9..8ba03fe4 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml @@ -30,6 +30,10 @@ data: timeout: 1800 labels: release_group: airship-heat + test: + enabled: true + options: + cleanup: false install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 4a50fa26..177a4c19 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -611,6 +611,7 @@ data: dep_check: *dep_check rabbit_init: *rabbitmq heat: + test: *rally_test bootstrap: *heat db_init: *heat heat_db_sync: *heat @@ -654,7 +655,7 @@ data: dep_check: *dep_check mariadb: mariadb: *mariadb_db - ingress: *ingress_controller + ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 error_pages: *ingress_error_pages prometheus_create_mysql_user: *mariadb_db prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0