diff --git a/docker/common/keepalived/check_alive.sh b/docker/common/keepalived/check_alive.sh deleted file mode 100755 index 8c2684f10b3434605562f0b1ca752533d32a374f..0000000000000000000000000000000000000000 --- a/docker/common/keepalived/check_alive.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# This will return 0 when it successfully talks to the haproxy daemon via the socket -# Failures return 1 - -echo "show info" | socat unix-connect:/run/haproxy.sock stdio diff --git a/docker/common/keepalived/config-external.sh b/docker/common/keepalived/config-external.sh deleted file mode 100755 index d7ff97826ec0bf7eef2ebf658d641ecd11c4d733..0000000000000000000000000000000000000000 --- a/docker/common/keepalived/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/keepalived/keepalived.conf" -TARGET="/etc/keepalived/keepalived.conf" -OWNER="root" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/keepalived/start.sh b/docker/common/keepalived/start.sh deleted file mode 100755 index a122526e481fe8fcfea30f7fdfc517ca7f1bdb9a..0000000000000000000000000000000000000000 --- a/docker/common/keepalived/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/sbin/keepalived" -ARGS="-nld -p /run/keepalived.pid" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -modprobe ip_vs - -# Workaround for bug #1485079 -if [ -f /run/keepalived.pid ]; then - rm /run/keepalived.pid -fi - -exec $CMD $ARGS diff --git a/docker_templates/keepalived/check_alive.sh b/docker_templates/keepalived/check_alive.sh deleted file mode 120000 index 3390a28d77c9e8c8f95057ee5b19143763de0297..0000000000000000000000000000000000000000 --- a/docker_templates/keepalived/check_alive.sh +++ /dev/null @@ -1 +0,0 @@ -../../docker/common/keepalived/check_alive.sh \ No newline at end of file diff --git a/docker_templates/keepalived/check_alive.sh b/docker_templates/keepalived/check_alive.sh new file mode 100755 index 0000000000000000000000000000000000000000..8c2684f10b3434605562f0b1ca752533d32a374f --- /dev/null +++ b/docker_templates/keepalived/check_alive.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# This will return 0 when it successfully talks to the haproxy daemon via the socket +# Failures return 1 + +echo "show info" | socat unix-connect:/run/haproxy.sock stdio diff --git a/docker_templates/keepalived/config-external.sh b/docker_templates/keepalived/config-external.sh deleted file mode 120000 index 6b3a07c296d252e0d3e4676acce23a9693683121..0000000000000000000000000000000000000000 --- a/docker_templates/keepalived/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../docker/common/keepalived/config-external.sh \ No newline at end of file diff --git a/docker_templates/keepalived/config-external.sh b/docker_templates/keepalived/config-external.sh new file mode 100755 index 0000000000000000000000000000000000000000..d7ff97826ec0bf7eef2ebf658d641ecd11c4d733 --- /dev/null +++ b/docker_templates/keepalived/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/keepalived/keepalived.conf" +TARGET="/etc/keepalived/keepalived.conf" +OWNER="root" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/keepalived/start.sh b/docker_templates/keepalived/start.sh deleted file mode 120000 index 65aea95d0f4e65df94569fe1a9996b61c5f3f038..0000000000000000000000000000000000000000 --- a/docker_templates/keepalived/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../docker/common/keepalived/start.sh \ No newline at end of file diff --git a/docker_templates/keepalived/start.sh b/docker_templates/keepalived/start.sh new file mode 100755 index 0000000000000000000000000000000000000000..a122526e481fe8fcfea30f7fdfc517ca7f1bdb9a --- /dev/null +++ b/docker_templates/keepalived/start.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -o errexit + +CMD="/usr/sbin/keepalived" +ARGS="-nld -p /run/keepalived.pid" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +modprobe ip_vs + +# Workaround for bug #1485079 +if [ -f /run/keepalived.pid ]; then + rm /run/keepalived.pid +fi + +exec $CMD $ARGS