Revert "[kvm/dpdk] Switch vlan mode to vxlan"

This reverts commit b8584eeb13c75d7f20a4582d287ab7ac1d52f0af.
vxlan mode has broken in upstream:
https://bugs.launchpad.net/fuel/+bug/1673767

Change-Id: I71fabf1c74f419ab1f6d5d04a294be98fa927ef3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 8e27ddc4486407f52c8de29639efc1cc724f0471)

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 5f90320..645f48d 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
@@ -51,15 +51,17 @@ dea-override-config:
   fuel:
     FEATURE_GROUPS:
     - experimental
+  environment:
+    net_segment_type: vlan
   nodes:
   - id: 1
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: controller
   - id: 2
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: mongo,controller
   - id: 3
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: ceph-osd,controller
   - id: 4
     interfaces: interfaces_dpdk
@@ -78,6 +80,27 @@ 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:

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 cdf06de..7848835 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
@@ -46,15 +46,17 @@ dea-override-config:
   fuel:
     FEATURE_GROUPS:
     - experimental
+  environment:
+    net_segment_type: vlan
   nodes:
   - id: 1
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: controller
   - id: 2
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: mongo,controller
   - id: 3
-    interfaces: interfaces_1
+    interfaces: interfaces_vlan
     role: ceph-osd,controller
   - id: 4
     interfaces: interfaces_dpdk
@@ -73,6 +75,27 @@ 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: