From 8cc40ff5ac66f9c10b663903099cd9a90404b784 Mon Sep 17 00:00:00 2001
From: Vladimir Eremin <veremin@mirantis.com>
Date: Mon, 28 Mar 2016 21:11:15 +0300
Subject: [PATCH] Change umask 0002 to 0000 for vhostuser sockets

Due to unavailabitiy of libvirt-qemu group on netconfig time, it's
unable to set group correctly.

Change-Id: I09d7e99dbf8d2678502069458c3066fd1ffaf3f3
Closes-Bug: #1562985
---
 deployment/puppet/l23network/manifests/l2/dpdk.pp     |  2 --
 deployment/puppet/l23network/manifests/params.pp      |  6 ------
 .../templates/openvswitch_default_Debian.erb          | 11 ++---------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/deployment/puppet/l23network/manifests/l2/dpdk.pp b/deployment/puppet/l23network/manifests/l2/dpdk.pp
index 78b8c0a352..a614a361a8 100644
--- a/deployment/puppet/l23network/manifests/l2/dpdk.pp
+++ b/deployment/puppet/l23network/manifests/l2/dpdk.pp
@@ -35,8 +35,6 @@ class l23network::l2::dpdk (
   $dpdk_dir                    = $::l23network::params::dpdk_dir,
   $dpdk_conf_file              = $::l23network::params::dpdk_conf_file,
   $dpdk_interfaces_file        = $::l23network::params::dpdk_interfaces_file,
-  $ovs_socket_dir_group        = $::l23network::params::ovs_socket_dir_group,
-  $ovs_socket_dir              = $::l23network::params::ovs_socket_dir,
   $ovs_default_file            = $::l23network::params::ovs_default_file,
   $install_ovs                 = true,
   $ensure_package              = 'present',
diff --git a/deployment/puppet/l23network/manifests/params.pp b/deployment/puppet/l23network/manifests/params.pp
index c549d234b1..62e7ffad7b 100644
--- a/deployment/puppet/l23network/manifests/params.pp
+++ b/deployment/puppet/l23network/manifests/params.pp
@@ -21,8 +21,6 @@ class l23network::params {
       $dpdk_dir                   = '/etc/dpdk'
       $dpdk_conf_file             = '/etc/dpdk/dpdk.conf'
       $dpdk_interfaces_file       = '/etc/dpdk/interfaces'
-      $ovs_socket_dir_group       = 'libvirt-qemu'
-      $ovs_socket_dir             = '/var/run/openvswitch'
       $ovs_kern_module_name       = 'openvswitch'
       $network_manager_name       = 'network-manager'
       $extra_tools                = 'iputils-arping'
@@ -45,8 +43,6 @@ class l23network::params {
       $dpdk_dir                   = undef
       $dpdk_conf_file             = undef
       $dpdk_interfaces_file       = undef
-      $ovs_socket_dir_group       = undef
-      $ovs_socket_dir             = undef
       $ovs_datapath_package_name  = $::l23_os ? {
                                       /(?i)oraclelinux/ => 'kmod-openvswitch-uek',
                                       default           => 'kmod-openvswitch',
@@ -73,8 +69,6 @@ class l23network::params {
       $dpdk_dir                   = undef
       $dpdk_conf_file             = undef
       $dpdk_interfaces_file       = undef
-      $ovs_socket_dir_group       = undef
-      $ovs_socket_dir             = undef
       $ovs_datapath_package_name  = undef
       $ovs_common_package_name    = undef
       $ovs_kern_module_name       = undef
diff --git a/deployment/puppet/l23network/templates/openvswitch_default_Debian.erb b/deployment/puppet/l23network/templates/openvswitch_default_Debian.erb
index f7e944fd3f..5c6c280ad3 100644
--- a/deployment/puppet/l23network/templates/openvswitch_default_Debian.erb
+++ b/deployment/puppet/l23network/templates/openvswitch_default_Debian.erb
@@ -1,13 +1,6 @@
 /etc/init.d/dpdk start
 
-export DPDK_OPTS="--dpdk <% if @ovs_socket_dir %>-vhost_sock_dir <%= @ovs_socket_dir %> <% end %>-c <%= @ovs_core_mask %> -n <%= @ovs_memory_channels %> --socket-mem <%= @ovs_socket_mem %>"
+export DPDK_OPTS="--dpdk -c <%= @ovs_core_mask %> -n <%= @ovs_memory_channels %> --socket-mem <%= @ovs_socket_mem %>"
 
-<% if @ovs_socket_dir -%>
 # LP 1546565
-umask 0002
-mkdir -p "<%= @ovs_socket_dir %>"
-<% if @ovs_socket_dir_group -%>
-chgrp "<%= @ovs_socket_dir_group %>" "<%= @ovs_socket_dir %>" || true
-<% end -%>
-chmod g+s "<%= @ovs_socket_dir %>"
-<% end -%>
+umask 0000