Add mariadb database config override to support ipv6
Add "config_override" in conficonfigmap-etc.yaml for ipv6. It could not be dynamically override in helm/mariadb.py. Upstream patch: https://review.opendev.org/735277 Story: 2007474 Task: 39879 Change-Id: I9342e16fd98d0099e7e7043b46f00b2374203a51 Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
This commit is contained in:
parent
eb41746b8d
commit
d959e6b7fe
|
@ -25,6 +25,7 @@ Patch07: 0007-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch
|
||||||
Patch08: 0008-Fix-rabbitmq-could-not-bind-port-to-ipv6-address-iss.patch
|
Patch08: 0008-Fix-rabbitmq-could-not-bind-port-to-ipv6-address-iss.patch
|
||||||
Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.patch
|
Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.patch
|
||||||
Patch10: 0010-Mariadb-use-utf8_general_ci-collation-as-default.patch
|
Patch10: 0010-Mariadb-use-utf8_general_ci-collation-as-default.patch
|
||||||
|
Patch11: 0011-Add-mariadb-database-config-override-to-support-ipv6.patch
|
||||||
|
|
||||||
BuildRequires: helm
|
BuildRequires: helm
|
||||||
BuildRequires: chartmuseum
|
BuildRequires: chartmuseum
|
||||||
|
@ -44,6 +45,7 @@ Openstack Helm Infra charts
|
||||||
%patch08 -p1
|
%patch08 -p1
|
||||||
%patch09 -p1
|
%patch09 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Host a server for the charts
|
# Host a server for the charts
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
From 76438c37cc1c5b04ef4326b0810dbff281a8ed48 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Liu, ZhipengS" <zhipengs.liu@intel.com>
|
||||||
|
Date: Sun, 14 Jun 2020 12:43:44 +0000
|
||||||
|
Subject: [PATCH] Add mariadb database config override to support ipv6
|
||||||
|
|
||||||
|
Signed-off-by: Liu, ZhipengS <zhipengs.liu@intel.com>
|
||||||
|
---
|
||||||
|
mariadb/values.yaml | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
|
||||||
|
index 444bba3..335195c 100644
|
||||||
|
--- a/mariadb/values.yaml
|
||||||
|
+++ b/mariadb/values.yaml
|
||||||
|
@@ -327,7 +327,7 @@ conf:
|
||||||
|
log_queries_not_using_indexes=on
|
||||||
|
|
||||||
|
# Networking
|
||||||
|
- bind_address=0.0.0.0
|
||||||
|
+ bind_address=::
|
||||||
|
port={{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
|
|
||||||
|
# When a client connects, the server will perform hostname resolution,
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
|
@ -28,12 +28,7 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
|
||||||
'ingress': self._num_controllers()
|
'ingress': self._num_controllers()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'endpoints': self._get_endpoints_overrides(),
|
'endpoints': self._get_endpoints_overrides()
|
||||||
'conf': {
|
|
||||||
'database': {
|
|
||||||
'config_override': self._get_database_config_override()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,18 +40,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
|
||||||
else:
|
else:
|
||||||
return overrides
|
return overrides
|
||||||
|
|
||||||
def _get_database_config_override(self):
|
|
||||||
listen_host = "0.0.0.0"
|
|
||||||
if self._is_ipv6_cluster_service():
|
|
||||||
listen_host = "::"
|
|
||||||
return "[mysqld]\n" \
|
|
||||||
"bind_address=::\n" \
|
|
||||||
"wsrep_provider_options=\"evs.suspect_timeout=PT30S; " \
|
|
||||||
"gmcast.peer_timeout=PT15S; " \
|
|
||||||
"gmcast.listen_addr=tcp://%s:{{ tuple \"oslo_db\" " \
|
|
||||||
"\"direct\" \"wsrep\" . | " \
|
|
||||||
"include \"helm-toolkit.endpoints.endpoint_port_lookup\" }}\"" % listen_host
|
|
||||||
|
|
||||||
def _get_endpoints_overrides(self):
|
def _get_endpoints_overrides(self):
|
||||||
return {
|
return {
|
||||||
'oslo_db': {
|
'oslo_db': {
|
||||||
|
|
Loading…
Reference in New Issue