diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 14:19:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 14:19:43 +0000 |
| commit | 35ea22ee99016328fbe9a68abe946e8087f425a6 (patch) | |
| tree | 79dd4d43295c8c502a90fae93fb46ea13dc939cf /docker/haproxy | |
| parent | 326b29f363596e6b63ebdf2643d22b2b642aecea (diff) | |
| parent | 6992049323b271bf3856548f4a4d61482f5c4617 (diff) | |
| download | kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.tar.gz kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.zip | |
Merge "Add 'rhel' for RPM distros"
Diffstat (limited to 'docker/haproxy')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 2858f436a..bda7d47ec 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ haproxy \ |