From 6c986ad05b47cad718ef1e90b909bba047eccce4 Mon Sep 17 00:00:00 2001 From: alexey-mr Date: Wed, 14 Feb 2018 15:28:58 +0300 Subject: [PATCH] Dont use ip tool to detect IPs Cassandra changed base image to image that don't have iproute package installed. Change-Id: I26489ecf7699e02486d8885b5827ef4e893bd22b Partial-Bug: #1744439 --- containers/external/cassandra-init/contrail-entrypoint.sh | 2 +- containers/external/cassandra/contrail-entrypoint.sh | 2 +- containers/external/zookeeper-init/contrail-entrypoint.sh | 2 +- containers/external/zookeeper/contrail-entrypoint.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/external/cassandra-init/contrail-entrypoint.sh b/containers/external/cassandra-init/contrail-entrypoint.sh index 3afcab03c..c2b8524ba 100755 --- a/containers/external/cassandra-init/contrail-entrypoint.sh +++ b/containers/external/cassandra-init/contrail-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash -e IFS=',' read -ra srv_list <<< "$CASSANDRA_SEEDS" -local_ips=$(ip addr | awk '/inet/ {print($2)}') +local_ips=$(cat "/proc/net/fib_trie" | awk '/32 host/ { print f } {f=$2}') for srv in "${srv_list[@]}"; do if [[ "$local_ips" =~ "$srv" ]] ; then echo "INFO: found '$srv' in local IPs '$local_ips'" diff --git a/containers/external/cassandra/contrail-entrypoint.sh b/containers/external/cassandra/contrail-entrypoint.sh index 3afcab03c..c2b8524ba 100755 --- a/containers/external/cassandra/contrail-entrypoint.sh +++ b/containers/external/cassandra/contrail-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash -e IFS=',' read -ra srv_list <<< "$CASSANDRA_SEEDS" -local_ips=$(ip addr | awk '/inet/ {print($2)}') +local_ips=$(cat "/proc/net/fib_trie" | awk '/32 host/ { print f } {f=$2}') for srv in "${srv_list[@]}"; do if [[ "$local_ips" =~ "$srv" ]] ; then echo "INFO: found '$srv' in local IPs '$local_ips'" diff --git a/containers/external/zookeeper-init/contrail-entrypoint.sh b/containers/external/zookeeper-init/contrail-entrypoint.sh index f5b270485..479e5e9fe 100755 --- a/containers/external/zookeeper-init/contrail-entrypoint.sh +++ b/containers/external/zookeeper-init/contrail-entrypoint.sh @@ -6,7 +6,7 @@ ZOOKEEPER_PORTS=${ZOOKEEPER_PORTS:-'2888:3888'} ord=1 my_ord=0 IFS=',' read -ra srv_list <<< "$ZOOKEEPER_NODES" -local_ips=$(ip addr | awk '/inet/ {print($2)}') +local_ips=$(cat "/proc/net/fib_trie" | awk '/32 host/ { print f } {f=$2}') zoo_servers='' for srv in "${srv_list[@]}"; do if [[ -z "$ZOO_SERVERS" ]] ; then diff --git a/containers/external/zookeeper/contrail-entrypoint.sh b/containers/external/zookeeper/contrail-entrypoint.sh index 58f54998b..c68fe731f 100755 --- a/containers/external/zookeeper/contrail-entrypoint.sh +++ b/containers/external/zookeeper/contrail-entrypoint.sh @@ -6,7 +6,7 @@ ZOOKEEPER_PORTS=${ZOOKEEPER_PORTS:-'2888:3888'} ord=1 my_ord=0 IFS=',' read -ra srv_list <<< "$ZOOKEEPER_NODES" -local_ips=$(ip addr | awk '/inet/ {print($2)}') +local_ips=$(cat "/proc/net/fib_trie" | awk '/32 host/ { print f } {f=$2}') zoo_servers='' for srv in "${srv_list[@]}"; do if [[ -z "$ZOO_SERVERS" ]] ; then