Don't install centos repos on RHEL

For running job on RHEL use openvswitch from RHEL8 deps repo,
because centos queens openvswitch causes conflicts with RHEL8
version.

Change-Id: Ia09227cb28ec4a4f9bdbb664b9c7caf714043e31
This commit is contained in:
Sagi Shnaidman 2019-08-05 13:38:23 +03:00
parent 4a1ecf50a5
commit cecf9e902c
4 changed files with 15 additions and 1 deletions

View File

@ -1,4 +1,5 @@
# Vendored from rdo-release: https://github.com/rdo-infra/rdo-release
{% if ansible_distribution == 'CentOS' %}
[centos-openstack-queens]
name=CentOS OpenStack Queens Repository
{% if zuul_site_mirror_fqdn is defined %}
@ -9,3 +10,10 @@ 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' %}
[RDO-RHEL8-deps]
name=RedHat Openstack deps repo
baseurl=https://trunk.rdoproject.org/rhel8-master/deps/latest/
gpgcheck=0
enabled=1
{% endif %}

View File

@ -0,0 +1,3 @@
---
ovs_package: "openvswitch"
ovs_service: "openvswitch"

View File

@ -0,0 +1,3 @@
---
ovs_package: "openvswitch"
ovs_service: "openvswitch"

View File

@ -1,3 +1,3 @@
---
ovs_package: "openvswitch"
ovs_package: "rhosp-openvswitch"
ovs_service: "openvswitch"