summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRawan Herzallah <rherzallah@asaltech.com>2016-03-23 14:43:13 +0000
committerRawan Herzallah <rherzallah@asaltech.com>2016-03-24 15:25:31 +0000
commit67f4ea041c04b843398559c5447f111db89154dc (patch)
treecce9bc2e1d6e7f17ba149f52f2acbed15e2830c5
parentfe2076dd98242bc074b19acd43ad4774967b183f (diff)
Add QoS and SR-IOV UI restriction
QoS can be enabled only if SR-IOV is enabled too. Change-Id: Icea934f2ae536abdbc9614e69e02c68b18b98b89
Notes
Notes (review): Code-Review+2: Aviram Bar-Haim <aviramb@mellanox.com> Workflow+1: Aviram Bar-Haim <aviramb@mellanox.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 24 Mar 2016 15:42:45 +0000 Reviewed-on: https://review.openstack.org/296496 Project: openstack/fuel-plugin-mellanox Branch: refs/heads/master
-rw-r--r--environment_config.yaml10
-rw-r--r--metadata.yaml2
2 files changed, 6 insertions, 6 deletions
diff --git a/environment_config.yaml b/environment_config.yaml
index 0e49ad1..218a2f3 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -27,15 +27,15 @@ attributes:
27 27
28 mlnx_qos: 28 mlnx_qos:
29 value: false 29 value: false
30 label: "Quality of Service over VLAN networks and ports (Neutron)" 30 label: "Quality of Service over Mellanox SR-IOV ports (Neutron)"
31 description: | 31 description: |
32 If selected, Neutron "Quality of Service" (QoS) will be enabled for VLAN networks and ports over Mellanox HCAs. 32 If selected, Neutron "Quality of Service" (QoS) will be enabled for SR-IOV ports over Mellanox HCAs.
33 This feature is supported in Ethernet mode and over Neutron with VLAN. 33 This feature is supported in Ethernet mode over Neutron with VLAN after SR-IOV direct port creation.
34 weight: 30 34 weight: 30
35 type: "checkbox" 35 type: "checkbox"
36 restrictions: 36 restrictions:
37 - condition: "settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type == 'vlan')" 37 - condition: "settings:common.libvirt_type.value != 'kvm' or not (settings:mellanox-plugin.sriov.value == true) or not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type == 'vlan')"
38 message: "For Mellanox QoS support in Neutron, hypervisor type should be KVM and the environment networking should be based on Neutron with VLAN segmentation." 38 message: "For Mellanox QoS support in Neutron, hypervisor type should be KVM and the environment networking should be based on Neutron with VLAN segmentation with Mellanox SR-IOV support."
39 39
40 use_mlnx_neo: 40 use_mlnx_neo:
41 value: false 41 value: false
diff --git a/metadata.yaml b/metadata.yaml
index 72deeda..a2491ab 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
5title: Mellanox Openstack Features 5title: Mellanox Openstack Features
6 6
7# Plugin version 7# Plugin version
8version: 2.0.42 8version: 2.0.43
9 9
10# Description 10# Description
11description: Enable features over Mellanox hardware 11description: Enable features over Mellanox hardware