diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-05 05:54:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-05 05:54:30 +0000 |
| commit | 67e77035b8c2e88b6a8a7a00a449b036ff9bbf6b (patch) | |
| tree | a8036951cf7ddd58f3d74e504cdaef7679333a66 | |
| parent | 34a469229933354e554a979c4d8e7df06188ab32 (diff) | |
| parent | c5ce1aa2f48a31d7410c51d1d1faa46f8c98b192 (diff) | |
| download | kolla-67e77035b8c2e88b6a8a7a00a449b036ff9bbf6b.tar.gz kolla-67e77035b8c2e88b6a8a7a00a449b036ff9bbf6b.zip | |
Merge "Customizations for keepalived"
| -rw-r--r-- | docker/keepalived/Dockerfile.j2 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 0f938440d..a776e4f6d 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,26 +1,26 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - hostname \ - keepalived \ - socat \ - && yum clean all - + {% set keepalived_packages = [ + 'hostname', + 'keepalived', + 'socat' + ] %} {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get -y install --no-install-recommends \ - keepalived \ - socat \ - && apt-get clean - + {% set keepalived_packages = [ + 'keepalived', + 'socat' + ] %} {% endif %} +RUN {{ macros.install_packages(keepalived_packages | customizable("packages")) }} COPY check_alive.sh / COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh +{% block keepalived_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |