From 4b35eb5e241147fb38cf81a11ba63b6ac7c77f90 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 16 Dec 2019 17:54:56 +0000 Subject: CentOS 8: base and openstack-base images Adds support to the base and openstack-base images for CentOS 8. These images have been removed from the list of unbuildable images, and replaced with all dependent images. This change also includes backports of a number of other changes related to the base image: * CentOS 8: disable repo_gpgcheck for grafana image (Ice120e8001fd9e8bb37ca4f2df26259cf798ee0e) * CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB (Ibbb720390ff17e11249a5aa77163c15c0971209a) Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a Partially-Implements: blueprint centos-rhel-8 (cherry picked from commit 3c618a1f6f0beca723e031fbe323b159400ad08f) --- tests/templates/template_overrides.j2 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index d907a8dcd..3b88ba8e4 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -29,13 +29,20 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow- RUN sed -i \ -e "/^mirrorlist/ d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ - /etc/yum.repos.d/CentOS-*.repo \ - && sed -i \ + /etc/yum.repos.d/CentOS-*.repo +{% raw %} +{% if distro_package_manager == 'yum' %} +{% endraw %} +# FIXME(mgoddard): No crmsh or openstacklight CentOS 8 repos yet. +RUN sed -i \ -e "s|http://download.opensuse.org|http://{{ nodepool_mirror_host }}/opensuse|" \ /etc/yum.repos.d/crmsh.repo \ && sed -i \ -e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \ /etc/yum.repos.d/opendaylight.repo +{% raw %} +{% endif %} +{% endraw %} {% raw %} {% endblock %} @@ -55,6 +62,7 @@ RUN sed -i \ && sed -i \ -e "/^metalink/ d" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^#baseurl=https://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/epel*.repo \ {% raw %} {% endblock %} -- cgit v1.2.3