This commit is contained in:
Bertrand Gouny 2017-04-02 19:53:16 +02:00
parent 6910751d38
commit 85b003c297
4 changed files with 6 additions and 5 deletions

View File

@ -34,6 +34,7 @@ RUN apk --no-cache add \
&& rm -f keepalived.tar.gz \ && rm -f keepalived.tar.gz \
&& rm -rf /container/keepalived-sources \ && rm -rf /container/keepalived-sources \
&& apk --no-cache del \ && apk --no-cache del \
curl \
gcc \ gcc \
ipset-dev \ ipset-dev \
iptables-dev \ iptables-dev \

View File

@ -7,9 +7,9 @@ log-helper level eq trace && set -x
# try to delete virtual ips from interface # try to delete virtual ips from interface
for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS) for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
do do
IP=$(echo ${!vip} | awk '{print $1}'} IP=$(echo ${!vip} | awk '{print $1}')
IP_INFO=$(ip addr list | grep ${IP}) || continue IP_INFO=$(ip addr list | grep ${IP}) || continue
IP_V6=$(echo "${IP_INFO}" | grep "inet6") IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true
# ipv4 # ipv4
if [ -z "${IP_V6}" ]; then if [ -z "${IP_V6}" ]; then

View File

@ -8,7 +8,7 @@ echo -n "Waiting config file /usr/local/etc/keepalived/keepalived.conf"
while [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ] while [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ]
do do
echo -n "." echo -n "."
sleep sleep 0.1
done done
echo "ok" echo "ok"

View File

@ -43,9 +43,9 @@ fi
# try to delete virtual ips from interface # try to delete virtual ips from interface
for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS) for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
do do
IP=$(echo ${!vip} | awk '{print $1}'} IP=$(echo ${!vip} | awk '{print $1}')
IP_INFO=$(ip addr list | grep ${IP}) || continue IP_INFO=$(ip addr list | grep ${IP}) || continue
IP_V6=$(echo "${IP_INFO}" | grep "inet6") IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true
# ipv4 # ipv4
if [ -z "${IP_V6}" ]; then if [ -z "${IP_V6}" ]; then