clustercheck: move from xinetd to socat

Needed for CentOS Stream 9 and Rocky Linux 9.

Change-Id: I614e64e227304fdc50c08bd16d67ccf03586b92c
This commit is contained in:
Michal Nasiadka 2022-07-21 10:28:19 +02:00 committed by Radosław Piliszek
parent dcf5a8b65f
commit f940e6aa31
3 changed files with 2 additions and 40 deletions

View File

@ -81,18 +81,3 @@
- service.enabled | bool - service.enabled | bool
notify: notify:
- restart mariadb - restart mariadb
- name: Copying over xinetd clustercheck.conf
vars:
service_name: "mariadb-clustercheck"
service: "{{ mariadb_services[service_name] }}"
template:
src: "{{ role_path }}/templates/xinetd-clustercheck.j2"
dest: "{{ node_config_directory }}/{{ service_name }}/clustercheck"
mode: "0660"
become: true
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
notify:
- restart mariadb-clustercheck

View File

@ -1,13 +1,6 @@
{ {
"command": "/usr/sbin/xinetd -dontfork -filelog /var/log/kolla/mariadb/xinetd.log", "command": "socat {% if network_address_family == 'ipv6' %}-6{% endif %} -d -lf/var/log/kolla/mariadb/mariadb-clustercheck.log tcp-l:{{ mariadb_clustercheck_port }},fork,bind={{ api_interface_address }} EXEC:clustercheck",
"config_files": [ "config_files": [],
{
"source": "{{ container_config_directory }}/clustercheck",
"dest": "/etc/xinetd.d/clustercheck",
"owner": "root",
"perm": "0600"
}
],
"permissions": [ "permissions": [
{ {
"path": "/var/log/kolla/mariadb", "path": "/var/log/kolla/mariadb",

View File

@ -1,16 +0,0 @@
# default: on
# description: mysqlchk
service mysqlchk
{
disable = no
flags = REUSE
socket_type = stream
type = UNLISTED
port = {{ mariadb_clustercheck_port }}
wait = no
user = mysql
server = /usr/bin/clustercheck
log_type = FILE /var/log/kolla/mariadb/xinetd.log
log_on_failure = HOST ATTEMPT
per_source = UNLIMITED
}