From 2cbccd7dc188c30ca81b1e96330df36425b0cf17 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 18:13:04 -0700
Subject: [PATCH] Move scripts for keepalive to docker_templates
Change-Id: I67ebbfa5a89b5d5c6ab2db78ded10151b95f7337
Partially-Implements: blueprint remove-docker-dir
---
docker/common/keepalived/check_alive.sh | 6 ------
docker/common/keepalived/config-external.sh | 10 ---------
docker/common/keepalived/start.sh | 20 ------------------
docker_templates/keepalived/check_alive.sh | 7 ++++++-
.../keepalived/config-external.sh | 11 +++++++++-
docker_templates/keepalived/start.sh | 21 ++++++++++++++++++-
6 files changed, 36 insertions(+), 39 deletions(-)
delete mode 100755 docker/common/keepalived/check_alive.sh
delete mode 100755 docker/common/keepalived/config-external.sh
delete mode 100755 docker/common/keepalived/start.sh
mode change 120000 => 100755 docker_templates/keepalived/check_alive.sh
mode change 120000 => 100755 docker_templates/keepalived/config-external.sh
mode change 120000 => 100755 docker_templates/keepalived/start.sh
diff --git a/docker/common/keepalived/check_alive.sh b/docker/common/keepalived/check_alive.sh
deleted file mode 100755
index 8c2684f10b..0000000000
--- 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 d7ff97826e..0000000000
--- 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 a122526e48..0000000000
--- 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 3390a28d77..0000000000
--- 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 0000000000..8c2684f10b
--- /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 6b3a07c296..0000000000
--- 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 0000000000..d7ff97826e
--- /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 65aea95d0f..0000000000
--- 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 0000000000..a122526e48
--- /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
--
GitLab