aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-15 20:16:35 +0000
committerGerrit Code Review <review@openstack.org>2017-03-15 20:16:35 +0000
commit1d9b41f3d8ef05ea1b9516a6e853eb7f84c67e18 (patch)
treea9044125d220ce6b0c60d3a49f14492676de6dfe
parent5397586ae46e59be457259a8bffc1fabb3885b98 (diff)
parent50bb917f0439edd8d4f1511ebaa1d1b01707e8be (diff)
downloadkolla-1d9b41f3d8ef05ea1b9516a6e853eb7f84c67e18.tar.gz
kolla-1d9b41f3d8ef05ea1b9516a6e853eb7f84c67e18.zip
Merge "Add HAproxy to source installation packages"
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 9b31eceef..1193c91c1 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -53,6 +53,7 @@ RUN mkdir -p /usr/share/neutron \
'conntrack-tools',
'dnsmasq',
'dnsmasq-utils',
+ 'haproxy',
'ipset',
'keepalived',
'openvswitch',
@@ -66,6 +67,7 @@ RUN mkdir -p /usr/share/neutron \
'conntrack',
'dnsmasq',
'dnsmasq-utils',
+ 'haproxy',
'iproute2',
'ipset',
'iptables',