From 82c3935c1ee7dee89c23011d248daa80b2e1e7e8 Mon Sep 17 00:00:00 2001
From: Michal Skalski <mskalski@mirantis.com>
Date: Tue, 9 Aug 2016 20:29:13 +0200
Subject: Provide access to mgmt network from host level

Functest framework is trying to access internal endpoints from host
level which currently is not possible in virtual deployments.

Related: https://gerrit.opnfv.org/gerrit/#/c/18259/

JIRA: FUEL-167

Change-Id: Id5155116f1d1f6e55810b03fe264d74fe01979f3
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
---
 .../virtual_kvm/fuel/config/dea-pod-override.yaml        | 16 ++++++++--------
 labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
index ae74abc..42417a6 100644
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
 interfaces_1:
   ens3:
   - fuelweb_admin
-  - management
-  ens4:
   - storage
+  ens4:
+  - management
   ens5:
   - private
   ens6:
@@ -51,10 +51,10 @@ transformations_1:
     name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: ens3.101
+    name: ens4
   - action: add-port
     bridge: br-storage
-    name: ens4.102
+    name: ens3.102
   - action: add-port
     bridge: br-mesh
     name: ens5.103
@@ -118,22 +118,22 @@ network:
     gateway: null
     ip_ranges:
     - - 192.168.0.1
-      - 192.168.0.254
+      - 192.168.0.253
     meta:
       cidr: 192.168.0.0/24
       configurable: true
       map_priority: 2
       name: management
-      notation: cidr
+      notation: ip_ranges
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: null
     name: management
-    vlan_start: 101
+    vlan_start: null
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:
diff --git a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
index 6af2f53..5a0903d 100644
--- a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
 interfaces_1:
   ens3:
   - fuelweb_admin
-  - management
-  ens4:
   - storage
+  ens4:
+  - management
   ens5:
   - private
   ens6:
@@ -51,10 +51,10 @@ transformations_1:
     name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: ens3.101
+    name: ens4
   - action: add-port
     bridge: br-storage
-    name: ens4.102
+    name: ens3.102
   - action: add-port
     bridge: br-mesh
     name: ens5.103
@@ -118,22 +118,22 @@ network:
     gateway: null
     ip_ranges:
     - - 192.168.0.1
-      - 192.168.0.254
+      - 192.168.0.253
     meta:
       cidr: 192.168.0.0/24
       configurable: true
       map_priority: 2
       name: management
-      notation: cidr
+      notation: ip_ranges
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
       vips:
       - haproxy
       - vrouter
-      vlan_start: 101
+      vlan_start: null
     name: management
-    vlan_start: 101
+    vlan_start: null
   - cidr: 192.168.2.0/24
     gateway: null
     ip_ranges:
-- 
cgit 1.2.3-korg