diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-16 17:54:56 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-01-09 17:51:42 +0000 |
| commit | 3c618a1f6f0beca723e031fbe323b159400ad08f (patch) | |
| tree | 85832633cbb91d50c0fe06cdc4731e4b00e71b57 /tests | |
| parent | 946749312f31c36d9dac8ff3a545894e9043190d (diff) | |
| download | kolla-3c618a1f6f0beca723e031fbe323b159400ad08f.tar.gz kolla-3c618a1f6f0beca723e031fbe323b159400ad08f.zip | |
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.
Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a
Partially-Implements: blueprint centos-rhel-8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 9156a2a83..87d34244f 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 %} @@ -43,9 +50,16 @@ RUN sed -i \ {% block base_centos_repo_overrides_post_rpm %} {% endraw %} +{% raw %} +{% if distro_package_manager == 'yum' %} +{% endraw %} +# FIXME(mgoddard): No CentOS8 RDO repos mirrored yet. RUN sed -i \ -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ /etc/yum.repos.d/delorean*.repo +{% raw %} +{% endif %} +{% endraw %} {% raw %} {% endblock %} @@ -59,6 +73,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 %} |