Merge "Remove support for OracleLinux"

16 files changed, 24 insertions, 65 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 622480ee1..8ce1b4155 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 %}
@@ -216,31 +207,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
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index a9f1f7ef8..4c015186e 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -48,7 +48,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'lvm2',
                 'cryptsetup',
         ] %}
-        {% if base_distro in ['centos', 'oraclelinux'] %}
+        {% if base_distro in ['centos'] %}
             {% set cinder_base_packages = cinder_base_packages + [
                 'qemu-img-ev'
             ] %}
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2
index 0d1857220..8e82f7179 100644
--- a/docker/cyborg/cyborg-api/Dockerfile.j2
+++ b/docker/cyborg/cyborg-api/Dockerfile.j2
@@ -10,12 +10,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}'  \
     && /bin/false
 
 {% elif install_type == 'source' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
         {% set cyborg_api_packages = [
             'mod_ssl',
             'mod_wsgi'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set cyborg_api_packages = [
             'apache2',
             'libapache2-mod-wsgi'
@@ -26,11 +26,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}'  \
 
 {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
 RUN echo > /etc/apache2/ports.conf
 
 {% endif %}
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 2eff6e383..9ac24070a 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['centos', 'oraclelinux'] %}
+{% if base_distro in ['centos'] %}
     {% set glance_api_packages = ['qemu-img-ev'] %}
 {% elif base_distro == 'rhel' %}
     {% set glance_api_packages = ['qemu-img'] %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ba62c50ec..90975c756 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -47,7 +47,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'systemd-python'
         ] %}
         {% endif %}
-        {% if base_distro in ['centos', 'oraclelinux'] %}
+        {% if base_distro in ['centos'] %}
             {% set ironic_conductor_packages = ironic_conductor_packages + [
                 'qemu-img-ev'
             ] %}
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh
index 6d0234c1c..db61fe0a2 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/docker/ironic/ironic-pxe/extend_start.sh
@@ -15,7 +15,7 @@ function prepare_pxe {
 function prepare_ipxe {
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi} /tftpboot
-    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|oraclelinux|rhel ]]; then
+    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rhel ]]; then
         cp /usr/share/ipxe/{undionly.kpxe,ipxe.efi} /tftpboot
     fi
 }
@@ -35,7 +35,7 @@ if [[ "${ironic_arch}" =~ aarch64 ]]; then
 
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         grub-mkimage -v -o /tftpboot/grubaa64.efi -O arm64-efi -p "grub" $modules
-    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|oraclelinux|rhel ]]; then
+    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rhel ]]; then
         grub2-mkimage -v -o /tftpboot/grubaa64.efi -O arm64-efi -p "EFI/centos" $modules
     fi
 fi
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index f38722769..62a92dcb9 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -10,8 +10,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
 
 {% if install_type == 'binary' %}
-    # TODO: oraclelinux fails to install these packages. Should be added when this is fixed.
-    {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %}
+    {% if base_package_type == 'rpm' %}
         {% set keystone_packages = [
             'mod_auth_gssapi'
         ] %}
@@ -33,7 +32,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
     {% endif %}
 {{ macros.install_packages(keystone_packages | customizable("packages")) }}
 {% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %}
+    {% if base_package_type == 'rpm' %}
         {% set keystone_packages = [
             'mod_auth_gssapi',
         ] %}
diff --git a/docker/macros.j2 b/docker/macros.j2
index 029e995c7..0af3fe43c 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -108,7 +108,7 @@ RUN apt-get update \
 {% macro install_fluent_plugins(plugins, chain=False) -%}
 {% if plugins is defined and plugins|length > 0 -%}
     {% if not chain -%} RUN {% endif -%}
-    {%- if base_arch == 'x86_64' and base_distro in ['centos', 'oraclelinux', 'rhel', 'ubuntu'] -%}
+    {%- if base_arch == 'x86_64' and base_distro in ['centos', 'rhel', 'ubuntu'] -%}
         ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }}
     {%- else -%}
         ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }}
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2
index 8ed265b17..2039b556a 100644
--- a/docker/masakari/masakari-monitors/Dockerfile.j2
+++ b/docker/masakari/masakari-monitors/Dockerfile.j2
@@ -14,7 +14,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% elif install_type == 'source' %}
 
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
 
         {% set masakari_monitors_packages = [
             'libvirt-devel',
@@ -22,7 +22,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
             'tcpdump',
         ] %}
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
 
         {% set masakari_monitors_packages = [
             'libvirt-dev',
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 79b826dc9..da379662c 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -16,13 +16,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
 
         {% if base_arch == 'x86_64' %}
-            {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+            {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'OVMF'
                 ] %}
             {% endif %}
         {% elif base_arch == 'aarch64' %}
-            {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+            {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'AAVMF'
                 ] %}
@@ -61,13 +61,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'openvswitch'
         ] %}
         {% if base_arch == 'x86_64' %}
-            {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+            {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'OVMF'
                 ] %}
             {% endif %}
         {% elif base_arch == 'aarch64' %}
-            {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
+            {% if base_distro_tag.startswith('7') %}
                 {% set nova_base_packages = nova_base_packages + [
                     'AAVMF'
                 ] %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index fb75e443a..9fb812395 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openvswitch',
         'trousers'
     ] %}
-    {% if base_distro in ['centos', 'oraclelinux'] %}
+    {% if base_distro in ['centos'] %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
             'qemu-kvm-ev'
         ] %}
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
index 92f11947d..b22627b79 100644
--- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
 
 #TODO(sean-k-mooney) create repo via open suse build system to package
-# for centos/oraclelinux/rhel distros.
+# for centos/rhel distros.
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2
index 6c82e7e28..d6f1978e3 100644
--- a/docker/placement/placement-base/Dockerfile.j2
+++ b/docker/placement/placement-base/Dockerfile.j2
@@ -31,13 +31,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% elif install_type == 'source' %}
 
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
 
         {% set placement_base_packages = [
             'mariadb',
         ] %}
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
 
         {% set placement_base_packages = [
             'mariadb-client',
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2
index 28779ed4f..caccce85b 100644
--- a/docker/sensu/sensu-client/Dockerfile.j2
+++ b/docker/sensu/sensu-client/Dockerfile.j2
@@ -59,7 +59,7 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
 
 # Sensu plugins are all using semantic versioning.
 # Let's cap them to the known major version that works with the ruby shipped on
-# rhel/centos/oraclelinux (currently 2.0)
+# rhel/centos (currently 2.0)
 {% set sensu_plugins = [
     'ceph:"~>1"',
     'cpu-checks:"~>1"',
diff --git a/docker/sensu/sensu-server/Dockerfile.j2 b/docker/sensu/sensu-server/Dockerfile.j2
index de7e9e7d0..fa447fe7c 100644
--- a/docker/sensu/sensu-server/Dockerfile.j2
+++ b/docker/sensu/sensu-server/Dockerfile.j2
@@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 # Sensu plugins are all using semantic versioning.
 # Let's cap them to the known major version that works with the ruby shipped on
-# rhel/centos/oraclelinux (currently 2.0)
+# rhel/centos (currently 2.0)
 {% set sensu_plugins = [
     'mailer:"~>3"',
     'slack:"~>3"'