openstack/kolla-ansible
Code Issues Proposed changes

Merge "Ubuntu - Haproxy"

Browse Source
This commit is contained in:
Jenkins 2015-08-25 05:03:24 +00:00 committed by Gerrit Code Review
commit aa7b6f4873
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker_templates/haproxy/Dockerfile.j2
View File

@ -7,10 +7,15 @@ RUN yum -y install \
haproxy \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro == 'ubuntu' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
RUN apt-get install -y --no-install-recommends -t trusty-backports haproxy \
&& apt-get clean
{% elif base_distro == 'debian' %}
RUN apt-get install -y --no-install-recommends haproxy \
&& apt-get clean
{% endif %}