From 4aeacc3e171b6566586a7e93ed16f87d5ca375ca Mon Sep 17 00:00:00 2001
From: Zhipeng Liu <zhipengs.liu@intel.com>
Date: Thu, 27 Feb 2020 01:28:58 +0800
Subject: [PATCH] Fix ipv6 address issue causing mariadb ingress not ready

In nginx.tmpl, it not enclose ipv6 addresses in square brackets
resulting in them being unable to be parsed, which cause mariadb
ingress pod could not be ready.

Tested it on both ipv4 and ipv6 simplex setup, it fixes mariadb
ingress not ready issue.

Upstream patch submitted as below
https://review.opendev.org/#/c/710413/

Partial-Bug: 1859641

Change-Id: Ic7726eea671bbedf4f37fbe31965bc8fffd2e8cd
Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
---
 .../centos/openstack-helm-infra.spec          |  2 ++
 ...ue-causing-mariadb-ingress-not-ready.patch | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 openstack-helm-infra/files/0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch

diff --git a/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack-helm-infra/centos/openstack-helm-infra.spec
index 7c277634..17f7a72f 100644
--- a/openstack-helm-infra/centos/openstack-helm-infra.spec
+++ b/openstack-helm-infra/centos/openstack-helm-infra.spec
@@ -23,6 +23,7 @@ Patch05: 0005-Add-TLS-support-for-Gnocchi-public-endpoint.patch
 Patch06: 0006-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
 Patch07: 0007-Add-io_thread_pool-for-rabbitmq.patch
 Patch08: 0008-Enable-override-of-rabbitmq-probe-parameters.patch
+Patch09: 0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch
 
 BuildRequires: helm
 
@@ -39,6 +40,7 @@ Openstack Helm Infra charts
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
 # initialize helm and build the toolkit
diff --git a/openstack-helm-infra/files/0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch b/openstack-helm-infra/files/0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch
new file mode 100644
index 00000000..63d368c6
--- /dev/null
+++ b/openstack-helm-infra/files/0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch
@@ -0,0 +1,32 @@
+From 6fccedb6743ea240d52fbe52f3129e7dc5ee29db Mon Sep 17 00:00:00 2001
+From: Zhipeng Liu <zhipengs.liu@intel.com>
+Date: Thu, 27 Feb 2020 01:01:57 +0800
+Subject: [PATCH] Fix ipv6 address issue causing mariadb ingress not ready
+
+Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
+---
+ mariadb/files/nginx.tmpl | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl
+index 5ec3d0d..356fad5 100644
+--- a/mariadb/files/nginx.tmpl
++++ b/mariadb/files/nginx.tmpl
+@@ -473,11 +473,11 @@ stream {
+     {{ range $j, $endpoint := $tcpServer.Endpoints }}
+     {{ if eq $j 0 }}
+         # NOTE(portdirect): see https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-health-check/#passive-tcp-health-checks to tune passive healthchecks
+-        server                  {{ $endpoint.Address }}:{{ $endpoint.Port }};
++        server                  {{ formatIP $endpoint.Address }}:{{ $endpoint.Port }};
+     {{ else if eq $j 1 }}
+-        server                  {{ $endpoint.Address }}:{{ $endpoint.Port }} backup;
++        server                  {{ formatIP $endpoint.Address }}:{{ $endpoint.Port }} backup;
+     {{ else }}
+-        server                  {{ $endpoint.Address }}:{{ $endpoint.Port }} down;
++        server                  {{ formatIP $endpoint.Address }}:{{ $endpoint.Port }} down;
+     {{ end }}
+     {{ end }}
+     }
+-- 
+2.7.4
+