p/fuel: virtio: min libvirt 3.x and Qemu 2.6

Expect host virtualization tools (libvirt, qemu) to be recent enough
to support modern virtio-net-pci out of box as a default.

This allows us to drop some changes and a hack - see [1]:
- "model=virtio" implies "model=virtio-net-pci" on libvirt 3.x;
- "model=virtio" puts each NIC on a seperate bus, all work now;
- modern virtio is automatically used when NIC is on PCIe bus;

Revert "p/fuel: lib.sh: Revert to virtio-mmio for PXE net"

This reverts commit 4f72e6be436badd2ded546424ec4a304cd6ce5d3.

[1] https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg07594.html

Change-Id: Iaa7af63846c9d9dca5b7a9be5efa54f8cd56242e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 321 deletions

diff --git a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch b/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch
deleted file mode 100644
index 85434387..00000000
--- a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 16 Jul 2017 03:58:58 +0200
-Subject: [PATCH] classes: virtual: AArch64: virtio-pci-net sync
-
-grep -e "ens[[:digit:]]" -R . -l | \
-  xargs sed -i \
-    -e 's/ens3/eth0/g' \
-    -e 's/ens4/enp2s1/g' \
-    -e 's/ens5/enp2s2/g' \
-    -e 's/ens6/enp2s3/g'
-
-Since AArch64 will be using virtio-net-pci NIC model for guests,
-predictable interface naming yields a slightly different scheme.
-
-Update all configuration to reflect this.
-
-NOTE: PXE interfaces still uses "virtio-mmio", which translates
-into "eth0".
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml        | 2 +-
- .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml        | 2 +-
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml   | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml   | 4 ++--
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml   | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml   | 6 +++---
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml      | 8 ++++----
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml      | 4 ++--
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml      | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml        | 2 +-
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml   | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml   | 4 ++--
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml   | 8 ++++----
- 13 files changed, 36 insertions(+), 36 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-index 328d6df..99e6152 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-@@ -27,7 +27,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-index 6c6640a..c775090 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-@@ -11,7 +11,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-index 97eda6c..98d2ea2 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-@@ -10,9 +10,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-     loopback_device_size: 10
-@@ -52,7 +52,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-index 17c22c5..5bd4a95 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
-           version: latest
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
--        ens6:
-+        enp2s3:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-index 4ea51f3..b5709e7 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-     neutron_agents:
-@@ -32,7 +32,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
-index 864c71d..ae06d21 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
-@@ -26,7 +26,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-@@ -51,14 +51,14 @@ parameters:
-             single_address: 172.16.10.105
-             tenant_address: 10.1.0.105
-             external_address: 10.16.0.105
--            dpdk0_name: ens5
-+            dpdk0_name: enp2s2
-             dpdk0_pci: '"0000:00:05.0"'
-         openstack_compute_node02:
-           params:
-             single_address: 172.16.10.106
-             tenant_address: 10.1.0.106
-             external_address: 10.16.0.106
--            dpdk0_name: ens5
-+            dpdk0_name: enp2s2
-             dpdk0_pci: '"0000:00:05.0"'
-         openstack_gateway_node01:
-           params:
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-index c23ca7f..aeb6ba1 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-@@ -12,9 +12,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-     loopback_device_size: 10
-@@ -51,7 +51,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-index b85f085..0c4b5b9 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
-           version: latest
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
--        ens6:
-+        enp2s3:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-index e102c10..e1800de 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-   neutron:
-@@ -22,7 +22,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
-index 97730b1..671f2f9 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
-@@ -26,7 +26,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-index a86a7c6..78acfba 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-@@ -10,9 +10,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-     loopback_device_size: 10
-@@ -47,7 +47,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-index ae103cd..e2ecc42 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
-           version: latest
-     network:
-       interface:
--        ens4:
-+        enp2s1:
-           enabled: true
-           type: eth
-           proto: static
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
--        ens6:
-+        enp2s3:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-index 9257d86..0a2a622 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs
- parameters:
-   _param:
--    primary_interface: ens4
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s1
-+    tenant_interface: enp2s2
-+    external_interface: enp2s3
-     interface_mtu: 9000
-     linux_system_codename: xenial
-   neutron:
-@@ -20,7 +20,7 @@ parameters:
-       interface:
-         dhcp_int:
-           enabled: true
--          name: ens3
-+          name: eth0
-           proto: dhcp
-           type: eth
-           mtu: ${_param:interface_mtu}