From 1c467789c43827321e4319d50065fdbab1be35a2 Mon Sep 17 00:00:00 2001 From: David Sullivan Date: Wed, 20 Feb 2019 00:49:17 -0500 Subject: [PATCH] Add replica settings for mariadb ingress pod There was no mariadb replica override for the ingress pod. On AIO-SX this caused two pods to be scheduled. When anti-affinity was added to mariadb this broke application-apply on AIO-SX. The mariadb ingress pod replication will be set to the number of controllers. Change-Id: Icf3f1979720629904ca9ddcabf59e8ecfab709e5 Story: 2004520 Task: 29570 Signed-off-by: David Sullivan --- sysinv/sysinv/centos/build_srpm.data | 2 +- sysinv/sysinv/sysinv/sysinv/helm/mariadb.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data index be4508a9e5..97482ad914 100644 --- a/sysinv/sysinv/centos/build_srpm.data +++ b/sysinv/sysinv/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="sysinv" -TIS_PATCH_VER=303 +TIS_PATCH_VER=304 diff --git a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py index 8b093334db..6d56ca2c5f 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py @@ -32,7 +32,8 @@ class MariadbHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'server': self._num_server_replicas() + 'server': self._num_server_replicas(), + 'ingress': self._num_controllers() } }, 'images': self._get_images_overrides(),