openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Configure qemu group setting as hugetlbfs for ovs-dpdk" into stable/newton

This commit is contained in:
Zuul 2018-04-21 13:56:02 +00:00 committed by Gerrit Code Review
parent 7f736c2e0c 73b8384a19
commit 361f20ebda
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/ovs-dpdk-permissions.yaml Normal file
View File

@ -0,0 +1,2 @@
parameter_defaults:
VhostuserSocketGroup: "hugetlbfs"

10
puppet/services/neutron-ovs-dpdk-agent.yaml
View File

@ -47,14 +47,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.
@ -82,13 +82,13 @@ 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::core_list: {get_param: NeutronDpdkCoreList}
vswitch::dpdk::memory_channels: {get_param: NeutronDpdkMemoryChannels}
vswitch::dpdk::socket_mem: {get_param: NeutronDpdkSocketMemory}
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]}

7
releasenotes/notes/ovs-dpdk-permissions-50c5b33334ff4711.yaml Normal file
View File

@ -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.