Corrected PUBLIC network mismatch and added S_berg fix for naming as well.

updated with correct ensX numbering
This is now using the defaults for networking.
Fixed 10.20.0.X/24 gw as well - this should point to 10.20.0.1

Change-Id: I7edd57dce30d5c8129684bb9a83855fd694e8a30
JIRA: 0
Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
(cherry picked from commit 249366e5dd9fc538be8a98abfe9ee3553c8d78d9)

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 b7f2b50..bd8bb76 100644 (file)
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -22,14 +22,14 @@ fuel:
   NTP2: ''
   NTP3: ''
 interfaces_1:
-  eth0:
+  ens3:
   - fuelweb_admin
   - management
-  eth1:
+  ens4:
   - storage
-  eth2:
+  ens5:
   - private
-  eth3:
+  ens6:
   - public
 transformations_1:
   transformations:
@@ -54,19 +54,19 @@ transformations_1:
     name: br-mesh
   - action: add-port
     bridge: br-fw-admin
-    name: eth0
+    name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: eth0.101
+    name: ens4.101
   - action: add-port
     bridge: br-storage
-    name: eth1.102
+    name: ens5.102
   - action: add-port
     bridge: br-mesh
-    name: eth2.103
+    name: ens5.103
   - action: add-port
     bridge: br-ex
-    name: eth3
+    name: ens6
 transformations_2:
   transformations:
   - action: add-br
@@ -90,19 +90,19 @@ transformations_2:
     name: br-mesh
   - action: add-port
     bridge: br-fw-admin
-    name: eth0
+    name: ens3
   - action: add-port
     bridge: br-mgmt
-    name: eth0.101
+    name: ens3.101
   - action: add-port
     bridge: br-storage
-    name: eth1.102
+    name: ens4.102
   - action: add-port
     bridge: br-mesh
-    name: eth2.103
+    name: ens5.103
   - action: add-port
     bridge: br-ex
-    name: eth3
+    name: ens6
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00
@@ -111,8 +111,8 @@ network:
     - 10.118.32.193
     floating_name: admin_floating_net
     floating_ranges:
-    - - 172.16.100.130
-      - 172.16.100.254
+    - - 172.16.0.130
+      - 172.16.0.254
     gre_id_range:
     - 2
     - 65535
@@ -125,11 +125,11 @@ network:
     - 1000
     - 1030
   networks:
-  - cidr: 172.16.100.0/24
-    gateway: 172.16.100.1
+  - cidr: 172.16.0.0/24
+    gateway: 172.16.0.1
     ip_ranges:
-    - - 172.16.100.2
-      - 172.16.100.126
+    - - 172.16.0.2
+      - 172.16.0.126
     meta:
       cidr: 172.16.0.0/24
       configurable: true
@@ -205,7 +205,7 @@ network:
     name: private
     vlan_start: 103
   - cidr: 10.20.0.0/24
-    gateway: 10.20.0.2
+    gateway: 10.20.0.1
     ip_ranges:
     - - 10.20.0.3
       - 10.20.0.254