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/openstack-base/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/openstack-base/Dockerfile.j2') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 0ded986e5..3e4fea34f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/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 openstack_base_packages = [ 'git', 'iproute', @@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }} {% endif %} {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} # TODO(Allen) Remove python-dogpile-cache after the requirement of # python-ironicclient is fixed. @@ -191,7 +191,7 @@ ENV DEBIAN_FRONTEND noninteractive {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set openstack_base_packages = [ 'gcc', 'gcc-c++', -- cgit v1.2.3