diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2016-07-28 15:30:41 +0100 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2016-07-28 15:47:10 +0100 |
| commit | 3eb82949c2cd2f4c308f62e5a3a0ddede3179854 (patch) | |
| tree | aa4124d9531c0bbdcae3d17b7a13053b07389d7e | |
| parent | c8950340300738e52f21f3e537ae2630d7f39e13 (diff) | |
| download | kolla-3eb82949c2cd2f4c308f62e5a3a0ddede3179854.tar.gz kolla-3eb82949c2cd2f4c308f62e5a3a0ddede3179854.zip | |
Customizations for haproxy
This patchset contains customization of Dockerfile of haproxy
containers
Change-Id: I67790816766641ebc3138d6b3726f0bbd9c68038
Partially-implements: blueprint third-party-plugin-support
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 922f52054..e1539d3b7 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,19 +1,10 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% import "macros.j2" as macros with context %} -RUN yum -y install \ - haproxy \ - && yum clean all - -{% elif base_distro in ['debian', 'ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - haproxy \ - && apt-get clean - -{% endif %} +{% set haproxy_packages = ['haproxy'] %} +RUN {{ macros.install_packages(haproxy_packages | customizable("packages")) }} RUN usermod -a -G kolla haproxy \ && mkdir -p /var/lib/kolla/haproxy \ @@ -22,4 +13,6 @@ RUN usermod -a -G kolla haproxy \ COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config +{% block haproxy_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |