aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 18:13:04 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commit2cbccd7dc188c30ca81b1e96330df36425b0cf17 (patch)
treee2427a2ff03abbc2ebf1be750e233454fd15bb2e /docker
parentbd32c7a2dc0b10b0be209f969b2f8b4ad87c55f7 (diff)
downloadkolla-2cbccd7dc188c30ca81b1e96330df36425b0cf17.tar.gz
kolla-2cbccd7dc188c30ca81b1e96330df36425b0cf17.zip
Move scripts for keepalive to docker_templates
Change-Id: I67ebbfa5a89b5d5c6ab2db78ded10151b95f7337 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/common/keepalived/check_alive.sh6
-rwxr-xr-xdocker/common/keepalived/config-external.sh10
-rwxr-xr-xdocker/common/keepalived/start.sh20
3 files changed, 0 insertions, 36 deletions
diff --git a/docker/common/keepalived/check_alive.sh b/docker/common/keepalived/check_alive.sh
deleted file mode 100755
index 8c2684f10..000000000
--- 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 d7ff97826..000000000
--- 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 a122526e4..000000000
--- 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