diff options
Diffstat (limited to 'docker/keepalived')
| -rw-r--r-- | docker/keepalived/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/keepalived/check_alive.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/keepalived/extend_start.sh (renamed from docker/keepalived/start.sh) | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 9fbc7c49a..717439a6c 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -18,8 +18,9 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -COPY start.sh check_alive.sh / +COPY check_alive.sh / -CMD ["/start.sh"] +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh {{ include_footer }} diff --git a/docker/keepalived/check_alive.sh b/docker/keepalived/check_alive.sh index 8c2684f10..8c2684f10 100755..100644 --- a/docker/keepalived/check_alive.sh +++ b/docker/keepalived/check_alive.sh diff --git a/docker/keepalived/start.sh b/docker/keepalived/extend_start.sh index 1d96c3bfa..e1fe5d9d8 100755..100644 --- a/docker/keepalived/start.sh +++ b/docker/keepalived/extend_start.sh @@ -1,8 +1,4 @@ #!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh modprobe ip_vs @@ -10,5 +6,3 @@ modprobe ip_vs if [ -f /run/keepalived.pid ]; then rm /run/keepalived.pid fi - -exec $CMD |