openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add the rhel in the base_distro condition in swift dockerfile"

Browse Source
This commit is contained in:
Jenkins 2015-12-23 03:12:56 +00:00 committed by Gerrit Code Review
commit 2a530d5b9e
6 changed files with 6 additions and 6 deletions
docker/swift
swift-account-auditor
Dockerfile.j2
swift-account-reaper
Dockerfile.j2
swift-account-replicator
Dockerfile.j2
swift-container-auditor
Dockerfile.j2
swift-container-replicator
Dockerfile.j2
swift-container-updater
Dockerfile.j2

2
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

2
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

2
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

2
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

2
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

2
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