From 305020c2095869b05097d0e340306ea36982159a Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Tue, 22 Dec 2015 09:43:14 +0800 Subject: [PATCH] Add the rhel in the base_distro condition in swift dockerfile Closes-Bug: #1528446 Change-Id: I781a1f3617fedc96da5a0837ecf988fb9a366d44 --- docker/swift/swift-account-auditor/Dockerfile.j2 | 2 +- docker/swift/swift-account-reaper/Dockerfile.j2 | 2 +- docker/swift/swift-account-replicator/Dockerfile.j2 | 2 +- docker/swift/swift-container-auditor/Dockerfile.j2 | 2 +- docker/swift/swift-container-replicator/Dockerfile.j2 | 2 +- docker/swift/swift-container-updater/Dockerfile.j2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/swift/swift-account-auditor/Dockerfile.j2 b/docker/swift/swift-account-auditor/Dockerfile.j2 index e1439f6c3a..4ab70ac6f2 100644 --- a/docker/swift/swift-account-auditor/Dockerfile.j2 +++ b/docker/swift/swift-account-auditor/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all diff --git a/docker/swift/swift-account-reaper/Dockerfile.j2 b/docker/swift/swift-account-reaper/Dockerfile.j2 index e1439f6c3a..4ab70ac6f2 100644 --- a/docker/swift/swift-account-reaper/Dockerfile.j2 +++ b/docker/swift/swift-account-reaper/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all diff --git a/docker/swift/swift-account-replicator/Dockerfile.j2 b/docker/swift/swift-account-replicator/Dockerfile.j2 index e1439f6c3a..4ab70ac6f2 100644 --- a/docker/swift/swift-account-replicator/Dockerfile.j2 +++ b/docker/swift/swift-account-replicator/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all diff --git a/docker/swift/swift-container-auditor/Dockerfile.j2 b/docker/swift/swift-container-auditor/Dockerfile.j2 index 353636b24e..ce7e10f73f 100644 --- a/docker/swift/swift-container-auditor/Dockerfile.j2 +++ b/docker/swift/swift-container-auditor/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all diff --git a/docker/swift/swift-container-replicator/Dockerfile.j2 b/docker/swift/swift-container-replicator/Dockerfile.j2 index 353636b24e..ce7e10f73f 100644 --- a/docker/swift/swift-container-replicator/Dockerfile.j2 +++ b/docker/swift/swift-container-replicator/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all diff --git a/docker/swift/swift-container-updater/Dockerfile.j2 b/docker/swift/swift-container-updater/Dockerfile.j2 index 353636b24e..ce7e10f73f 100644 --- a/docker/swift/swift-container-updater/Dockerfile.j2 +++ b/docker/swift/swift-container-updater/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} {% 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 \ && yum clean all