[kvm/dpdk] Switch vlan mode to vxlan

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

diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
index 16f8a92..5f90320 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
@@ -1,6 +1,6 @@
 ##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.com
+# Copyright (c) 2017 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
@@ -24,7 +24,7 @@
 deployment-scenario-metadata:
    title: NFV KVM OVS-DPDK and Barometer HA deployment
    version: 0.0.1
-   created: Feb 6 2016
+   created: Feb 6 2017
    comment: NFV KVM OVS-DPDK and Barometer
 
 ##############################################################################
@@ -38,8 +38,6 @@ stack-extensions:
      module-config-version: 1.0.0
      module-config-override:
        # Module config overrides
-
-stack-extensions:
    - module: fuel-plugin-collectd-ceilometer
      module-config-name: fuel-barometer
      module-config-version: 1.0.0
@@ -53,17 +51,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
@@ -82,30 +78,6 @@ dea-override-config:
         value:
           '2048': 1024
 
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
-    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: