starlingx
/
openstack-armada-app
Code Issues Proposed changes

Merge "Add mariadb database config override to support ipv6"

This commit is contained in:
Zuul 2020-06-28 04:44:37 +00:00 committed by Gerrit Code Review
parent 0cdedf8e44 d959e6b7fe
commit e181787872
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -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
Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.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: chartmuseum
@ -44,6 +45,7 @@ Openstack Helm Infra charts
%patch08 -p1
%patch09 -p1
%patch10 -p1
%patch11 -p1
%build
# Host a server for the charts

26
openstack-helm-infra/files/0011-Add-mariadb-database-config-override-to-support-ipv6.patch Normal file
View File

@ -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

19
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py
View File

@ -28,12 +28,7 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
'ingress': self._num_controllers()
}
},
'endpoints': self._get_endpoints_overrides(),
'conf': {
'database': {
'config_override': self._get_database_config_override()
}
}
'endpoints': self._get_endpoints_overrides()
}
}
@ -45,18 +40,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
else:
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):
return {
'oslo_db': {