From de86346b73577025e5a416dfd423e3aae2e16e41 Mon Sep 17 00:00:00 2001
From: Janki Chhatbar <jchhatba@redhat.com>
Date: Fri, 5 Jan 2018 12:35:52 +0530
Subject: [PATCH] Configure qemu group setting as hugetlbfs for ovs-dpdk

Till now, the ovs service file and ovs-ctl command files
are patched to allow ovs to run with qemu group. In order
to remove this workarounds, a new group hugetlbfs is created
which will be shared between ovs and qemu. This patch contains
the changes required for applying these changes.

Patch-url: https://review.openstack.org/#/c/547961/

Change-Id: Id727a514610816c8223aa0dcd49a70caec29a21d
(cherry picked from commit 825bd7d9e13ccbdf552e3bb01718d043d83487c6)
---
 environments/ovs-dpdk-permissions.yaml                 |  3 +++
 puppet/services/neutron-ovs-dpdk-agent.yaml            | 10 +++++-----
 .../notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml   |  7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 environments/ovs-dpdk-permissions.yaml
 create mode 100644 releasenotes/notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml

diff --git a/environments/ovs-dpdk-permissions.yaml b/environments/ovs-dpdk-permissions.yaml
new file mode 100644
index 0000000000..e20cd57501
--- /dev/null
+++ b/environments/ovs-dpdk-permissions.yaml
@@ -0,0 +1,3 @@
+parameter_defaults:
+  VhostuserSocketGroup: "hugetlbfs"
+
diff --git a/puppet/services/neutron-ovs-dpdk-agent.yaml b/puppet/services/neutron-ovs-dpdk-agent.yaml
index 20e63fdc8c..51930987bb 100644
--- a/puppet/services/neutron-ovs-dpdk-agent.yaml
+++ b/puppet/services/neutron-ovs-dpdk-agent.yaml
@@ -52,14 +52,14 @@ parameters:
     default: ""
     description: The vhost-user socket directory for OVS
     type: string
-  NeutronVhostuserSocketGroup:
+  VhostuserSocketGroup:
     default: "qemu"
     description: >
       The vhost-user socket directory group name.
       Defaults to 'qemu'. When vhostuser mode is 'dpdkvhostuserclient'
       (which is the default mode), the vhost socket is created by qemu.
     type: string
-  NeutronVhostuserSocketUser:
+  VhostuserSocketUser:
     default: "qemu"
     description: >
       The vhost-user socket directory user name.
@@ -92,8 +92,8 @@ outputs:
           - neutron::agents::ml2::ovs::enable_dpdk: true
             neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
             neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}
-            vhostuser_socket_group: {get_param: NeutronVhostuserSocketGroup}
-            vhostuser_socket_user: {get_param: NeutronVhostuserSocketUser}
+            vhostuser_socket_group: {get_param: VhostuserSocketGroup}
+            vhostuser_socket_user: {get_param: VhostuserSocketUser}
             vswitch::dpdk::host_core_list: {get_param: HostCpusList}
             vswitch::dpdk::pmd_core_list: {get_param: NeutronDpdkCoreList}
             vswitch::dpdk::memory_channels: {get_param: NeutronDpdkMemoryChannels}
@@ -101,7 +101,7 @@ outputs:
             vswitch::dpdk::driver_type: {get_param: NeutronDpdkDriverType}
       service_config_settings:
         nova_libvirt:
-          nova::compute::libvirt::qemu::group: {get_param: NeutronVhostuserSocketGroup}
+          nova::compute::libvirt::qemu::group: {get_param: VhostuserSocketGroup}
       step_config: {get_attr: [NeutronOvsAgent, role_data, step_config]}
       upgrade_tasks:
         get_attr: [OpenVswitchUpgrade, role_data, upgrade_tasks]
diff --git a/releasenotes/notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml b/releasenotes/notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml
new file mode 100644
index 0000000000..3279834b36
--- /dev/null
+++ b/releasenotes/notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - Till now, the ovs service file and ovs-ctl command files are patched
+    to allow ovs to run with qemu group. In order to remove this
+    workarounds, a new group hugetlbfs is created which will be shared
+    between ovs and qemu. Use env file ovs-dpdk-permissions.yaml while
+    deploying.