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/swift | |
| parent | 326b29f363596e6b63ebdf2643d22b2b642aecea (diff) | |
| parent | 6992049323b271bf3856548f4a4d61482f5c4617 (diff) | |
| download | kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.tar.gz kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.zip | |
Merge "Add 'rhel' for RPM distros"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-container-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-object-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-object-expirer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 index 7320de9f4..54fe57fa9 100644 --- a/docker/swift/swift-account-server/Dockerfile.j2 +++ b/docker/swift/swift-account-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-account \ diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 6ffbe3577..03c41c2bd 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-swift && yum clean all diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2 index 1a08c0f5d..c68b983eb 100644 --- a/docker/swift/swift-container-server/Dockerfile.j2 +++ b/docker/swift/swift-container-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-container \ diff --git a/docker/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2 index 54997a114..cd5689177 100644 --- a/docker/swift/swift-object-base/Dockerfile.j2 +++ b/docker/swift/swift-object-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-object \ diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index af9f3eb58..1e8e0e826 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-proxy \ diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 54d024f8b..bdd983649 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-swift-proxy && yum clean all |