From a9b8980b5b933d1b09134ff1ab2d7601d76c40c2 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Wed, 22 Mar 2017 10:20:43 -0400
Subject: Add parameter for dpdk-plugin support

DPDK is now an optional plugin shipped in vpp-plugins package, adding
parameter vpp_dpdk_support which defaults to true to support configuration
of DPDK related options.

JIRA: PUP-2

Change-Id: Ie033e2b6cd871c8f8b644499a0283949a0039bf6
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 manifests/config.pp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'manifests/config.pp')

diff --git a/manifests/config.pp b/manifests/config.pp
index b74f6d4..b1ed7ad 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -4,20 +4,25 @@
 #
 class fdio::config {
 
+  if $fdio::vpp_dpdk_support {
+    # 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 ${dpdk_pmd_real}",
+      path    => '/bin:/sbin',
+    }
+
+    vpp_config {
+      'dpdk/dev/default': value => $fdio::vpp_dpdk_dev_default_options;
+      'dpdk/uio-driver': value => $fdio::vpp_dpdk_uio_driver;
+    }
+
+    fdio::config::vpp_devices {  $fdio::vpp_dpdk_devs: }
+  }
+
   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 ${dpdk_pmd_real}",
-    path    => '/bin:/sbin',
-  }
 }
-- 
cgit 1.2.3-korg