From cecf9e902ce73b83d9329c364b2f6d2324a305db Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Mon, 5 Aug 2019 13:38:23 +0300
Subject: [PATCH] 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
---
 .../templates/zuul-multi-node-bridge-ovs.repo.j2          | 8 ++++++++
 roles/multi-node-bridge/vars/CentOS.yaml                  | 3 +++
 roles/multi-node-bridge/vars/Fedora.yaml                  | 3 +++
 roles/multi-node-bridge/vars/RedHat.yaml                  | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 roles/multi-node-bridge/vars/CentOS.yaml
 create mode 100644 roles/multi-node-bridge/vars/Fedora.yaml

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 ae6b0643a..3621474bc 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
@@ -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 %}
\ No newline at end of file
diff --git a/roles/multi-node-bridge/vars/CentOS.yaml b/roles/multi-node-bridge/vars/CentOS.yaml
new file mode 100644
index 000000000..19618923f
--- /dev/null
+++ b/roles/multi-node-bridge/vars/CentOS.yaml
@@ -0,0 +1,3 @@
+---
+ovs_package: "openvswitch"
+ovs_service: "openvswitch"
diff --git a/roles/multi-node-bridge/vars/Fedora.yaml b/roles/multi-node-bridge/vars/Fedora.yaml
new file mode 100644
index 000000000..19618923f
--- /dev/null
+++ b/roles/multi-node-bridge/vars/Fedora.yaml
@@ -0,0 +1,3 @@
+---
+ovs_package: "openvswitch"
+ovs_service: "openvswitch"
diff --git a/roles/multi-node-bridge/vars/RedHat.yaml b/roles/multi-node-bridge/vars/RedHat.yaml
index 19618923f..1ae946d9e 100644
--- a/roles/multi-node-bridge/vars/RedHat.yaml
+++ b/roles/multi-node-bridge/vars/RedHat.yaml
@@ -1,3 +1,3 @@
 ---
-ovs_package: "openvswitch"
+ovs_package: "rhosp-openvswitch"
 ovs_service: "openvswitch"