From c4c69586223ecc49e3986a5e82d7090e8f6622e7 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Tue, 18 Feb 2020 16:52:23 +0100 Subject: [PATCH] Use centos8 deps repo for RHEL8 nodes CentOS8 deps should be compatible with RHEL and provide latest versions of deps compared to the old rhel8 one. Let's switch to use it to install openvswitch too. Change-Id: I04090a179706c52e3db4e9118b74f7c7d5ad9776 --- .../templates/zuul-multi-node-bridge-ovs.repo.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 index eab30dcc1..fb63ba0e2 100644 --- a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 +++ b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 @@ -10,13 +10,7 @@ baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-queens/ gpgcheck=1 enabled=1 gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud -{% elif ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 %} -[RDO-RHEL8-deps] -name=RedHat OpenStack deps repo -baseurl=https://trunk.rdoproject.org/rhel8-master/deps/latest/ -gpgcheck=0 -enabled=1 -{% elif ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 8 %} +{% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int >= 8 %} [RDO-CentOS8-deps] name=CentOS OpenStack deps repo baseurl=https://trunk.rdoproject.org/centos8-master/deps/latest/