openstack
/
tripleo-common
Code Issues Proposed changes

MariaDB: Remove logic for xinetd 

... because xinetd is no longer available in CentOS Stream 9 and
the logic is not used.

Change-Id: I8a350ab5ac9b72465b22c19cfeb0e7b544fd3b39
This commit is contained in:
Takashi Kajinami 2022-11-21 15:23:39 +09:00
parent 0cb5354521
commit 003e514561
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
healthcheck/mariadb
View File

@ -1,16 +1,10 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
GALERA_XINETD_CONF='/etc/xinetd.d/galera-monitor'
SOCAT_CONF=/etc/sysconfig/clustercheck
IS_MYSQL=
# If the mariadb container is running xinetd with galera-monitor or socat then
# it is a clustercheck container, otherwise a mysql/mariadb one
if pgrep xinetd &> /dev/null && grep -qe 'disable.*no' $GALERA_XINETD_CONF; then
PORT=$(awk '/port.*=/{ print $3 }' $GALERA_XINETD_CONF)
ADDR=$(awk '/bind.*=/{ print $3 }' $GALERA_XINETD_CONF)
elif pgrep -a socat 2> /dev/null | grep -w clustercheck; then
if pgrep -a socat 2> /dev/null | grep -w clustercheck; then
TRIPLEO_SOCAT_BIND=$(sed -nE "s/^TRIPLEO_SOCAT_BIND='?([^']*)'?$/\1/p" $SOCAT_CONF)
PORT=$(echo $TRIPLEO_SOCAT_BIND | sed -n -E 's/.*listen:([0-9]*),.*/\1/p')
ADDR=$(echo $TRIPLEO_SOCAT_BIND | sed -n -E 's/.*bind="?([^",]*)"?,?.*/\1/p')