diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-22 14:23:44 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-22 14:50:51 +0000 |
| commit | 3fe9b7821628be06d64b150f91b2a063e13f7820 (patch) | |
| tree | 372fd7d4ec3f7ed7bf835efedd8e1655307a0fde | |
| parent | f70e8d4598c58f8b2904542f7e0d87c693f70761 (diff) | |
| download | kolla-3fe9b7821628be06d64b150f91b2a063e13f7820.tar.gz kolla-3fe9b7821628be06d64b150f91b2a063e13f7820.zip | |
Ubuntu - Keepalived
Change-Id: I7e96da95eb8720e3cad0776743cab3d523674f0f
Partially-Implements: blueprint install-from-ubuntu
| -rwxr-xr-x | docker/common/keepalived/config-external.sh | 1 | ||||
| -rw-r--r-- | 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 cb69e1c8f..d7ff97826 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 4943ae062..3ad2a667c 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 %} |