openstack
/
fuel-library
Code Issues Proposed changes

Merge "Add vswitch module to librarian managed list"

This commit is contained in:
Jenkins 2016-12-12 10:45:19 +00:00 committed by Gerrit Code Review
parent 0886504483 f54691c036
commit 5035ca27e1
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/.gitignore vendored
View File

@ -46,3 +46,4 @@ puppet/xinetd
puppet/corosync
puppet/rabbitmq
puppet/pacemaker
puppet/vswitch

1
deployment/puppet/l23network/.fixtures.yml
View File

@ -17,3 +17,4 @@ fixtures:
stdlib: "#{source_dir}/../stdlib"
sysctl: "#{source_dir}/../sysctl"
filemapper: "#{source_dir}/../filemapper"
vswitch: "#{source_dir}/../vswitch"

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

@ -22,6 +22,12 @@
# [*ovs_memory_channels*]
# (optional) Number of memory channels in CPU
# Defaults to '2'
# [*ovs_vhost_owner*]
# (optional) vhost_user sockets owner/group
# Defaults to 'libvirt-qemu:kvm'
# [*ovs_vhost_perm*]
# (optional) vhost_user sockets permissions
# Defaults to '0664'
#
class l23network::l2::dpdk (
$use_dpdk = $::l23network::use_dpdk,
@ -30,6 +36,8 @@ class l23network::l2::dpdk (
$ovs_pmd_core_mask = undef,
$ovs_socket_mem = $::l23network::params::ovs_socket_mem,
$ovs_memory_channels = $::l23network::params::ovs_memory_channels,
$ovs_vhost_owner = $::l23network::params::ovs_vhost_owner,
$ovs_vhost_perm = $::l23network::params::ovs_vhost_perm,
$ovs_dpdk_package_name = $::l23network::params::ovs_dpdk_package_name,
$ovs_dpdk_dkms_package_name = $::l23network::params::ovs_dpdk_dkms_package_name,
$dpdk_dir = $::l23network::params::dpdk_dir,
@ -95,23 +103,25 @@ class l23network::l2::dpdk (
# Configure OVS DPDK PMD in runtime (it's safe to re-set it)
if $ovs_pmd_core_mask {
$ovs_pmd_core_mask_opts = { value => $ovs_pmd_core_mask }
$ovs_pmd_core_mask_opts = { value => "$ovs_pmd_core_mask" }
} else {
$ovs_pmd_core_mask_opts = { ensure => 'absent' }
}
$dpdk_extra_opts = "-n ${ovs_memory_channels} --vhost-owner ${ovs_vhost_owner} --vhost-perm ${ovs_vhost_perm}"
# Configure OpenVSwitch to use DPDK
$vs_config = {
'other_config:dpdk-init' => { value => 'true' },
'other_config:dpdk-socket-mem' => { value => $ovs_socket_mem },
'other_config:dpdk-lcore-mask' => { value => $ovs_core_mask },
'other_config:dpdk-extra' => { value => "-n ${ovs_memory_channels}" },
'other_config:pmd-cpu-mask' => { value => $ovs_pmd_core_mask_opts },
'other_config:dpdk-socket-mem' => { value => join($ovs_socket_mem, ',') },
'other_config:dpdk-lcore-mask' => { value => "$ovs_core_mask" },
'other_config:dpdk-extra' => { value => $dpdk_extra_opts },
'other_config:pmd-cpu-mask' => $ovs_pmd_core_mask_opts,
}
create_resources('vs_config', $vs_config)
Package<| title=='openvswitch-common' |> -> Vs_config<||> ~> Service['openvswitch-service']
Service['dpdk'] -> Vs_config<||> ~> Service['openvswitch-service']
# Install ifupdown scripts
if $::l23_os =~ /(?i)ubuntu/ {

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

@ -26,6 +26,8 @@ class l23network::params {
$ovs_core_mask = 0x1
$ovs_socket_mem = [256]
$ovs_memory_channels = 2
$ovs_vhost_owner = 'libvirt-qemu:kvm'
$ovs_vhost_perm = '0664'
}
/(?i)redhat|centos|oraclelinux/: {
$interfaces_dir = '/etc/sysconfig/network-scripts'
@ -52,6 +54,8 @@ class l23network::params {
$ovs_core_mask = 0x1
$ovs_socket_mem = [256]
$ovs_memory_channels = 2
$ovs_vhost_owner = 'libvirt-qemu:kvm'
$ovs_vhost_perm = '0664'
}
/(?i)darwin/: {
$interfaces_dir = '/tmp/1'
@ -73,6 +77,8 @@ class l23network::params {
$ovs_core_mask = undef
$ovs_socket_mem = undef
$ovs_memory_channels = undef
$ovs_vhost_owner = undef
$ovs_vhost_perm = undef
}
default: {
fail("Unsupported OS: ${::l23_os}/${::operatingsystem}")

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

@ -1,6 +0,0 @@
/etc/init.d/dpdk start
export DPDK_OPTS="--dpdk -c <%= @ovs_core_mask %> -n <%= @ovs_memory_channels %> --socket-mem <%= @ovs_socket_mem.join(',') %>"
# LP 1546565
umask 0000