x/fuel-plugin-contrail
Code Issues Proposed changes

Merge "vRouter thread count options updated" into fuel9-kilo

Browse Source
This commit is contained in:
Jenkins
2016-09-26 20:28:41 +00:00
committed by Gerrit Code Review
parent 88b7d8642f 8e22fd241b
commit 914435157f
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp
View File

@@ -114,15 +114,6 @@ class contrail::compute::vrouter {
'VIRTUAL-HOST-INTERFACE/ip': value => "${contrail::address}/${contrail::netmask_short}";
'VIRTUAL-HOST-INTERFACE/physical_interface': value => $contrail::phys_dev;
'SERVICE-INSTANCE/netns_command': value => '/usr/bin/opencontrail-vrouter-netns';
} ->
ini_setting { 'vrouter-threadcount':
ensure => present,
path => '/etc/contrail/supervisord_vrouter.conf',
section => 'supervisord',
setting => 'environment',
value => 'TBB_THREAD_COUNT=8',
notify => Service['supervisor-vrouter'],
}
if $contrail::gateway {
@@ -135,6 +126,11 @@ class contrail::compute::vrouter {
'DEFAULT/physical_interface_address' : value => $contrail::phys_dev_pci;
'DEFAULT/physical_interface_mac': value => $dpdk_dev_mac;
}
} else {
contrail_vrouter_agent_config {
'TASK/thread_count': value => '8';
'FLOWS/thread_count': value => '2';
}
}
contrail_vrouter_nodemgr_config {