SM-DPDK: add uio_driver support

Closes-Bug: #1656060 1. add new variable for supporting uio_driver. Change-Id: I0c29a4f9ffc06c81c8747b4f75bb59b7688035df
Juniper · Feb 2, 2017 · 7ac049a · 7ac049a
1 parent 755f704
commit 7ac049a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/compute/config.pp b/contrail/environment/modules/contrail/manifests/compute/config.pp
@@ -55,6 +55,7 @@
   $upgrade_needed     = $::contrail::params::upgrade_needed,
   $qos                = $::contrail::params::qos,
   $core_mask          = $::contrail::params::core_mask,
+  $uio_driver         = $::contrail::params::uio_driver,
   $vncproxy_url       = $::contrail::params::vncproxy_base_url,
   $keystone_version   = $::contrail::params::keystone_version,
 ){
@@ -340,6 +341,7 @@
     'DEFAULT/platform' : value => "$contrail_work_mode";
     'DEFAULT/physical_interface_address' : value => "$pci_address";
     'DEFAULT/physical_interface_mac' : value => "$contrail_macaddr";
+    'DEFAULT/physical_uio_driver' : value => "$uio_driver";
     'DEFAULT/xmpp_dns_auth_enable' : value => "$xmpp_dns_auth_enable";
     'DISCOVERY/server' : value => "$discovery_ip";
     'DISCOVERY/max_control_nodes' : value => "$number_control_nodes";

diff --git a/contrail/environment/modules/contrail/manifests/init.pp b/contrail/environment/modules/contrail/manifests/init.pp
@@ -739,6 +739,7 @@
     $package_sku = "juno",
     $core_mask = '',
     $huge_pages = '',
+    $uio_driver = 'uio_pci_generic',
     $contrail_amqp_ip_list = undef,
     $contrail_amqp_port = '',
     $openstack_amqp_ip_list = undef,
@@ -916,6 +917,7 @@
 	compute_passwd_list =>			hiera(contrail::compute::compute_passwd_list, hiera(contrail::params::compute_passwd_list, $compute_passwd_list)),
         huge_pages =>                           hiera(contrail::compute::dpdk::huge_pages, hiera(contrail::params::huge_pages, $huge_pages)),
         core_mask => 	                        hiera(contrail::compute::dpdk::core_mask, hiera(contrail::params::core_mask, $core_mask)),
+        uio_driver => 	                        hiera(contrail::compute::dpdk::uio_driver,  $uio_driver),
         sriov     =>                            hiera(contrail::compute::sriov,hiera(contrail::params::sriov, $sriov)),
         sriov_enable              => hiera(contrail::openstack::sriov::enable, hiera(contrail::params::sriov_enable, $sriov_enable)),
 

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -714,6 +714,7 @@
     $xmpp_dns_auth_enable,
     $huge_pages,
     $core_mask,
+    $uio_driver,
     $package_sku,
     $contrail_amqp_ip_list,
     $contrail_amqp_port,