openstack
/
fuel-library
Code Issues Proposed changes

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
This commit is contained in:
Vladimir Eremin 2016-03-28 21:11:15 +03:00
parent 2bed73d4d2
commit 8cc40ff5ac
No known key found for this signature in database
GPG Key ID: 2E97FC2056F3E83F
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/l23network/manifests/l2/dpdk.pp
View File

@ -35,8 +35,6 @@ class l23network::l2::dpdk (
$dpdk_dir = $::l23network::params::dpdk_dir, $dpdk_dir = $::l23network::params::dpdk_dir,
$dpdk_conf_file = $::l23network::params::dpdk_conf_file, $dpdk_conf_file = $::l23network::params::dpdk_conf_file,
$dpdk_interfaces_file = $::l23network::params::dpdk_interfaces_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, $ovs_default_file = $::l23network::params::ovs_default_file,
$install_ovs = true, $install_ovs = true,
$ensure_package = 'present', $ensure_package = 'present',

6
deployment/puppet/l23network/manifests/params.pp
View File

@ -21,8 +21,6 @@ class l23network::params {
$dpdk_dir = '/etc/dpdk' $dpdk_dir = '/etc/dpdk'
$dpdk_conf_file = '/etc/dpdk/dpdk.conf' $dpdk_conf_file = '/etc/dpdk/dpdk.conf'
$dpdk_interfaces_file = '/etc/dpdk/interfaces' $dpdk_interfaces_file = '/etc/dpdk/interfaces'
$ovs_socket_dir_group = 'libvirt-qemu'
$ovs_socket_dir = '/var/run/openvswitch'
$ovs_kern_module_name = 'openvswitch' $ovs_kern_module_name = 'openvswitch'
$network_manager_name = 'network-manager' $network_manager_name = 'network-manager'
$extra_tools = 'iputils-arping' $extra_tools = 'iputils-arping'
@ -45,8 +43,6 @@ class l23network::params {
$dpdk_dir = undef $dpdk_dir = undef
$dpdk_conf_file = undef $dpdk_conf_file = undef
$dpdk_interfaces_file = undef $dpdk_interfaces_file = undef
$ovs_socket_dir_group = undef
$ovs_socket_dir = undef
$ovs_datapath_package_name = $::l23_os ? { $ovs_datapath_package_name = $::l23_os ? {
/(?i)oraclelinux/ => 'kmod-openvswitch-uek', /(?i)oraclelinux/ => 'kmod-openvswitch-uek',
default => 'kmod-openvswitch', default => 'kmod-openvswitch',
@ -73,8 +69,6 @@ class l23network::params {
$dpdk_dir = undef $dpdk_dir = undef
$dpdk_conf_file = undef $dpdk_conf_file = undef
$dpdk_interfaces_file = undef $dpdk_interfaces_file = undef
$ovs_socket_dir_group = undef
$ovs_socket_dir = undef
$ovs_datapath_package_name = undef $ovs_datapath_package_name = undef
$ovs_common_package_name = undef $ovs_common_package_name = undef
$ovs_kern_module_name = undef $ovs_kern_module_name = undef

11
deployment/puppet/l23network/templates/openvswitch_default_Debian.erb
View File

@ -1,13 +1,6 @@
/etc/init.d/dpdk start /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 # LP 1546565
umask 0002 umask 0000
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 -%>