summaryrefslogtreecommitdiffstats
path: root/fuel-plugin-ovsnfv
diff options
context:
space:
mode:
authorBilly O'Mahony <billy.o.mahony@intel.com>2016-02-02 11:52:52 +0000
committerBilly O'Mahony <billy.o.mahony@intel.com>2016-02-05 13:08:08 +0000
commit6ec3a89b379eb7c8e463d2d3f3240ec50ef15a3f (patch)
tree611ae2abd67a826d9289a22fde2cdd7398c3c42b /fuel-plugin-ovsnfv
parent4aa1ce14bb812da904f65e8c8f6e6a92053a41e3 (diff)
fuel-plugin: Add config item for NIC used by OVS-DPDK
Change-Id: I7e8daa47eee658efd88922840fdcf21b8b38acd5 Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com> Reviewed-by: Mark D. Gray <mark.d.gray@intel.com> Reviewed-by: Michal Ptacek <michalx.ptacek@intel.com> Reviewed-by: Michal Skalski <mskalski@mirantis.com> Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel-plugin-ovsnfv')
-rw-r--r--fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp4
-rw-r--r--fuel-plugin-ovsnfv/environment_config.yaml6
2 files changed, 6 insertions, 4 deletions
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
--- 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
--- 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"