From 789c14fad0e710fc944ca4fdeb255176ae989309 Mon Sep 17 00:00:00 2001 From: Vitalii Kovalchuk Date: Mon, 23 May 2016 13:11:39 +0300 Subject: [PATCH] Add checkbox for DPDK on VF feature Change-Id: Ibfcb1ce52b897161ed439a38dbf4082079cb7f9b --- .../puppet/modules/contrail/manifests/init.pp | 1 + environment_config.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/contrail/manifests/init.pp b/deployment_scripts/puppet/modules/contrail/manifests/init.pp index 20c57ab39..d7012c874 100644 --- a/deployment_scripts/puppet/modules/contrail/manifests/init.pp +++ b/deployment_scripts/puppet/modules/contrail/manifests/init.pp @@ -112,6 +112,7 @@ class contrail { # DPDK settings $global_dpdk_enabled = $settings['contrail_global_dpdk'] + $dpdk_on_vf = $settings['dpdk_on_vf'] $compute_dpdk_enabled = $global_dpdk_enabled and 'dpdk' in hiera_array('roles') # Package override diff --git a/environment_config.yaml b/environment_config.yaml index d15cbcd23..6d5f79253 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -102,6 +102,15 @@ attributes: restrictions: - condition: "not (settings:contrail.metadata.enabled == true and settings:contrail.contrail_global_dpdk.value == true)" action: "hide" + dpdk_on_vf: + value: false + label: "DPDK on VF" + description: "Configure DPDK vrouter use VF network adapter" + weight: 160 + type: "checkbox" + restrictions: + - condition: "not (settings:contrail.metadata.enabled == true and settings:contrail.contrail_global_dpdk.value == true)" + action: "hide" contrail_global_sriov: value: false label: "Enable SRIOV feature for this environment." @@ -123,4 +132,3 @@ attributes: restrictions: - action: hide condition: not (settings:contrail.contrail_global_sriov.value == true) -