Merge "Update for fuel10 onos plugin"

[fuel.git] / deploy / scenario / no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml

diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
index e932d66..f7144f0 100644 (file)
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-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
@@ -68,8 +68,7 @@ dea-override-config:
   attributes_1:
     hugepages:
       dpdk:
-        value: 256
-        min: 256
+        value: 1024
       nova:
         value:
           '2048': 1024
@@ -77,9 +76,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null
@@ -120,16 +116,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:
 #  disks: