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:
parent
4a1ecf50a5
commit
cecf9e902c
@ -1,4 +1,5 @@
|
|||||||
# Vendored from rdo-release: https://github.com/rdo-infra/rdo-release
|
# Vendored from rdo-release: https://github.com/rdo-infra/rdo-release
|
||||||
|
{% if ansible_distribution == 'CentOS' %}
|
||||||
[centos-openstack-queens]
|
[centos-openstack-queens]
|
||||||
name=CentOS OpenStack Queens Repository
|
name=CentOS OpenStack Queens Repository
|
||||||
{% if zuul_site_mirror_fqdn is defined %}
|
{% if zuul_site_mirror_fqdn is defined %}
|
||||||
@ -9,3 +10,10 @@ baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-queens/
|
|||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
enabled=1
|
enabled=1
|
||||||
gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud
|
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 %}
|
3
roles/multi-node-bridge/vars/CentOS.yaml
Normal file
3
roles/multi-node-bridge/vars/CentOS.yaml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
ovs_package: "openvswitch"
|
||||||
|
ovs_service: "openvswitch"
|
3
roles/multi-node-bridge/vars/Fedora.yaml
Normal file
3
roles/multi-node-bridge/vars/Fedora.yaml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
ovs_package: "openvswitch"
|
||||||
|
ovs_service: "openvswitch"
|
@ -1,3 +1,3 @@
|
|||||||
---
|
---
|
||||||
ovs_package: "openvswitch"
|
ovs_package: "rhosp-openvswitch"
|
||||||
ovs_service: "openvswitch"
|
ovs_service: "openvswitch"
|
||||||
|
Loading…
Reference in New Issue
Block a user