From fa8e174be6bc5b4d555258197938da9da40bfa81 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 18 Sep 2019 12:40:59 +0100
Subject: Remove support for OracleLinux

We have agreed to remove support for Oracle Linux.

http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html

Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39
Depends-On: https://review.opendev.org/682858
---
 docker/base/Dockerfile.j2           | 34 ----------------------------------
 docker/base/oraclelinux-extras.repo |  6 ------
 2 files changed, 40 deletions(-)
 delete mode 100644 docker/base/oraclelinux-extras.repo

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c9e17a2ef..a5b670781 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -45,15 +45,6 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
 
 {% block base_yum_conf %}
 
-{% if base_distro in ['oraclelinux'] %}
-{% set centos_contentdir = 'centos' %}
-
-{% if base_arch in ['aarch64', 'ppc64le'] %}
-    {% set centos_contentdir = 'altarch' %}
-{% endif %}
-RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
-{% endif %}
-
 {% if distro_package_manager == 'dnf' %}
 COPY dnf.conf /etc/dnf/dnf.conf
 {% else %}
@@ -200,31 +191,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
     {% endif %}
     {# Endif for base_distro RHEL #}
 
-    {% if base_distro == 'oraclelinux' %}
-
-{% block base_oraclelinux_package_installation %}
-COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
-RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' ], chain=True, clean=False) }} \
-    && rpm -Uvh --nodeps \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-nfs-ganesha28-1.0-2.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-nautilus-1.2-2.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-8.el7.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-2-2.el7.centos.noarch.rpm \
-    && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
-    && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
-    && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools \
-    && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
-    && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \
-    && yum-config-manager --enable ol7_optional_latest ol7_addons \
-    && {{ macros.install_packages( ['yum-plugin-priorities' ], chain=True, clean=False) }} \
-    && {{ macros.rpm_security_update(clean_package_cache) }}
-{% endblock %}
-
-    {% endif %}
-    {# Endif for base_distro oraclelinux #}
-
 #### END REPO ENABLEMENT
 
 {# We are back to the basic if conditional here which is:
diff --git a/docker/base/oraclelinux-extras.repo b/docker/base/oraclelinux-extras.repo
deleted file mode 100644
index 7468bd6d3..000000000
--- a/docker/base/oraclelinux-extras.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[extras]
-name=CentOS-$releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.centos.org/centos/7/extras/$basearch/
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7
-- 
cgit v1.2.3