2bd74e1baf
Upgrade openstack-helm-infra to below version. commit 34d54f2812b7d54431d548cff08fe8da7f838124 Date: Sat Apr 11 15:24:54 2020 +0200 Cleanup py27 support and docs Below 3 patches are removed as they are already merged. Allow-multiple-containers-per-daemonset-pod.patch Add-TLS-support-for-Gnocchi-public-endpoint.patch Update ingress chart for Helm v3 Story: 2007474 Task: 39394 Change-Id: Icf624c8a0a6c74c8cfdb75ad45162e4a7aa5e404 Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
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
|
|
|