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. Move mgmt
network to untagged interface and setup IP address from mgmt subnet on
the linux bridge where mgmt traffic is traversing.

There will be corresponding changes in securedlab repository.

JIRA: FUEL-167

Change-Id: I29b8ebb23a64e39a4e56b27639a87ce2386b9774
Signed-off-by: Michal Skalski <mskalski@mirantis.com>

4 files changed, 25 insertions, 24 deletions

diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index afe5daf21..985a2920c 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/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
@@ -119,22 +119,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/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index 6405db6b9..ce3b62af9 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/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/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index c5b94a544..736e9af3c 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/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/deploy/templates/virtual_environment/networks/fuel2.xml b/deploy/templates/virtual_environment/networks/fuel2.xml
index 615c92094..558788664 100644
--- a/deploy/templates/virtual_environment/networks/fuel2.xml
+++ b/deploy/templates/virtual_environment/networks/fuel2.xml
@@ -1,5 +1,6 @@
 <network>
   <name>fuel2</name>
   <bridge name='fuel2' stp='on' delay='0'/>
+  <ip address='192.168.0.254' netmask='255.255.255.0'/>
 </network>