diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-17 12:01:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-17 12:01:15 +0000 |
| commit | 3e041c0521b104c005ad2c328594079a9c108672 (patch) | |
| tree | 1f2ec5804117817004b665f0cee29f8a019266d2 /deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml | |
| parent | 053b65b95a25039c0569eb243bdb0a534eeedadd (diff) | |
| parent | 630f12217bdd99c6b4204ff547df95437df73fa5 (diff) | |
Merge "KVMFORNFV: Updating the copyright information for kvmfornfv scenarios."
Diffstat (limited to 'deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml')
| -rw-r--r-- | deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml index 0f37f9fd0..784883513 100644 --- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml @@ -1,6 +1,6 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# jonas.bjurel@ericsson.com +# Copyright (c) 2016 Intel Corp. and others. +# navyax.bathula@intel.com,mpolenchuk@mirantis.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -118,16 +118,6 @@ dea-override-config: type: checkbox value: true weight: 30 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm' - - action: hide - condition: not ('experimental' in version:feature_groups) - type: checkbox - value: false - weight: 11 dha-override-config: nodes: |