From 61459c64bb28cdfff01c3166f3a0b79009b8d473 Mon Sep 17 00:00:00 2001 From: Satish Patel Date: Sat, 14 Nov 2020 06:43:52 +0000 Subject: [PATCH] Add centos-8 support for ovs-dpdk changed /var/lib/vhost_socket dir owner/group permission for centos-8 and added openvswitch service name. Change-Id: Idedbef8b70cb42588c9c9ace9530df84a5d1f6ff --- defaults/main.yml | 2 -- tasks/providers/setup_ovs_dpdk.yml | 2 +- vars/debian.yml | 3 +++ vars/redhat.yml | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 81ab2c3c..3e5c2f15 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -459,5 +459,3 @@ ovs_dpdk_pmd_cpu_mask: 2 ovs_dpdk_socket_mem: "1024" ovs_dpdk_nr_1g_pages: 0 ovs_dpdk_nr_2m_pages: 0 -# (NOTE) (or "libvirtd", depending on your version of libvirt) -vhost_socket_directory_group: "libvirt" diff --git a/tasks/providers/setup_ovs_dpdk.yml b/tasks/providers/setup_ovs_dpdk.yml index 7a23ac47..672d4693 100644 --- a/tasks/providers/setup_ovs_dpdk.yml +++ b/tasks/providers/setup_ovs_dpdk.yml @@ -88,7 +88,7 @@ file: path: /var/lib/vhost_socket state: directory - owner: libvirt-qemu + owner: "{{ vhost_socket_directory_owner }}" group: "{{ vhost_socket_directory_group }}" mode: "0755" when: diff --git a/vars/debian.yml b/vars/debian.yml index 698c3596..8cfdad4a 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -31,6 +31,9 @@ neutron_ovs_dpdk_required_packages: dpdk_service_name: dpdk +vhost_socket_directory_group: "libvirt" +vhost_socket_directory_owner: "libvirt-qemu" + ## APT Cache options cache_timeout: 600 diff --git a/vars/redhat.yml b/vars/redhat.yml index 9ec51303..c27e95ef 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -19,6 +19,11 @@ neutron_repos: neutron_ovs_distro_packages: - openvswitch +dpdk_service_name: openvswitch + +vhost_socket_directory_group: hugetlbfs +vhost_socket_directory_owner: qemu + neutron_ovs_service_name: openvswitch neutron_ovn_northd_service_name: ovn-northd