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/ironic/ironic-api/Dockerfile.j2 | 2 +- docker/ironic/ironic-base/Dockerfile.j2 | 2 +- docker/ironic/ironic-conductor/Dockerfile.j2 | 4 ++-- docker/ironic/ironic-inspector/Dockerfile.j2 | 2 +- docker/ironic/ironic-pxe/Dockerfile.j2 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/ironic') diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 32f2d36e0..1fd82dcfa 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/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 ironic_api_packages = ['openstack-ironic-api'] %} {% elif base_distro in ['ubuntu'] %} {% set ironic_api_packages = ['ironic-api'] %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 2b24ed3b7..5029ae931 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-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 ironic_base_packages = ['openstack-ironic-common'] %} {% elif base_distro in ['ubuntu'] %} {% set ironic_base_packages = ['ironic-common'] %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index e7e160b09..3e3f7d315 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/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'] %} # TODO(Jeffrey4l): no python-scciclient, python-oneviewclient, # python-seamicroclient, pyremotevbox package {% set ironic_conductor_packages = [ @@ -47,7 +47,7 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ironic_conductor_packages = [ 'util-linux', 'qemu-img', diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 2f6bac12b..887078797 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/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 ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% elif base_distro in ['ubuntu'] %} {% set ironic_inspector_packages = [ diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 6150a646f..1ea8da88e 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ironic_pxe_packages = [ 'tftp-server', 'syslinux-tftpboot' -- cgit v1.2.3