Merge "Listen on an additional port for monitoring/diagnostic purposes"

defaults/main.yml

@@ -65,6 +65,8 @@ galera_gpg_keys: "{{ _galera_gpg_keys | default([]) }}"
 
 galera_monitoring_user: monitoring
 galera_monitoring_user_password: ""
+galera_monitoring_port: 3307
+galera_monitoring_max_connections: 10
 
 # WARNING: Set this to open xinetd rules for galera monitoring.
 # This is REQUIRED to run a working openstack-ansible deployment.

releasenotes/notes/extra-port-47d2ba4074ab6a62.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    Galera will now additionally listen on port 3307 by default, with this port
+    being used by the monitoring user to check cluster status. Ensure that any
+    firewall rules permit access to this port before upgrading. If an
+    'extra_port' was already configured, ensure that any conflicting
+    configuration is removed and set your preferred values via
+    'galera_monitoring_port' and 'galera_monitoring_max_connections'.

templates/clustercheck.j2

@@ -33,6 +33,8 @@ fi
 
 MYSQL_USERNAME="${1-{{ galera_monitoring_user }}}"
 MYSQL_PASSWORD="${2-{{ galera_monitoring_user_password }}}"
+MYSQL_HOST="{{ galera_server_bind_address }}"
+MYSQL_PORT="{{ galera_monitoring_port }}"
 AVAILABLE_WHEN_DONOR=${3:-0}
 ERR_FILE="${4:-/dev/null}"
 AVAILABLE_WHEN_READONLY=${5:-1}
@@ -52,6 +54,16 @@ else
     EXTRA_ARGS="$EXTRA_ARGS --password="
 fi
 
+if [[ -n "$MYSQL_PORT" ]]; then
+    # Port does not apply unless host is set
+    if [[ "$MYSQL_HOST" != "0.0.0.0" ]]; then
+        EXTRA_ARGS="$EXTRA_ARGS --host=${MYSQL_HOST}"
+    else
+        EXTRA_ARGS="$EXTRA_ARGS --host=127.0.0.1"
+    fi
+    EXTRA_ARGS="$EXTRA_ARGS --port=${MYSQL_PORT}"
+fi
+
 if [[ -r $DEFAULTS_EXTRA_FILE ]]; then
     MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
                     ${EXTRA_ARGS}"

templates/my.cnf.j2

@@ -49,6 +49,10 @@ expire-logs-days = 7
 log_slave_updates = 1
 log_bin_trust_function_creators = 1
 
+# MONITORING #
+extra_port = {{ galera_monitoring_port }}
+extra_max_connections = {{ galera_monitoring_max_connections }}
+
 # SAFETY #
 max-allowed-packet = 16M
 max-connect-errors = 1000000