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: [PATCH] Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
---
ansible/group_vars/all.yml | 2 +-
doc/image-building.rst | 1 -
doc/quickstart.rst | 4 ++--
docker/aodh/aodh-api/Dockerfile.j2 | 2 +-
docker/aodh/aodh-base/Dockerfile.j2 | 4 ++--
docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 +-
docker/aodh/aodh-expirer/Dockerfile.j2 | 2 +-
docker/aodh/aodh-listener/Dockerfile.j2 | 2 +-
docker/aodh/aodh-notifier/Dockerfile.j2 | 2 +-
docker/barbican/barbican-api/Dockerfile.j2 | 2 +-
docker/barbican/barbican-base/Dockerfile.j2 | 4 ++--
.../barbican-keystone-listener/Dockerfile.j2 | 2 +-
docker/barbican/barbican-worker/Dockerfile.j2 | 2 +-
docker/base/Dockerfile.j2 | 19 +++----------------
docker/bifrost/bifrost-deploy/Dockerfile.j2 | 2 +-
.../ceilometer/ceilometer-api/Dockerfile.j2 | 4 ++--
.../ceilometer/ceilometer-base/Dockerfile.j2 | 2 +-
.../ceilometer-central/Dockerfile.j2 | 2 +-
.../ceilometer-collector/Dockerfile.j2 | 2 +-
.../ceilometer-compute/Dockerfile.j2 | 4 ++--
.../ceilometer-notification/Dockerfile.j2 | 2 +-
docker/ceph/ceph-base/Dockerfile.j2 | 2 +-
docker/cinder/cinder-api/Dockerfile.j2 | 2 +-
docker/cinder/cinder-backup/Dockerfile.j2 | 4 ++--
docker/cinder/cinder-base/Dockerfile.j2 | 4 ++--
docker/cinder/cinder-rpcbind/Dockerfile.j2 | 2 +-
docker/cinder/cinder-volume/Dockerfile.j2 | 2 +-
docker/congress/congress-base/Dockerfile.j2 | 2 +-
docker/cron/Dockerfile.j2 | 2 +-
docker/designate/designate-api/Dockerfile.j2 | 2 +-
.../designate-backend-bind9/Dockerfile.j2 | 2 +-
docker/designate/designate-base/Dockerfile.j2 | 2 +-
.../designate/designate-central/Dockerfile.j2 | 2 +-
docker/designate/designate-mdns/Dockerfile.j2 | 2 +-
.../designate-pool-manager/Dockerfile.j2 | 2 +-
docker/designate/designate-sink/Dockerfile.j2 | 2 +-
docker/dind/Dockerfile.j2 | 2 +-
docker/elasticsearch/Dockerfile.j2 | 2 +-
docker/etcd/Dockerfile.j2 | 2 +-
docker/fluentd/Dockerfile.j2 | 2 +-
docker/glance/glance-base/Dockerfile.j2 | 2 +-
docker/gnocchi/gnocchi-api/Dockerfile.j2 | 2 +-
docker/gnocchi/gnocchi-base/Dockerfile.j2 | 4 ++--
docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 2 +-
docker/gnocchi/gnocchi-statsd/Dockerfile.j2 | 2 +-
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 +-
docker/heka/Dockerfile.j2 | 2 +-
docker/horizon/Dockerfile.j2 | 4 ++--
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 +-
docker/iscsid/Dockerfile.j2 | 2 +-
docker/keepalived/Dockerfile.j2 | 2 +-
docker/keystone/keystone-base/Dockerfile.j2 | 4 ++--
docker/keystone/keystone-fernet/Dockerfile.j2 | 2 +-
docker/keystone/keystone-ssh/Dockerfile.j2 | 2 +-
docker/kolla-toolbox/Dockerfile.j2 | 2 +-
docker/macros.j2 | 2 +-
docker/magnum/magnum-api/Dockerfile.j2 | 2 +-
docker/magnum/magnum-base/Dockerfile.j2 | 2 +-
docker/magnum/magnum-conductor/Dockerfile.j2 | 2 +-
docker/manila/manila-base/Dockerfile.j2 | 4 ++--
docker/manila/manila-share/Dockerfile.j2 | 2 +-
docker/mariadb/Dockerfile.j2 | 2 +-
docker/memcached/Dockerfile.j2 | 2 +-
docker/mistral/mistral-api/Dockerfile.j2 | 2 +-
docker/mistral/mistral-base/Dockerfile.j2 | 2 +-
docker/mistral/mistral-engine/Dockerfile.j2 | 2 +-
docker/mistral/mistral-executor/Dockerfile.j2 | 2 +-
docker/mongodb/Dockerfile.j2 | 2 +-
docker/multipathd/Dockerfile.j2 | 2 +-
docker/murano/murano-api/Dockerfile.j2 | 2 +-
docker/murano/murano-base/Dockerfile.j2 | 2 +-
docker/murano/murano-engine/Dockerfile.j2 | 2 +-
docker/neutron/neutron-base/Dockerfile.j2 | 4 ++--
.../neutron/neutron-lbaas-agent/Dockerfile.j2 | 2 +-
.../neutron-linuxbridge-agent/Dockerfile.j2 | 2 +-
.../neutron-metering-agent/Dockerfile.j2 | 2 +-
.../neutron-openvswitch-agent/Dockerfile.j2 | 2 +-
docker/neutron/neutron-server/Dockerfile.j2 | 2 +-
.../neutron-vpnaas-agent/Dockerfile.j2 | 2 +-
docker/nova/nova-api/Dockerfile.j2 | 2 +-
docker/nova/nova-base/Dockerfile.j2 | 4 ++--
docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 +-
docker/nova/nova-compute/Dockerfile.j2 | 4 ++--
docker/nova/nova-conductor/Dockerfile.j2 | 2 +-
docker/nova/nova-consoleauth/Dockerfile.j2 | 2 +-
docker/nova/nova-libvirt/Dockerfile.j2 | 4 ++--
docker/nova/nova-network/Dockerfile.j2 | 4 ++--
docker/nova/nova-novncproxy/Dockerfile.j2 | 2 +-
docker/nova/nova-scheduler/Dockerfile.j2 | 2 +-
docker/nova/nova-serialproxy/Dockerfile.j2 | 2 +-
.../nova/nova-spicehtml5proxy/Dockerfile.j2 | 2 +-
docker/openstack-base/Dockerfile.j2 | 6 +++---
.../openvswitch-base/Dockerfile.j2 | 2 +-
docker/rabbitmq/Dockerfile.j2 | 2 +-
docker/rally/Dockerfile.j2 | 2 +-
docker/sahara/sahara-api/Dockerfile.j2 | 2 +-
docker/sahara/sahara-base/Dockerfile.j2 | 2 +-
docker/sahara/sahara-engine/Dockerfile.j2 | 2 +-
docker/swift/swift-account/Dockerfile.j2 | 2 +-
docker/swift/swift-base/Dockerfile.j2 | 4 ++--
docker/swift/swift-container/Dockerfile.j2 | 2 +-
.../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 +-
docker/tempest/Dockerfile.j2 | 2 +-
docker/tgtd/Dockerfile.j2 | 2 +-
docker/trove/trove-api/Dockerfile.j2 | 2 +-
docker/trove/trove-base/Dockerfile.j2 | 2 +-
docker/trove/trove-conductor/Dockerfile.j2 | 2 +-
docker/trove/trove-guestagent/Dockerfile.j2 | 2 +-
docker/trove/trove-taskmanager/Dockerfile.j2 | 2 +-
docker/zaqar/Dockerfile.j2 | 2 +-
etc/kolla/globals.yml | 2 +-
kolla/image/build.py | 6 +-----
kolla/tests/test_build.py | 2 +-
.../notes/remove-fedora-44af79f3e061e8d6.yaml | 4 ++++
124 files changed, 148 insertions(+), 162 deletions(-)
create mode 100644 releasenotes/notes/remove-fedora-44af79f3e061e8d6.yaml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 7834e5ddfe..642f1efbd9 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -26,7 +26,7 @@ orchestration_engine: "ANSIBLE"
# Valid options are [ COPY_ONCE, COPY_ALWAYS ]
config_strategy: "COPY_ALWAYS"
-# Valid options are [ centos, fedora, oraclelinux, ubuntu ]
+# Valid options are [ centos, oraclelinux, ubuntu ]
kolla_base_distro: "centos"
# Valid options are [ binary, source ]
kolla_install_type: "binary"
diff --git a/doc/image-building.rst b/doc/image-building.rst
index 8794b120f5..286f7711eb 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -45,7 +45,6 @@ The operator can change the base distro with the ``-b`` option::
There are following distros available for building images:
-- fedora
- centos
- oraclelinux
- ubuntu
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 569dd38024..d250659a3f 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -191,7 +191,7 @@ For mounting ``/run`` as shared upon startup, add that command to
# Edit /etc/rc.local to add:
mount --make-shared /run
-.. note:: If centos/fedora/oraclelinux container images are built on an Ubuntu
+.. note:: If centos/oraclelinux container images are built on an Ubuntu
host, the backend storage driver must not be AUFS (see the known issues in
:doc:`image-building`).
@@ -417,7 +417,7 @@ behavior, please use the following parameters with ``kolla-build``:
::
---base [ubuntu|centos|fedora|oraclelinux]
+--base [ubuntu|centos|oraclelinux]
--type [binary|source]
If pushing to a local registry (recommended) use the flags:
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index 23288c9b03..370b772869 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-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 aodh_api_packages = ['openstack-aodh-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_api_packages = ['aodh-api'] %}
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index ad9cd43759..02949b5d96 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_base_packages = [
'openstack-aodh-common',
@@ -36,7 +36,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_base_packages = [
'httpd',
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
index 342d4b1c9f..4fa319ce84 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/docker/aodh/aodh-evaluator/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 aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %}
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
index 235c7d3697..c43af18c78 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/docker/aodh/aodh-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'] %}
{% set aodh_expirer_packages = ['openstack-aodh-expirer'] %}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_expirer_packages = ['aodh-expirer'] %}
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
index 894d44f678..45b41a3adb 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/docker/aodh/aodh-listener/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 aodh_listener_packages = ['openstack-aodh-listener'] %}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_listener_packages = ['aodh-listener'] %}
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
index c83de2af56..7e1fbadc15 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/docker/aodh/aodh-notifier/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 aodh_notifier_packages = ['openstack-aodh-notifier'] %}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_notifier_packages = ['aodh-notifier'] %}
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index d9c122675c..bc019d4466 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-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 barbican_api_packages = ['openstack-barbican-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_api_packages = [
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 3eb5b88456..5f44432bf3 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-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 barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['barbican-common'] %}
@@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index c35c1696a5..9319b3214d 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/docker/barbican/barbican-keystone-listener/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 barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
index 65208e0cc1..b0a9c63be4 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/docker/barbican/barbican-worker/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 barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_worker_packages = ['barbican-worker'] %}
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index f762276fea..ce2bbbd520 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -24,7 +24,7 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
# enables to provide repo overrides at a later date in a simple fashion if we
# desire such functionality. I think we will :)
-{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \
echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \
@@ -143,23 +143,10 @@ RUN yum -y install \
{% endif %}
{# Endif for base_distro oraclelinux #}
- {% if base_distro == 'fedora' %}
-
-# Set up repositories
-RUN yum -y install \
- https://rdo.fedorapeople.org/rdo-release.rpm \
- dnf \
- dnf-plugins-core \
- yum-plugin-priorities \
- && yum clean all
-
- {% endif %}
- {# Endif for base_distro fedora #}
-
#### END REPO ENABLEMENT
{# We are back to the basic if conditional here which is:
- if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #}
+ if base_distro in ['centos', 'oraclelinux', 'rhel'] #}
{% block base_redhat_binary_versionlock %}{% endblock %}
{% if install_type == 'binary' %}
{% set base_centos_binary_packages = [
@@ -193,7 +180,7 @@ RUN yum -y install \
{% endif %}
{# endif for install type is source for RPM based distros #}
-{# endif for base_distro centos,fedora,oraclelinux,rhel #}
+{# endif for base_distro centos,oraclelinux,rhel #}
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \
diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2
index aee377e2b4..3b5a54fb49 100644
--- a/docker/bifrost/bifrost-deploy/Dockerfile.j2
+++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2
@@ -7,7 +7,7 @@ ENV container docker
{% import "macros.j2" as macros with context %}
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %}
RUN bash -c ' $(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ \"$i\" == \"systemd-tmpfiles-setup.service\" ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index b279a4c0bc..dbe6c264ed 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-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 ceilometer_api_packages = [
'openstack-ceilometer-api',
'httpd',
@@ -27,7 +27,7 @@ RUN echo > /etc/apache2/ports.conf
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_api_packages = [
'httpd',
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 861ea018d1..ca64609ee0 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-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 ceilometer_base_packages = [
'openstack-ceilometer-common',
'python-tooz',
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index 1d54a9f3b2..3d3d4e9219 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/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 ceilometer_central_packages = ['openstack-ceilometer-central'] %}
{% elif base_distro in ['ubuntu'] %}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
index 40c02155de..c2e67bbc55 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-collector/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 ceilometer_collector_packages = ['openstack-ceilometer-collector'] %}
{% elif base_distro in ['ubuntu'] %}
{% set ceilometer_collector_packages = ['ceilometer-collector'] %}
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index bdb119be80..b60a539340 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/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 ceilometer_compute_packages = [
'openstack-ceilometer-compute',
'python-ceilometerclient'
@@ -21,7 +21,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
libvirt-devel \
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index d2cdf5fe6a..6d351391bd 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/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 ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
{% elif base_distro in ['ubuntu'] %}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index d3ebbe2062..7edc3ebdfe 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/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 ceph_base_packages = [
'ceph',
'ceph-radosgw',
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 13756c9979..fe343fea37 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-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 cinder_api_packages = [
'python-keystone'
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index 773fc72fc5..02a30c4933 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/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 cinder_backup_packages = [
'nfs-utils'
@@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [
'nfs-utils'
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index b5b321cc4d..8d59f54414 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-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 cinder_base_packages = [
'openstack-cinder',
@@ -28,7 +28,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [
'lvm2',
diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2
index 6516b55ae5..60eb8672be 100644
--- a/docker/cinder/cinder-rpcbind/Dockerfile.j2
+++ b/docker/cinder/cinder-rpcbind/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 cinder_rpcbind_packages = [
'nfs-utils',
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index fd4f1c6bb3..518daa4c3a 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/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 cinder_volume_packages = [
'scsi-target-utils'
diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2
index 7a399fe0b2..01890efca6 100644
--- a/docker/congress/congress-base/Dockerfile.j2
+++ b/docker/congress/congress-base/Dockerfile.j2
@@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
# TODO(Md Nadeem): need to add congress binary package when it is available in rpm base distro
#https://trunk.rdoproject.org/
- {% elif base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% elif base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2
index d90f53933f..a2cf93ecd0 100644
--- a/docker/cron/Dockerfile.j2
+++ b/docker/cron/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 cron_packages = [
'cronie',
'logrotate'
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 9b6a5bf3aa..b664578261 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-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 designate_api_packages = ['openstack-designate-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set designate_api_packages = ['designate-api'] %}
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index b912ffacd3..83aa68c73e 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/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 designate_backend_bind9_packages = ['bind'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index fdadee6df9..6cc36f639f 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-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'] %}
# Install designate-api because of /etc/designate/policy.json, which
# is needed in all services. This is probably a packaging bug. We do
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index f2caebad12..7a29f35692 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/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 designate_central_packages = ['openstack-designate-central'] %}
{% elif base_distro in ['ubuntu']%}
{% set designate_central_packages = ['designate-central'] %}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index a1729826f5..6028bdef4f 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/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 designate_mdns_packages = ['openstack-designate-mdns'] %}
{% elif base_distro in ['ubuntu'] %}
{% set designate_mdns_packages = ['designate-mdns'] %}
diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2
index 815ceb5e8b..4b9ca6f26f 100644
--- a/docker/designate/designate-pool-manager/Dockerfile.j2
+++ b/docker/designate/designate-pool-manager/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'] %}
# The bind9 package here is only to provide the rndc binary.
{% set designate_pool_manager_packages = [
'bind',
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 3c98d64ed7..6d2e6acd3f 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/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 designate_sink_packages = [
'openstack-designate-sink',
'python-designateclient'
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
index 628d62b73a..d0389dc785 100644
--- a/docker/dind/Dockerfile.j2
+++ b/docker/dind/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'] %}
# Since the gate cannot do DinD on centos due to the age of the kernel, we don't
# build a true DinD image. Should the time come that we get a newer kernel in
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 5cb80f5a6c..7b24f330e3 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/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 elasticsearch_packages = [
'java-1.7.0-openjdk',
'elasticsearch'
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2
index dae3ec3987..1d74950a05 100644
--- a/docker/etcd/Dockerfile.j2
+++ b/docker/etcd/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 etcd_packages = ['etcd'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set etcd_packages = ['etcd'] %}
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index bc20b8ff38..81586925c8 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/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'] %}
RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 713a4bf5c4..95983f45cc 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-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 glance_base_packages = [
'openstack-glance',
'python-rbd',
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index a1070de05d..edee1bc7f3 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-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 gnocchi_api_packages = [
'openstack-gnocchi-api',
'openstack-gnocchi-carbonara',
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 1986ca7033..0dcc85fa72 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [
'openstack-gnocchi-common',
@@ -34,7 +34,7 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [
'httpd',
diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
index e0bec4166b..7ef3955ce9 100644
--- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-metricd/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 gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index 9b38273791..20ab2135b6 100644
--- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-statsd/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 gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% endif %}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 4183ed7811..0654edbfa0 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 836f425394..d7486cc7b8 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 9bd7f9d4f3..d936318bd5 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 3afe0b108c..48b600695f 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',
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2
index 5428ff5089..142bd2e0ea 100644
--- a/docker/heka/Dockerfile.j2
+++ b/docker/heka/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 heka_packages = [
'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm'
] %}
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 5a589615f0..3c9912cbef 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/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 horizon_packages = [
'openstack-dashboard',
@@ -64,7 +64,7 @@ RUN echo > /etc/apache2/ports.conf \
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set horizon_packages = [
'httpd',
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 32f2d36e08..1fd82dcfa8 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 2b24ed3b73..5029ae9314 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 e7e160b09f..3e3f7d315f 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 2f6bac12bd..8870787974 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 6150a646f8..1ea8da88e4 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'
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2
index 4d57038b0c..0f29fe5f34 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/docker/iscsid/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 iscsid_packages = [
'iscsi-initiator-utils',
'targetcli',
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2
index 673edfd574..2c3ad15f8e 100644
--- a/docker/keepalived/Dockerfile.j2
+++ b/docker/keepalived/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 keepalived_packages = [
'hostname',
'keepalived',
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index fe4c5cf1d7..195983e269 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [
'openstack-keystone',
'python-keystoneclient',
@@ -38,7 +38,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [
'httpd',
'mod_wsgi',
diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2
index 8c058e2055..6710490c46 100644
--- a/docker/keystone/keystone-fernet/Dockerfile.j2
+++ b/docker/keystone/keystone-fernet/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 keystone_fernet_packages = [
'cronie',
'openssh-clients',
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2
index 92fa412551..5b52879816 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/docker/keystone/keystone-ssh/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 keystone_ssh_packages = [
'openssh-server',
'rsync'
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 78b0a6cbde..a74024f8e1 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -7,7 +7,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 kolla_toolbox_packages = [
'crudini',
'gcc',
diff --git a/docker/macros.j2 b/docker/macros.j2
index 32496a9210..89ce4ec2d3 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -1,6 +1,6 @@
{% macro install_packages(packages) -%}
{% if packages is defined and packages|length > 0 -%}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
RUN yum -y install {{ packages | join(' ') }} && yum clean all
{%- elif base_distro in ['ubuntu', 'debian'] -%}
{#-
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index e1f2285e62..a09c057cb7 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-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 magnum_api_packages = ['openstack-magnum-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set magnum_api_packages = ['magnum-api'] %}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 32b597289d..74a4006ef3 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-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'] %}
+ {% if base_distro in ['centos', 'oraclelinux'] %}
{% set magnum_base_packages = ['openstack-magnum-common'] %}
RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index b4d3f5fd3a..080ef693b5 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-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'] %}
{% set magnum_conductor_packages = [
'openstack-magnum-conductor'
] %}
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index cf2d34a59c..cd8b70b668 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-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 manila_base_packages = [
'openstack-manila',
@@ -25,7 +25,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set manila_base_packages = ['openvswitch'] %}
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index d1eaff2797..42e8d1d533 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/docker/manila/manila-share/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 manila_share_packages = [
'openstack-manila-share'
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 5379858308..44ecf4b52a 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/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 mariadb_packages = [
'MariaDB-Galera-server',
'MariaDB-client',
diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2
index 7b921803f1..933085cf13 100644
--- a/docker/memcached/Dockerfile.j2
+++ b/docker/memcached/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 user = 'memcached' %}
{% set memcached_packages = ['memcached'] %}
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 6d9cb55751..0b0335fbf7 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-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 mistral_api_packages = ['openstack-mistral-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_api_packages = ['mistral-api'] %}
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index e3c5c3e6ef..92aa1cad82 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-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 mistral_base_packages = ['openstack-mistral-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_base_packages = ['mistral-common'] %}
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index 295bc265d0..2fe8dcd49d 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-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 mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_engine_packages = ['mistral-engine'] %}
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index b594bbaf45..ed4977baeb 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/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 mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_executor_packages = ['mistral-executor'] %}
diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2
index 1edece5d94..0de18edf6f 100644
--- a/docker/mongodb/Dockerfile.j2
+++ b/docker/mongodb/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 mongodb_packages = [
'mongodb',
'mongodb-server'
diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2
index 70e499d2ff..391008e11f 100644
--- a/docker/multipathd/Dockerfile.j2
+++ b/docker/multipathd/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 multipathd_packages = ['device-mapper-multipath'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set multipathd_packages = ['multipath-tools'] %}
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index d1f09480f8..2a71f98cf1 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-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'] %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip
{% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index ef2d7bd01b..30b4d5fcd6 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-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 murano_base_packages = ['openstack-murano-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set murano_base_packages = ['murano-common'] %}
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index d00e6998ac..846a6e4bee 100644
--- a/docker/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-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 murano_engine_packages = ['openstack-murano-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% set murano_engine_packages = ['murano-engine'] %}
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 1355e3afcf..7ea2b585d7 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-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 neutron_base_packages = [
'openstack-neutron',
@@ -39,7 +39,7 @@ RUN mkdir -p /usr/share/neutron \
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_base_packages = [
'conntrack-tools',
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index 9b21622a80..9046712310 100644
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_lbaas_agent_packages | customizable("packages")) }}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_lbaas_agent_packages = [
'openstack-neutron-lbaas'
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 6fcbade2f7..010c312d0e 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/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 neutron_linuxbridge_agent_packages = [
'ebtables',
diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2
index abc875e91a..b0133aaf68 100644
--- a/docker/neutron/neutron-metering-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metering-agent/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 neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index d5ce88eee3..d41f71a8b9 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/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 neutron_openvswitch_agent_packages = [
'openstack-neutron-openvswitch',
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 8a121efebf..1fee58600b 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-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 neutron_server_packages = [
'openstack-neutron-lbaas',
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
index 7693000d98..94f6f6e944 100644
--- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-vpnaas-agent/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 neutron_vpnaas_agent_packages = [
'openswan',
'openstack-neutron-vpn-agent'
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 869a9801dd..13a3dd92c6 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-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 nova_api_packages = [
'openstack-nova-api'
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 3382975ee1..7f85706933 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-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 nova_base_packages = [
'openstack-nova-common',
@@ -30,7 +30,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_base_packages = [
'bridge-utils',
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 03176db833..1fd22cef84 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/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 nova_compute_ironic_packages = [
'openstack-nova-compute'
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index ed832f4419..461f8b1559 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/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 nova_compute_packages = [
'openstack-nova-compute',
@@ -43,7 +43,7 @@ RUN rm -f /etc/nova/nova-compute.conf
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_compute_packages = [
'libvirt-devel',
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index c666359d1c..ebb61a67a7 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-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'] %}
{% set nova_conductor_packages = [
'openstack-nova-conductor'
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index 68173e23be..e5a8ad5c48 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/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 nova_consoleauth_packages = [
'openstack-nova-console'
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 1d05dfcdaf..7fa39f8190 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/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 nova_libvirt_packages = [
'libvirt-daemon',
@@ -52,7 +52,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN usermod -a -G qemu nova
diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2
index 33cd477a37..d6f4aeb085 100644
--- a/docker/nova/nova-network/Dockerfile.j2
+++ b/docker/nova/nova-network/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 nova_network_packages = [
'openstack-nova-network',
@@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_network_packages = [
'initscripts'
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index c5ed90a843..7aa8c46577 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/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 nova_novncproxy_packages = [
'novnc',
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index 4b21646255..edd49883cd 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/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 nova_scheduler_packages = [
'openstack-nova-scheduler'
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index 0cf97de29b..025a888a1c 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/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 nova_serialproxy_packages = [
'openstack-nova-serialproxy'
] %}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 994915cff2..5a46df8912 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/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 nova_spicehtml5proxy_packages = [
'openstack-nova-spicehtml5proxy',
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 0ded986e5e..3e4fea34f8 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++',
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 5dbe14c1c7..0dce1ff776 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-base/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 openvswitch_base_packages = ['openvswitch'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index c1a89da210..30553726dd 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/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 rabbitmq_packages = [
'hostname',
'rabbitmq-server'
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2
index 7674f6e8b6..b51431d4df 100644
--- a/docker/rally/Dockerfile.j2
+++ b/docker/rally/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
-{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set rally_packages = ['openstack-rally'] %}
RUN useradd --user-group rally
diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2
index 4b4a191d54..91937f9d8f 100644
--- a/docker/sahara/sahara-api/Dockerfile.j2
+++ b/docker/sahara/sahara-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 sahara_api_packages = ['openstack-sahara-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_api_packages = ['sahara-api'] %}
diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2
index 14c642c607..a6324a22b4 100644
--- a/docker/sahara/sahara-base/Dockerfile.j2
+++ b/docker/sahara/sahara-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 sahara_base_packages = ['openstack-sahara-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_base_packages = ['sahara-common'] %}
diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2
index 50ee5fbea6..d91b0b73a9 100644
--- a/docker/sahara/sahara-engine/Dockerfile.j2
+++ b/docker/sahara/sahara-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 sahara_engine_packages = ['openstack-sahara-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_engine_packages = ['sahara-engine'] %}
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 6404759770..f69a7317bf 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 a4fdb533df..69a8a4068b 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 c03c2e6fdc..8bc64b9ecb 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 e451aec44f..4ee5c8ec56 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 4edb02d4e7..60bcc675f2 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 ae01f71c61..d777a10cd0 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 7f781700cf..a34a646e80 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'] %}
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
index 801edaa2b7..1e60e7295f 100644
--- a/docker/tempest/Dockerfile.j2
+++ b/docker/tempest/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set tempest_packages = ['openstack-tempest'] %}
{% elif base_distro in ['ubuntu'] %}
{% set tempest_packages = ['tempest'] %}
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2
index b0ca4003ba..d1e37d53f8 100644
--- a/docker/tgtd/Dockerfile.j2
+++ b/docker/tgtd/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 tgtd_packages = ['scsi-target-utils'] %}
{{ macros.install_packages(tgtd_packages | customizable("packages")) }}
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index d4e09e0a6f..210dffa37f 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-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 trove_api_packages = ['openstack-trove-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set trove_api_packages = ['trove-api'] %}
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index e09bda1d2d..a946162dd7 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-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 trove_base_packages = ['openstack-trove-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set trove_base_packages = ['trove-common'] %}
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index cc7adfe580..0941fae5f0 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-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'] %}
{% set trove_conductor_packages = ['openstack-trove-conductor'] %}
{% elif base_distro in ['ubuntu'] %}
{% set trove_conductor_packages = ['trove-conductor'] %}
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index 174cf22ac7..bcbe9aa5ac 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/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 trove_guestagent_packages = ['openstack-trove-guestagent'] %}
{% elif base_distro in ['ubuntu'] %}
{% set trove_guestagent_packages = ['trove-guestagent'] %}
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index 3ac251b318..f594266463 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/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 trove_taskmanager_packages = ['openstack-trove-taskmanager'] %}
{% elif base_distro in ['ubuntu'] %}
{% set trove_taskmanager_packages = ['trove-taskmanager'] %}
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index 77cb95fb9b..ebc1a70e89 100644
--- a/docker/zaqar/Dockerfile.j2
+++ b/docker/zaqar/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 zaqar_packages = ['openstack-zaqar'] %}
{% elif base_distro in ['ubuntu'] %}
{% set zaqar_packages = [
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 2d588f889d..f5c9f2adae 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -10,7 +10,7 @@
# Valid options are [ COPY_ONCE, COPY_ALWAYS ]
#config_strategy: "COPY_ALWAYS"
-# Valid options are [ centos, fedora, oraclelinux, ubuntu ]
+# Valid options are [ centos, oraclelinux, ubuntu ]
#kolla_base_distro: "centos"
# Valid options are [ binary, source ]
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 231824e85b..d5b7e07dbe 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -514,7 +514,7 @@ class KollaWorker(object):
rpm_setup_config = filter(None, conf.rpm_setup_config)
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
- rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel']
+ rh_base = ['centos', 'oraclelinux', 'rhel']
rh_type = ['source', 'binary', 'rdo', 'rhos']
deb_base = ['ubuntu', 'debian']
deb_type = ['source', 'binary']
@@ -525,10 +525,6 @@ class KollaWorker(object):
'{} is unavailable for {}'.format(self.install_type, self.base)
)
- if self.base == 'fedora':
- LOG.warning('Fedora images are deprecated since Newton and will '
- 'be removed in the future')
-
if self.install_type == 'binary':
self.install_metatype = 'rdo'
elif self.install_type == 'source':
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 515aa1ddd7..b0a46a9881 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -152,7 +152,7 @@ class KollaWorkerTest(base.TestCase):
self.images = [image, image_child]
def test_supported_base_type(self):
- rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel']
+ rh_base = ['centos', 'oraclelinux', 'rhel']
rh_type = ['source', 'binary', 'rdo', 'rhos']
deb_base = ['ubuntu', 'debian']
deb_type = ['source', 'binary']
diff --git a/releasenotes/notes/remove-fedora-44af79f3e061e8d6.yaml b/releasenotes/notes/remove-fedora-44af79f3e061e8d6.yaml
new file mode 100644
index 0000000000..b456105915
--- /dev/null
+++ b/releasenotes/notes/remove-fedora-44af79f3e061e8d6.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - Fedora based Docker images were removed. Feodra based Docker
+ images were deprecated as of the Newton release cycle.