aboutsummaryrefslogtreecommitdiff
path: root/tests/templates
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-16 13:14:01 +0000
committerGerrit Code Review <review@openstack.org>2019-09-16 13:14:01 +0000
commitb8950dbfae16e4959e7e502b584018fc8e58eaaf (patch)
tree3ba91b21b8935d677c75b74dbcab958e9f40781d /tests/templates
parentb98182d9e9146144dfa711f6ee91bcca5d2708b1 (diff)
parent016c0f577c535def40dd32ddf41e6cb145a2f9b8 (diff)
downloadkolla-b8950dbfae16e4959e7e502b584018fc8e58eaaf.tar.gz
kolla-b8950dbfae16e4959e7e502b584018fc8e58eaaf.zip
Merge "Drop Percona XtraBackup in favour of MariaDB Backup"
Diffstat (limited to 'tests/templates')
-rw-r--r--tests/templates/template_overrides.j23
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 22baa2a56..adc0194a9 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -33,7 +33,6 @@ RUN sed -i -e "/^mirrorlist/ d" \
{% if base_distro == "centos" %}
{% endraw %}
-## NOTE(yoctozepto): GPG key location is replaced for Percona repo only
## TODO(yoctozepto): CentOS hits external EPEL repo for its repo package (epel-release-*.rpm), should use the mirrored
RUN sed -i \
-e "/^mirrorlist/ d" \
@@ -46,7 +45,6 @@ RUN sed -i \
&& sed -i \
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
-e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \
- -e "s|https://repo.percona.com|{{ nodepool_percona_proxy }}|g" \
/etc/yum.repos.d/*.repo
{% raw %}
@@ -56,7 +54,6 @@ RUN sed -i \
## TODO(yoctozepto): replace base repo earlier as well (like RHEL-based do)
RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \
-e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
- -e "s|http://repo.percona.com|{{ nodepool_percona_proxy }}|" \
/etc/apt/sources.list \
&& apt-get update