From 5a9faeabb9a3d7e9408c9d44fe9cc9b401761758 Mon Sep 17 00:00:00 2001
From: stefan-work <51439505+stefan-work@users.noreply.github.com>
Date: Thu, 6 Oct 2022 10:50:49 +0200
Subject: [PATCH] [bitnami/cassandra] honor for broadcast-address in
 nodetool-output (#6994)

If CASSANDRA_BROADCAST_ADDRESS was set, nodetool reports that address only. Thus wait_for_nodetool_up() must grep for broadcast-ip else container startup hangs.

Signed-off-by: stefan-work <51439505+stefan-work@users.noreply.github.com>

Signed-off-by: stefan-work <51439505+stefan-work@users.noreply.github.com>
---
 .../4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
index 46c40017a731..7091b5e5a2d0 100644
--- a/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/4.0/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -839,7 +839,7 @@ wait_for_nodetool_up() {
         # https://community.datastax.com/questions/13764/java-version-for-cassandra-3113.html
         local -r check_cmd=("${CASSANDRA_BIN_DIR}/nodetool" "-Dcom.sun.jndi.rmiURLParsing=legacy")
         local -r check_args=("status" "--port" "$CASSANDRA_JMX_PORT_NUMBER")
-        local -r machine_ip="$(dns_lookup "$CASSANDRA_HOST" "v4")"
+        local -r machine_ip="$(dns_lookup "${CASSANDRA_BROADCAST_ADDRESS:-$CASSANDRA_HOST}" "v4")"
         local -r check_regex="UN\s*(${CASSANDRA_HOST}|${machine_ip}|127.0.0.1)"
 
         local output="/dev/null"
@@ -855,7 +855,7 @@ wait_for_nodetool_up() {
         # https://community.datastax.com/questions/13764/java-version-for-cassandra-3113.html
         local -r check_cmd=("${CASSANDRA_BIN_DIR}/nodetool" "-Dcom.sun.jndi.rmiURLParsing=legacy")
         local -r check_args=("status" "--port" "$CASSANDRA_JMX_PORT_NUMBER")
-        local -r machine_ip="$(dns_lookup "$CASSANDRA_HOST" "v4")"
+        local -r machine_ip="$(dns_lookup "${CASSANDRA_BROADCAST_ADDRESS:-$CASSANDRA_HOST}" "v4")"
         local -r check_regex="UN\s*"
         read -r -a host_list <<<"$(tr ',;' ' ' <<<"$CASSANDRA_NODES")"
         local -r expected_node_count="${#host_list[@]}"