From eabc48a901a2142c8d7ea72dd5272124805de79a Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 21 Sep 2018 14:12:43 +0100 Subject: [PATCH] Switch grenade nic driver to e1000 As of 988243c93fb87190e1867ef913136ecf139e7cb8 in ipxe "[virtio] Add virtio-net 1.0 support", VMs don't attempt to boot over the network when using the virtio-net rom. The ipxe-qemu package used in the grenade jobs contains this problem. Switch to e1000 to avoid baremetal VMs working on some hosts and not others. Change-Id: I4ec297281380896ffe9004c4de7117586ded7149 Story: #2003808 Task: #26603 --- devstack/upgrade/settings | 4 ++++ devstack/upgrade/upgrade.sh | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 929f25d5cf..3a4f9ba99b 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -30,6 +30,10 @@ fi # NOTE(vdrok): Do not setup multicell during upgrade export CELLSV2_SETUP="singleconductor" +# https://storyboard.openstack.org/#!/story/2003808 +# pxe booting with virtio broken in xenial-updates/queens/main +export LIBVIRT_NIC_DRIVER=e1000 + # TODO(derekh): investigate if this is actually needed devstack_localrc base """ [[post-config|\$KEYSTONE_CONF]] diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 34fb61fe56..f4cb426e17 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -36,10 +36,6 @@ set -o errexit # Upgrade Ironic # ============ -# Workaroud to remove the use of ipxe-qemu from xenial-updates/queens/main -# https://storyboard.openstack.org/#!/story/2003808 -sudo apt-get -y --allow-downgrades install ipxe-qemu=1.0.0+git-20150424.a25a16d-1ubuntu1.2 - # Duplicate some setup bits from target DevStack source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/lib/tls