diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-11-16 15:29:03 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-11-16 15:52:30 +0000 |
| commit | ba0ef14c47d7372374af3f7c664fb4fa490dc7ea (patch) | |
| tree | 62d81599c09699c4d8f77c9840b03122f5b94b9d | |
| parent | 7b6f6a054c1a91451ebf655d613c291a818fa8de (diff) | |
| download | kolla-ba0ef14c47d7372374af3f7c664fb4fa490dc7ea.tar.gz kolla-ba0ef14c47d7372374af3f7c664fb4fa490dc7ea.zip | |
CentOS: do not use advanced-virtualization repo
virt:rhel module provides libvirt 7.9.0 and we have it enabled
Change-Id: Id585c7744ba130ad1dfc28138fb0f9e6eeae771d
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b659ed580..26a6bd218 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -161,7 +161,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-advanced-virtualization', 'centos-release-ceph-pacific', 'centos-release-nfv-extras', 'centos-release-nfv-openvswitch', @@ -177,14 +176,13 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {% set base_centos_yum_repos_to_enable = [ ] %} -# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') need -# to go away - they are from delorean or rdo-release-wallaby package +# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') are +# from delorean or rdo-release-* package # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ 'advanced-virtualization', 'centos-nfv-extras', 'centos-nfv-ovs', - 'centos-advanced-virtualization', 'centos-ceph-pacific', 'centos-nfv-openvswitch', 'centos-opstools', diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 465139e2f..c848c1ed4 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -11,7 +11,6 @@ centos: haproxy: "centos-nfv-extras" influxdb: "influxdb" kibana: "elasticsearch-kibana-logstash-7.x" - libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" mariadb: "mariadb" openvswitch: "centos-nfv-openvswitch" @@ -32,7 +31,6 @@ centos-aarch64: hacluster: "ha" haproxy: "centos-nfv-extras" kibana: "elasticsearch-kibana-logstash-7.x" - libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" mariadb: "mariadb" openvswitch: "centos-nfv-openvswitch" |