Prepare for voxpupuli-puppet-lint-plugins
Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: If7634f12d8cd965784791f60515e8b16532ec1e3 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -125,7 +125,6 @@ class vswitch::dpdk (
|
||||
Hash $vs_config = {},
|
||||
Boolean $skip_restart = false,
|
||||
) {
|
||||
|
||||
$restart = !$skip_restart
|
||||
|
||||
kmod::load { 'vfio-pci': }
|
||||
@@ -147,12 +146,12 @@ class vswitch::dpdk (
|
||||
|
||||
$dpdk_configs = {
|
||||
'other_config:dpdk-extra' => { value => $memory_channels_conf, restart => $restart },
|
||||
'other_config:dpdk-socket-mem' => { value => join(any2array($socket_mem), ','), restart => $restart},
|
||||
'other_config:dpdk-socket-limit' => { value => join(any2array($socket_limit), ','), restart => $restart},
|
||||
'other_config:dpdk-lcore-mask' => { value => $dpdk_lcore_mask, restart => $restart},
|
||||
'other_config:pmd-cpu-mask' => { value => $pmd_core_mask, restart => $restart},
|
||||
'other_config:n-revalidator-threads' => { value => $revalidator_cores},
|
||||
'other_config:n-handler-threads' => { value => $handler_cores},
|
||||
'other_config:dpdk-socket-mem' => { value => join(any2array($socket_mem), ','), restart => $restart },
|
||||
'other_config:dpdk-socket-limit' => { value => join(any2array($socket_limit), ','), restart => $restart },
|
||||
'other_config:dpdk-lcore-mask' => { value => $dpdk_lcore_mask, restart => $restart },
|
||||
'other_config:pmd-cpu-mask' => { value => $pmd_core_mask, restart => $restart },
|
||||
'other_config:n-revalidator-threads' => { value => $revalidator_cores },
|
||||
'other_config:n-handler-threads' => { value => $handler_cores },
|
||||
}
|
||||
|
||||
$dpdk_dependencies = {
|
||||
@@ -258,7 +257,6 @@ class vswitch::dpdk (
|
||||
wait => false,
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
vs_config {
|
||||
'other_config:pmd-auto-lb': ensure => absent, wait => false;
|
||||
@@ -291,5 +289,4 @@ class vswitch::dpdk (
|
||||
|
||||
create_resources('vs_config', $dpdk_configs, $dpdk_dependencies)
|
||||
create_resources('vs_config', $vs_config)
|
||||
|
||||
}
|
||||
|
@@ -42,7 +42,7 @@
|
||||
# immedicate network distuption caused by restarting the ovs daemon.
|
||||
# Defaults to false.
|
||||
#
|
||||
class vswitch::ovs(
|
||||
class vswitch::ovs (
|
||||
String[1] $package_name,
|
||||
String[1] $service_name,
|
||||
String $package_ensure = 'present',
|
||||
@@ -52,7 +52,6 @@ class vswitch::ovs(
|
||||
Hash $vs_config = {},
|
||||
Boolean $skip_restart = false,
|
||||
) {
|
||||
|
||||
$restart = !$skip_restart
|
||||
|
||||
if $enable_hw_offload {
|
||||
|
@@ -3,7 +3,6 @@
|
||||
# Initialize CA authority
|
||||
#
|
||||
class vswitch::pki::cacert {
|
||||
|
||||
exec { 'ovs-pki-init-ca-authority':
|
||||
command => ['ovs-pki', 'init', '--force'],
|
||||
creates => '/var/lib/openvswitch/pki/switchca',
|
||||
|
@@ -8,10 +8,9 @@
|
||||
# (Optional) The directory in which the cert files are generated.
|
||||
# Defaults to '/etc/openvswitch'
|
||||
#
|
||||
define vswitch::pki::cert(
|
||||
define vswitch::pki::cert (
|
||||
Stdlib::Absolutepath $cert_dir = '/etc/openvswitch',
|
||||
) {
|
||||
|
||||
exec { "ovs-req-and-sign-cert-${name}":
|
||||
command => ['ovs-pki', 'req+sign', $name],
|
||||
cwd => $cert_dir,
|
||||
|
Reference in New Issue
Block a user