Bump sfc scenario to ODL 5.2.0-1

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

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 0f37f9f..cdf06de 100644 (file)
--- 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
@@ -46,17 +46,15 @@ dea-override-config:
   fuel:
     FEATURE_GROUPS:
     - experimental
-  environment:
-    net_segment_type: vlan
   nodes:
   - id: 1
-    interfaces: interfaces_vlan
+    interfaces: interfaces_1
     role: controller
   - id: 2
-    interfaces: interfaces_vlan
+    interfaces: interfaces_1
     role: mongo,controller
   - id: 3
-    interfaces: interfaces_vlan
+    interfaces: interfaces_1
     role: ceph-osd,controller
   - id: 4
     interfaces: interfaces_dpdk
@@ -75,27 +73,6 @@ dea-override-config:
         value:
           '2048': 1024
 
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
   settings:
     editable:
       storage:
@@ -118,16 +95,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: