From 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 3 Nov 2016 10:37:21 +0100
Subject: Remove Fedora support

Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
---
 docker/heat/heat-api-cfn/Dockerfile.j2 | 2 +-
 docker/heat/heat-api/Dockerfile.j2     | 2 +-
 docker/heat/heat-base/Dockerfile.j2    | 2 +-
 docker/heat/heat-engine/Dockerfile.j2  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker/heat')

diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 4183ed781..0654edbfa 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/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 heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
     {% elif base_distro in ['ubuntu'] %}
         {% set heat_api_cfn_packages = ['heat-api-cfn'] %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 836f42539..d7486cc7b 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-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 heat_api_packages = ['openstack-heat-api'] %}
     {% elif base_distro in ['ubuntu'] %}
         {% set heat_api_packages = ['heat-api'] %}
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 9bd7f9d4f..d936318bd 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
 
 {% if install_type == 'binary' %}
 
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
     {% set heat_base_packages = ['openstack-heat-common'] %}
 {% elif base_distro in ['ubuntu'] %}
     {% set heat_base_packages = ['heat-common'] %}
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 3afe0b108..48b600695 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/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 heat_engine_packages = [
             'python-barbicanclient',
             'python-zaqarclient',
-- 
cgit v1.2.3