From e89c156c633a9cafd4529664bc4a5c281cb025ec Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Tue, 23 Feb 2016 00:42:48 +0000
Subject: [PATCH] cloud-archive contains newer version of haproxy

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

TrivialFix

Change-Id: Ib306e54b455430fdc9be896e8d14784ef1feb011
---
 docker/haproxy/Dockerfile.j2 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index bc040d1781..e4ee3664df 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -6,12 +6,7 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install haproxy \
     && yum clean all
 
-{% elif base_distro == 'ubuntu' %}
-
-RUN apt-get install -y --no-install-recommends -t trusty-backports haproxy \
-    && apt-get clean
-
-{% elif base_distro == 'debian' %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
 
 RUN apt-get install -y --no-install-recommends haproxy \
     && apt-get clean