diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-29 11:55:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-29 11:55:19 +0000 |
| commit | 7bec0316a8367aca0af54674f574b5d4f9c2721f (patch) | |
| tree | 85d7e44eb97d5942094ccc4e7bafc653764b9704 /tests/templates | |
| parent | 1439f839d42882c80ce81a1061dc52256df69fba (diff) | |
| parent | 3c618a1f6f0beca723e031fbe323b159400ad08f (diff) | |
| download | kolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.tar.gz kolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.zip | |
Merge "CentOS 8: base and openstack-base images"
Diffstat (limited to 'tests/templates')
| -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 c25ddb928..d61f65d81 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 %} |