diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-23 06:03:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-23 06:03:15 +0000 |
| commit | b6c0be9a7055855328d91e01d144b29a92c9016f (patch) | |
| tree | 836745c8ef230b111371fddd4bd241f6818bc620 | |
| parent | b9f0cdbe3864c9c4b2142e695d3a205bd4098e0c (diff) | |
| parent | 3fe9b7821628be06d64b150f91b2a063e13f7820 (diff) | |
| download | kolla-b6c0be9a7055855328d91e01d144b29a92c9016f.tar.gz kolla-b6c0be9a7055855328d91e01d144b29a92c9016f.zip | |
Merge "Ubuntu - Keepalived"
| -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 %} |