openstack/kolla
Code Issues Proposed changes

Merge "CentOS: do not use advanced-virtualization repo"

Browse Source
This commit is contained in:
Zuul 2021-12-09 15:31:55 +00:00 committed by Gerrit Code Review
commit 2748ff4a8f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/base/Dockerfile.j2
View File

@ -161,7 +161,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
] %} ] %}
{% set base_centos_yum_repo_packages = [ {% set base_centos_yum_repo_packages = [
'centos-release-advanced-virtualization',
'centos-release-ceph-pacific', 'centos-release-ceph-pacific',
'centos-release-nfv-extras', 'centos-release-nfv-extras',
'centos-release-nfv-openvswitch', 'centos-release-nfv-openvswitch',
@ -177,14 +176,13 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
{% set base_centos_yum_repos_to_enable = [ {% set base_centos_yum_repos_to_enable = [
] %} ] %}
# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') need # FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') are
# to go away - they are from delorean or rdo-release-wallaby package # from delorean or rdo-release-* package
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
{% set base_centos_yum_repos_to_disable = [ {% set base_centos_yum_repos_to_disable = [
'advanced-virtualization', 'advanced-virtualization',
'centos-nfv-extras', 'centos-nfv-extras',
'centos-nfv-ovs', 'centos-nfv-ovs',
'centos-advanced-virtualization',
'centos-ceph-pacific', 'centos-ceph-pacific',
'centos-nfv-openvswitch', 'centos-nfv-openvswitch',
'centos-opstools', 'centos-opstools',

2
kolla/template/repos.yaml
View File

@ -11,7 +11,6 @@ centos:
haproxy: "centos-nfv-extras" haproxy: "centos-nfv-extras"
influxdb: "influxdb" influxdb: "influxdb"
kibana: "elasticsearch-kibana-logstash-7.x" kibana: "elasticsearch-kibana-logstash-7.x"
libvirt: "centos-advanced-virtualization"
logstash: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x"
mariadb: "mariadb" mariadb: "mariadb"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"
@ -32,7 +31,6 @@ centos-aarch64:
hacluster: "ha" hacluster: "ha"
haproxy: "centos-nfv-extras" haproxy: "centos-nfv-extras"
kibana: "elasticsearch-kibana-logstash-7.x" kibana: "elasticsearch-kibana-logstash-7.x"
libvirt: "centos-advanced-virtualization"
logstash: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x"
mariadb: "mariadb" mariadb: "mariadb"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"