Add interfaces configuration for dpdk

Change-Id: I05437371f3a789ce3f8f5333dec0ed0d477710cc
Related-change: https://gerrit.opnfv.org/gerrit/#/c/21153/
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit 4763cb907c3ad055e86520e4c8bd24d490a34c3a)

diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
index db5d66c..34a3ef2 100644 (file)
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -14,136 +14,27 @@ interfaces_1:
   - management
   - storage
   - private
+interfaces_vlan:
+  eno50:
+  - fuelweb_admin
+  ens2f0:
+  - private
+  ens1f0:
+  - public
+  - management
+  - storage
 interfaces_dpdk:
   eno50:
   - fuelweb_admin
   ens2f0:
   - private
+  - interface_properties:
+      dpdk:
+        enabled: true
   ens1f0:
   - public
   - management
   - storage
-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: eno50
-  - action: add-port
-    bridge: br-mgmt
-    name: ens1f0.100
-  - action: add-port
-    bridge: br-storage
-    name: ens1f0.200
-  - action: add-port
-    bridge: br-ex
-    name: ens1f0.753
-  - action: add-port
-    bridge: br-mesh
-    name: ens1f0.300
-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: eno50
-  - action: add-port
-    bridge: br-mgmt
-    name: ens1f0.100
-  - action: add-port
-    bridge: br-storage
-    name: ens1f0.200
-  - action: add-port
-    bridge: br-aux
-    name: ens2f0
-  - action: add-port
-    bridge: br-ex
-    name: ens1f0.753
-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: ens2f0
-    provider: dpdkovs
-  - action: add-port
-    bridge: br-fw-admin
-    name: eno50
-  - action: add-port
-    bridge: br-mgmt
-    name: ens1f0.100
-  - action: add-port
-    bridge: br-storage
-    name: ens1f0.200
-  - action: add-port
-    bridge: br-ex
-    name: ens1f0.753
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254

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 ac57a3f..8b732fc 100644 (file)
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -25,6 +25,16 @@ interfaces_1:
   - private
   ens6:
   - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 interfaces_dpdk:
   ens3:
   - fuelweb_admin
@@ -33,128 +43,11 @@ interfaces_dpdk:
   - management
   ens5:
   - private
+  - interface_properties:
+      dpdk:
+        enabled: true
   ens6:
   - 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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
-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-aux
-  - 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
-  - action: add-patch
-    bridges:
-    - br-prv
-    - br-aux
-    mtu: 65000
-    provider: ovs
-  - action: add-port
-    bridge: br-fw-admin
-    name: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-aux
-    name: ens5
-  - action: add-port
-    bridge: br-ex
-    name: ens6
-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-fw-admin
-    name: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-prv
-    name: ens5
-    provider: dpdkovs
-  - action: add-port
-    bridge: br-ex
-    name: ens6
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254

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 8698a5b..78b2393 100644 (file)
--- a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -25,6 +25,16 @@ interfaces_1:
   - private
   ens6:
   - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 interfaces_dpdk:
   ens3:
   - fuelweb_admin
@@ -33,128 +43,11 @@ interfaces_dpdk:
   - management
   ens5:
   - private
+  - interface_properties:
+      dpdk:
+        enabled: true
   ens6:
   - 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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
-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-aux
-  - 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
-  - action: add-patch
-    bridges:
-    - br-prv
-    - br-aux
-    mtu: 65000
-    provider: ovs
-  - action: add-port
-    bridge: br-fw-admin
-    name: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-aux
-    name: ens5
-  - action: add-port
-    bridge: br-ex
-    name: ens6
-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-fw-admin
-    name: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-prv
-    name: ens5
-    provider: dpdkovs
-  - action: add-port
-    bridge: br-ex
-    name: ens6
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254

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 (file)
--- 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