openstack/kolla-ansible
Code Issues Proposed changes

Add the rhel in the base_distro condition in swift dockerfile

Browse Source 
Closes-Bug: #1528446
Change-Id: I781a1f3617fedc96da5a0837ecf988fb9a366d44
This commit is contained in:
Jeffrey Zhang 2015-12-22 09:43:14 +08:00
parent 011da7c1d2
commit 305020c209
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/swift/swift-account-auditor/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-account \
&& yum clean all && yum clean all

2
docker/swift/swift-account-reaper/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-account \
&& yum clean all && yum clean all

2
docker/swift/swift-account-replicator/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-account \
&& yum clean all && yum clean all

2
docker/swift/swift-container-auditor/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-container \
&& yum clean all && yum clean all

2
docker/swift/swift-container-replicator/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-container \
&& yum clean all && yum clean all

2
docker/swift/swift-container-updater/Dockerfile.j2
View File

@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 \ RUN yum -y install openstack-swift-container \
&& yum clean all && yum clean all