From 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 3 Nov 2016 10:37:21 +0100 Subject: Remove Fedora support Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044 --- docker/swift/swift-account/Dockerfile.j2 | 2 +- docker/swift/swift-base/Dockerfile.j2 | 4 ++-- docker/swift/swift-container/Dockerfile.j2 | 2 +- docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +- docker/swift/swift-object/Dockerfile.j2 | 2 +- docker/swift/swift-proxy-server/Dockerfile.j2 | 2 +- docker/swift/swift-rsyncd/Dockerfile.j2 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index 640475977..f69a7317b 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_acount_packages = ['openstack-swift-account'] %} {% elif base_distro in ['ubuntu'] %} {% set swift_acount_packages = ['swift-account'] %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index a4fdb533d..69a8a4068 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_base_packages = ['openstack-swift'] %} {% elif base_distro in ['ubuntu'] %} {% set swift_base_packages = ['swift'] %} @@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(swift_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_base_packages = ['liberasurecode-devel'] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set swift_base_packages = ['liberasurecode-dev'] %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index c03c2e6fd..8bc64b9ec 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_container_packages = ['openstack-swift-container'] %} {% elif base_distro in ['ubuntu'] %} {% set swift_container_packages = ['swift-container'] %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index e451aec44..4ee5c8ec5 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} # RDO has it packaged in the wrong package for now. The issue is being # tracked in https://bugzilla.redhat.com/show_bug.cgi?id=1382921 {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 4edb02d4e..60bcc675f 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_object_packages = ['openstack-swift-object'] %} {% elif base_distro in ['ubuntu'] %} {% set swift_object_packages = ['swift-object'] %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index ae01f71c6..d777a10cd 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_proxy_server_packages = ['openstack-swift-proxy'] %} {% elif base_distro in ['ubuntu'] %} {% set swift_proxy_server_packages = ['swift-proxy'] %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index 7f781700c..a34a646e8 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_rsyncd_packages = ['rsync'] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set swift_rsyncd_packages = ['rsync'] %} -- cgit v1.2.3