From 45877c692bc80236f8e40874fa23157a4c2775b4 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Fri, 10 Feb 2023 14:24:54 +0100
Subject: [PATCH] Install openvswitch repo for RDO scenario

RDO packages for nova does depend on python3-openvswitch,
which makes it required to install OVS on computes regardless
of everything else.

We also clean out pre-rhel9 variable files as they're not needed anymore

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/872896
Change-Id: I3e31254b7dd1c0ff3cb46153cefce6f6cadd52aa
---
 tasks/nova_install.yml | 10 +++++
 vars/redhat-9.yml      | 86 ------------------------------------------
 vars/redhat.yml        |  5 ++-
 3 files changed, 14 insertions(+), 87 deletions(-)
 delete mode 100644 vars/redhat-9.yml

diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml
index 5fc65e02..be692cf6 100644
--- a/tasks/nova_install.yml
+++ b/tasks/nova_install.yml
@@ -25,6 +25,16 @@
     filter: ansible_local
     gather_subset: "!all"
 
+- name: Add dependency repos for RDO
+  package:
+    name: "{{ nova_distro_repos }}"
+    state: "{{ nova_package_state }}"
+  retries: 5
+  delay: 2
+  when:
+    - ansible_facts['pkg_mgr'] == 'dnf'
+    - nova_install_method == 'distro'
+
 - name: Install distro packages
   package:
     name: "{{ nova_package_list }}"
diff --git a/vars/redhat-9.yml b/vars/redhat-9.yml
deleted file mode 100644
index 8861bf1c..00000000
--- a/vars/redhat-9.yml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-nova_qemu_user: qemu
-nova_qemu_group: qemu
-libvirt_group: libvirt
-libvirt_service_name:
-  - libvirtd.socket
-  - libvirtd.service
-
-# Common yum packages
-nova_distro_packages:
-  - git
-  - iptables
-  - libxml2
-
-nova_devel_distro_packages:
-  - libxml2-devel
-  - systemd-devel
-
-nova_service_distro_packages:
-  - openstack-nova-api
-  - openstack-nova-conductor
-  - openstack-nova-scheduler
-  - python3-memcached
-  - python3-PyMySQL
-  - python3-systemd
-
-nova_service_extra_distro_packages:
-  kvm:
-    - openstack-nova-compute
-    - openstack-nova-migration
-  novnc:
-    - openstack-nova-novncproxy
-  spice:
-    - openstack-nova-spicehtml5proxy
-  serialconsole:
-    - openstack-nova-serialproxy
-
-nova_compute_packages:
-  - dosfstools
-  - xorriso
-  - kpartx
-  - nc
-  - python3-libguestfs
-  - sysfsutils
-
-nova_compute_barbican_distro_packages:
-  - cryptsetup
-
-nova_compute_kvm_distro_packages:
-  - libvirt-daemon-kvm
-  - qemu-kvm
-  - libvirt-client
-  - python3-libvirt
-  - nfs-utils
-  - python3-libguestfs
-  - qemu-img
-  - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('AAVMF', 'OVMF') }}"
-
-nova_compute_kvm_packages_to_symlink:
-  - python3-libvirt
-  - python3-libguestfs
-
-nova_compute_kvm_pip_packages:
-  - http://download.libguestfs.org/python/guestfs-1.40.2.tar.gz
-  - libvirt-python==6.6.0
-
-nova_compute_ksm_packages:
-  - ksmtuned
-
-nova_compute_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5
diff --git a/vars/redhat.yml b/vars/redhat.yml
index cd51aa8b..004823b5 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -26,6 +26,9 @@ nova_distro_packages:
   - iptables
   - libxml2
 
+nova_distro_repos:
+  - centos-release-nfv-openvswitch
+
 nova_devel_distro_packages:
   - libxml2-devel
   - systemd-devel
@@ -51,7 +54,7 @@ nova_service_extra_distro_packages:
 
 nova_compute_packages:
   - dosfstools
-  - genisoimage
+  - xorriso
   - kpartx
   - nc
   - python3-libguestfs