Merge "Introduce ability to accept command arguments to build with DPDK or Linux...

diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp
index 62c5766..d57002b 100644 (file)
--- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp
+++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp
@@ -1,9 +1,11 @@
 $fuel_settings = parseyaml(file('/etc/astute.yaml'))
 $master_ip = $::fuel_settings['master_ip']
 
+$ovs_ifname = $::fuel_settings[fuel-plugin-ovsnfv][fuel-plugin-ovsnfv_text]
+
 if $operatingsystem == 'Ubuntu' {
   class { '::ovsdpdk':
-    ovs_bridge_mappings => 'default:ens1f1',
+    ovs_bridge_mappings => "default:$ovs_ifname",
     ovs_socket_mem      => '512,512',
     ovs_num_hugepages   => '2048',
     compute             => 'True',

diff --git a/fuel-plugin-ovsnfv/environment_config.yaml b/fuel-plugin-ovsnfv/environment_config.yaml
index 947e225..783fb12 100644 (file)
--- a/fuel-plugin-ovsnfv/environment_config.yaml
+++ b/fuel-plugin-ovsnfv/environment_config.yaml
@@ -1,7 +1,7 @@
 attributes:
   fuel-plugin-ovsnfv_text:
-    value: 'Set default value'
-    label: 'Text field'
-    description: 'Description for text field'
+    value: 'ens1f1'
+    label: 'NIC for DPDK'
+    description: 'Specify compute node interface to which OVS-DPDK binds'
     weight: 25
     type: "text"