Drop ppc64le support

We do not test support for ppc64le on CI or other systems.

In previous cycles it was used by TripleO and now they have own way.

Change-Id: Ibd955869a6f9485dfa4d08a8ad2f4b28b7d59c15

5 files changed, 4 insertions, 73 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 5ec3d2de3..76feca670 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -106,37 +106,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
     #
     #   'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
     #
-{% elif base_arch == 'ppc64le' %}
-    {% set base_yum_repo_files = [
-        'rabbitmq_rabbitmq-server.repo',
-    ] %}
-    # FIXME(mgoddard): Not available for CentOS 8 yet.
-    #
-    #   'elasticsearch.repo',
-    #
-
-    {% set base_yum_repo_keys = [
-    ] %}
-    # FIXME(mgoddard): Not available for CentOS 8 yet.
-    #
-    #   'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
-    #
 {% endif %}
 
 {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
 COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
 {%- endfor %}
 
-# NOTE(hrw): 'rabbitmq-server' is 'noarch' so we can install it on ppc64le from
-# repo for other architecture.
-# NOTE(mjturek): tripleo-ci overrides these repos so the file would not exist
-# in that case. We test for the file's existence to avoid sed failing in that case.
-{% if base_arch == 'ppc64le' %}
-RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
-      sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo; \
-    fi
-{% endif %}
-
 {% block base_centos_repo_overrides_post_copy %}{% endblock %}
 
 # Install what is needed for en_US.UTF-8
diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le
deleted file mode 100644
index 53339b6c9..000000000
--- a/docker/base/sources.list.ubuntu.ppc64le
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default repos
-deb http://ports.ubuntu.com/ focal main universe
-deb http://ports.ubuntu.com/ focal-updates main universe
-deb http://ports.ubuntu.com/ focal-security main universe
-
-# Backports have a lower priority and must be explicitly installed to be used
-deb http://ports.ubuntu.com/ focal-backports main universe
-
-# We need to add the repo for the updated packages they provide. The main ones
-# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/wallaby main
-
-# NOTE(hrw): repositories below are added into image when they are needed as
-# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
-# are defined in kolla/repos.yaml file.
-#
-# Here they stay in case someone needs them.
-
-# rabbitmq repo
-#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
-
-# MariaDB repo
-#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index d991827dc..c3df3c6e3 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -60,15 +60,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'python3-sqlalchemy-collectd'
   ] %}
 
-  {% if base_arch in ['x86_64', 'ppc64le'] %}
-      {% set collectd_packages = collectd_packages + [
-        'collectd-iptables'
-        ] %}
-  {% endif %}
-
   {% if base_arch =='x86_64' %}
       {% set collectd_packages = collectd_packages + [
         'collectd-hugepages',
+        'collectd-iptables',
         'collectd-pmu',
         'collectd-rdt',
         'collectd-turbostat'
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 700c4dfce..d165e66c0 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -9,26 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set ironic_pxe_packages = [
+        'grub2-tools',
+        'grub2-efi-aa64-modules',
         'ipxe-bootimgs',
         'tftp-server',
     ] %}
 
-    {% if base_arch in ['x86_64', 'ppc64le'] %}
+    {% if base_arch in ['x86_64'] %}
         {% set ironic_pxe_packages = ironic_pxe_packages + [
             'syslinux-tftpboot'
         ] %}
     {% endif %}
 
-    # NOTE(hrw): RHEL and CentOS ship those packages on all grub architectures
-    # (x86_64, ppc64le, aarch64, but not s390x), and therefore can be used on
-    # any of them to support heterogeneous clusters with AArch64.
-    {% if base_arch != 's390x' %}
-        {% set ironic_pxe_packages = ironic_pxe_packages + [
-            'grub2-tools',
-            'grub2-efi-aa64-modules'
-        ] %}
-    {% endif %}
-
 {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
 {% elif base_package_type == 'deb' %}
     {% set ironic_pxe_packages = [
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index fe3f13c2d..1771181a3 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -26,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             {% set nova_base_packages = nova_base_packages + [
                 'edk2-aarch64'
             ] %}
-        {% elif base_arch == 'ppc64le' %}
-            {# NOTE(Jeffrey4l): no packages for ppc64le #}
         {% endif %}
 
     {% elif base_package_type == 'deb' %}
@@ -46,8 +44,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             {% set nova_base_packages = nova_base_packages + [
                 'qemu-efi',
             ] %}
-        {% elif base_arch == 'ppc64le' %}
-            {# NOTE(Jeffrey4l): no packages for ppc64le #}
         {% endif %}
     {% endif %}
 
@@ -67,8 +63,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             {% set nova_base_packages = nova_base_packages + [
                 'edk2-aarch64'
             ] %}
-        {% elif base_arch == 'ppc64le' %}
-            {# NOTE(Jeffrey4l): no packages for ppc64le #}
         {% endif %}
 
     {% elif base_package_type == 'deb' %}
@@ -90,8 +84,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             {% set nova_base_packages = nova_base_packages + [
                 'qemu-efi',
             ] %}
-        {% elif base_arch == 'ppc64le' %}
-            {# NOTE(Jeffrey4l): no packages for ppc64le #}
         {% endif %}
 
     {% endif %}