diff --git a/doc/source/contributor/adding-a-new-image.rst b/doc/source/contributor/adding-a-new-image.rst index ef6c5d804f..f4bd5f633e 100644 --- a/doc/source/contributor/adding-a-new-image.rst +++ b/doc/source/contributor/adding-a-new-image.rst @@ -77,10 +77,6 @@ be built for some distribution/architecture/build-type combinations. "bifrost-base", # someone need to get upstream working first }, - 'ppc64le': { - "elasticsearch", # no binary package - }, - 'binary': { "bifrost-base", "blazar-base", diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 1025cf6e2c..91003360bf 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -74,11 +74,6 @@ aarch64 images :stub-columns: 1 :file: ./matrix_aarch64.csv -ppc64le images -============== - -.. note:: TODO - .. _unbuildable-images-list: Currently unbuildable images diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5ec3d2de3c..76feca6701 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 53339b6c99..0000000000 --- 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 d991827dc3..c3df3c6e31 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 700c4dfced..d165e66c0b 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 fe3f13c2d4..1771181a31 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 %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 9e56a1ee2d..64affd5f49 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -20,7 +20,7 @@ from kolla.version import version_info as version BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian'] -BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64'] +BASE_ARCH = ['x86_64', 'aarch64'] DEFAULT_BASE_TAGS = { 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'}, 'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'}, diff --git a/kolla/image/build.py b/kolla/image/build.py index d09a8b5e92..31f345c059 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -86,16 +86,6 @@ UNBUILDABLE_IMAGES = { "skydive-base", # no aarch64 binary }, - 'ppc64le': { - "elasticsearch", # no binary package - "grafana", # no binary package - "monasca-grafana", # no phantomJS - "prometheus-base", # no ppc64le binaries - "skydive-base", # no ppc64le binaries - "telegraf", # no binary package - "xtrabackup", # no binary package - }, - 'binary': { "bifrost-base", "blazar-base", @@ -115,12 +105,6 @@ UNBUILDABLE_IMAGES = { "tempest", # same reason as 'monasca-base' }, - 'source+ppc64le': { - "monasca-base", # pypi 'confluent-kafka' requires newer libfdkafka-dev - # than distributions have - "tempest", # same reason as 'monasca-base' - }, - 'centos': { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package @@ -151,12 +135,6 @@ UNBUILDABLE_IMAGES = { "telegraf", # no binary package }, - 'centos+ppc64le': { - "hacluster-pcs", # no binary package - "influxdb", # no binary package - "kibana", # no binary package - }, - "centos+binary": { "masakari-base", }, @@ -676,8 +654,6 @@ class KollaWorker(object): self.debian_arch = 'arm64' elif self.base_arch == 'x86_64': self.debian_arch = 'amd64' - elif self.base_arch == 'ppc64le': - self.debian_arch = 'ppc64el' self.images = list() self.openstack_release = conf.openstack_release self.docker_healthchecks = conf.docker_healthchecks diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index f522a9e85c..2733e0a90f 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -37,20 +37,6 @@ centos-aarch64: rabbitmq: "rabbitmq_rabbitmq-server" td-agent: "treasuredata" -centos-ppc64le: - ceph: "centos-ceph-nautilus" - elasticsearch: "elasticsearch-kibana-logstash-7.x" - epel: "epel" - epel-modular: "epel-modular" - extras: "extras" - hacluster: "ha" - libvirt: "centos-advanced-virtualization" - logstash: "elasticsearch-kibana-logstash-7.x" - openvswitch: "centos-nfv-openvswitch" - opstools: "centos-opstools" - powertools: "powertools" - rabbitmq: "rabbitmq_rabbitmq-server" - rhel: erlang: "centos-rabbitmq-38" hacluster: "ha" @@ -99,7 +85,3 @@ ubuntu-aarch64: mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main" rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main" td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" - -ubuntu-ppc64le: - mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main" - rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main" diff --git a/releasenotes/notes/drop-ppc64le-516442a16cc9f27c.yaml b/releasenotes/notes/drop-ppc64le-516442a16cc9f27c.yaml new file mode 100644 index 0000000000..ac1c5ba507 --- /dev/null +++ b/releasenotes/notes/drop-ppc64le-516442a16cc9f27c.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for building containers for ppc64le architecture was dropped.