From 3fe9b7821628be06d64b150f91b2a063e13f7820 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sat, 22 Aug 2015 14:23:44 +0000
Subject: [PATCH] Ubuntu - Keepalived
Change-Id: I7e96da95eb8720e3cad0776743cab3d523674f0f
Partially-Implements: blueprint install-from-ubuntu
---
docker/common/keepalived/config-external.sh | 1 -
docker_templates/keepalived/Dockerfile.j2 | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker/common/keepalived/config-external.sh b/docker/common/keepalived/config-external.sh
index cb69e1c8f6..d7ff97826e 100755
--- a/docker/common/keepalived/config-external.sh
+++ b/docker/common/keepalived/config-external.sh
@@ -4,7 +4,6 @@ TARGET="/etc/keepalived/keepalived.conf"
OWNER="root"
if [[ -f "$SOURCE" ]]; then
- rm $TARGET
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
diff --git a/docker_templates/keepalived/Dockerfile.j2 b/docker_templates/keepalived/Dockerfile.j2
index 4943ae0627..3ad2a667ce 100644
--- a/docker_templates/keepalived/Dockerfile.j2
+++ b/docker_templates/keepalived/Dockerfile.j2
@@ -11,8 +11,10 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
+RUN apt-get install -y --no-install-recommends \
+ keepalived \
+ socat \
+ && apt-get clean
{% endif %}