diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /tests/templates | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'tests/templates')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index d90524c1f..d3726bb5d 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -31,35 +31,12 @@ RUN sed -i \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/CentOS-*.repo {% raw %} -{% if distro_package_manager == 'yum' %} -{% endraw %} -# FIXME(mgoddard): No crmsh or opendaylight 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 %} {% 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 %} |