diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-09 15:31:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-09 15:31:55 +0000 |
| commit | 2748ff4a8f983ed80b1f3abe3678202305b5ad0b (patch) | |
| tree | 823e91542990957faeebf59b5700fde8e3e4d4a6 | |
| parent | 0bae22d5f08761e16000a2cea52651c9df471d6e (diff) | |
| parent | ba0ef14c47d7372374af3f7c664fb4fa490dc7ea (diff) | |
| download | kolla-2748ff4a8f983ed80b1f3abe3678202305b5ad0b.tar.gz kolla-2748ff4a8f983ed80b1f3abe3678202305b5ad0b.zip | |
Merge "CentOS: do not use advanced-virtualization repo"
| -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 d66df8241..c5bf5a743 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" |