starlingx/openstack-armada-app
Code Issues Proposed changes

Merge "Add mariadb database config override to support ipv6"

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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': {