From 4f72e6be436badd2ded546424ec4a304cd6ce5d3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 16 Jul 2017 03:41:33 +0200 Subject: p/fuel: lib.sh: Revert to virtio-mmio for PXE net virtio-pci-net seems to have issues with more than three (3) interfaces attached to the same guest, even on separate PCI buses. To bypass this limitation, for now, we will use virtio-mmio for PXE, and virtio-pci-net for the rest. This keeps the guest eth order consistent and predictable, and allows udev to assign predictable interface names for 3 out of 4 guest network interfaces (enp2sX), thus ensuring PXE will always get the "eth0" designator. Change-Id: I0d0cb8148cd87313e67f8f27793eb2414c1e90e3 Signed-off-by: Alexandru Avadanii --- ...003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch') diff --git a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch index ee0f736d..add5318f 100644 --- a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch +++ b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch @@ -30,18 +30,19 @@ For now, throw some sed magic at it and disable legacy mode. Signed-off-by: Alexandru Avadanii --- - mcp/scripts/lib.sh | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) + mcp/scripts/lib.sh | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 4df1a5b..3cce4ef 100644 +index 4df1a5b..d4869c6 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -58,23 +58,34 @@ create_vms() { +@@ -58,23 +58,35 @@ create_vms() { # AArch64: prepare arch specific arguments local virt_extra_args="" -+ local virt_net_model="virtio" ++ local virt_pxe_net_model="virtio" ++ local virt_net_model="${virt_pxe_net_model}" if [ "$(uname -i)" = "aarch64" ]; then # No Cirrus VGA on AArch64, use vga std virt_extra_args="$virt_extra_args --video=vga --noautoconsole" @@ -56,7 +57,7 @@ index 4df1a5b..3cce4ef 100644 - --network network:mgmt,model=virtio \ - --network network:internal,model=virtio \ - --network network:public,model=virtio \ -+ --network network:pxe,model=${virt_net_model} \ ++ --network network:pxe,model=${virt_pxe_net_model} \ + --network network:mgmt,model=${virt_net_model} \ + --network network:internal,model=${virt_net_model} \ + --network network:public,model=${virt_net_model} \ -- cgit 1.2.3-korg