openstack/kolla-ansible
Code Issues Proposed changes

cloud-archive contains newer version of haproxy

Browse Source 
cloud-archive contains at least version 1.5 of haproxy and that is
new enough for ssl offloading.

TrivialFix

Change-Id: Ib306e54b455430fdc9be896e8d14784ef1feb011
This commit is contained in:
SamYaple 2016-02-23 00:42:48 +00:00
parent 9e2c11cb3e
commit e89c156c63
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/haproxy/Dockerfile.j2
View File

@ -6,12 +6,7 @@ MAINTAINER {{ maintainer }}
RUN yum -y install haproxy \ RUN yum -y install haproxy \
&& yum clean all && yum clean all
{% elif base_distro == 'ubuntu' %} {% elif base_distro in ['debian', 'ubuntu'] %}
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 \ RUN apt-get install -y --no-install-recommends haproxy \
&& apt-get clean && apt-get clean