openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2018-04-18 18:07:24 +00:00 committed by Gerrit Code Review
parent 71e054f742 90d1181194
commit 06a4393bfd
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
parameter_defaults:
NeutronVhostuserSocketGroup: "hugetlbfs"

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

@ -52,6 +52,20 @@ parameters:
default: ""
description: The vhost-user socket directory for OVS
type: string
NeutronVhostuserSocketGroup:
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:
default: "qemu"
description: >
The vhost-user socket directory user name.
Defaults to 'qemu'. When vhostuser mode is 'dpdkvhostuserclient'
(which is the default mode), the vhost socket is created by qemu.
type: string
resources:
@ -61,7 +75,6 @@ resources:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
OpenVswitchUpgrade:
type: ./openvswitch-upgrade.yaml
@ -79,11 +92,16 @@ 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}
vswitch::dpdk::host_core_list: {get_param: HostCpusList}
vswitch::dpdk::pmd_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}
step_config: {get_attr: [NeutronOvsAgent, role_data, step_config]}
upgrade_tasks:
get_attr: [OpenVswitchUpgrade, role_data, upgrade_tasks]