From ac2d7693e02a11d80879ccd80dc33a4f213295e6 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Sun, 19 Feb 2017 15:14:40 -0500 Subject: Add support for inline config changes This patch changes VPP configuration from file template to inline change directly. This prevents issue with overwriting existing VPP config. Change-Id: I4133be8ebe689d9288e3a8e64cca43afd7e42e64 Signed-off-by: Feng Pan --- manifests/config.pp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'manifests/config.pp') diff --git a/manifests/config.pp b/manifests/config.pp index aeac676..b74f6d4 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -3,14 +3,21 @@ # This class handles fdio config changes. # class fdio::config { - file { '/etc/vpp/startup.conf': - content => template('fdio/startup.conf.erb'), + + vpp_config { + 'dpdk/dev/default': value => $fdio::vpp_dpdk_dev_default_options; + 'dpdk/uio-driver': value => $fdio::vpp_dpdk_uio_driver; + 'cpu/main-core': value => $fdio::vpp_cpu_main_core; + 'cpu/corelist-workers': value => $fdio::vpp_cpu_corelist_workers; } + fdio::config::vpp_devices { $fdio::vpp_dpdk_devs: } + # ensure that dpdk module is loaded + $dpdk_pmd_real = regsubst($fdio::vpp_dpdk_uio_driver, '-', '_', 'G') exec { 'insert_dpdk_kmod': - command => "modprobe ${::fdio::vpp_dpdk_uio_driver}", - unless => "lsmod | grep ${::fdio::vpp_dpdk_uio_driver}", + command => "modprobe ${fdio::vpp_dpdk_uio_driver}", + unless => "lsmod | grep ${dpdk_pmd_real}", path => '/bin:/sbin', } } -- cgit 1.2.3-korg