1 files changed, 29 insertions, 160 deletions
diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml
index 39e9c72..39b45b9 100644
--- a/labs/lf/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/lf/pod2/fuel/config/dea-pod-override.yaml
@@ -5,23 +5,6 @@ dea-pod-override-config-metadata:
   comment: 'Config for LF POD2, Rebased for Fuel8'
 environment:
   name: opnfv
-fuel:
-  ADMIN_NETWORK:
-    dhcp_pool_end: 10.20.0.254
-    dhcp_pool_start: 10.20.0.3
-    ipaddress: 10.20.0.2
-    netmask: 255.255.0.0
-    ssh_network: 0.0.0.0/0
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 8.8.8.8
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-  HOSTNAME: opnfv
-  NTP1: 0.pool.ntp.org
-  NTP2: 1.pool.ntp.org
-  NTP3: 2.pool.ntp.org
 interfaces_1:
   enp6s0:
   - fuelweb_admin
@@ -30,6 +13,15 @@ interfaces_1:
   - private
   enp8s0:
   - public
+interfaces_vlan:
+  enp6s0:
+  - fuelweb_admin
+  - management
+  - storage
+  enp7s0:
+  - private
+  enp8s0:
+  - public
 interfaces_dpdk:
   enp6s0:
   - fuelweb_admin
@@ -37,151 +29,28 @@ interfaces_dpdk:
   - storage
   enp7s0:
   - private
+  - interface_properties:
+      dpdk:
+        enabled: true
   enp8s0:
   - public
-transformations_1:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-ex
-  - action: add-br
-    name: br-floating
-    provider: ovs
-  - action: add-patch
-    bridges:
-    - br-floating
-    - br-ex
-    mtu: 65000
-    provider: ovs
-  - action: add-br
-    name: br-mesh
-  - action: add-port
-    bridge: br-fw-admin
-    name: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-storage
-    name: enp6s0.301
-  - action: add-port
-    bridge: br-mesh
-    name: enp6s0.302
-  - action: add-port
-    bridge: br-ex
-    name: enp8s0
-transformations_2:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-mesh
-  - action: add-port
-    bridge: br-fw-admin
-    name: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-storage
-    name: enp6s0.301
-  - action: add-port
-    bridge: br-mesh
-    name: enp6s0.302
-transformations_vlan:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-ex
-  - action: add-br
-    name: br-floating
-    provider: ovs
-  - action: add-patch
-    bridges:
-    - br-floating
-    - br-ex
-    mtu: 65000
-    provider: ovs
-  - action: add-br
-    name: br-prv
-    provider: ovs
-  - action: add-br
-    name: br-aux
-  - action: add-patch
-    bridges:
-    - br-prv
-    - br-aux
-    mtu: 65000
-    provider: ovs
-  - action: add-port
-    bridge: br-fw-admin
-    name: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-storage
-    name: enp6s0.301
-  - action: add-port
-    bridge: br-aux
-    name: enp7s0
-  - action: add-port
-    bridge: br-ex
-    name: enp8s0
-transformations_dpdk:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-ex
-  - action: add-br
-    name: br-floating
-    provider: ovs
-  - action: add-patch
-    bridges:
-    - br-floating
-    - br-ex
-    mtu: 65000
-    provider: ovs
-  - action: add-br
-    name: br-prv
-    provider: ovs
-    vendor_specific:
-      datapath_type: netdev
-  - action: add-port
-    bridge: br-prv
-    name: enp7s0
-    provider: dpdkovs
-  - action: add-port
-    bridge: br-fw-admin
-    name: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-storage
-    name: enp6s0.301
-  - action: add-port
-    bridge: br-ex
-    name: enp8s0
+fuel:
+  ADMIN_NETWORK:
+    dhcp_pool_end: 10.20.0.254
+    dhcp_pool_start: 10.20.0.3
+    ipaddress: 10.20.0.2
+    netmask: 255.255.0.0
+    ssh_network: 0.0.0.0/0
+  DNS_DOMAIN: domain.tld
+  DNS_SEARCH: domain.tld
+  DNS_UPSTREAM: 8.8.8.8
+  FUEL_ACCESS:
+    password: admin
+    user: admin
+  HOSTNAME: opnfv
+  NTP1: 0.pool.ntp.org
+  NTP2: 1.pool.ntp.org
+  NTP3: 2.pool.ntp.org
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00