openstack/ironic
Code Issues Proposed changes

Switch grenade nic driver to e1000

Browse Source 
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
This commit is contained in:
Derek Higgins 2018-09-21 14:12:43 +01:00
parent 1ba142a05f
commit eabc48a901
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/upgrade/settings
View File

@ -30,6 +30,10 @@ fi
# NOTE(vdrok): Do not setup multicell during upgrade # NOTE(vdrok): Do not setup multicell during upgrade
export CELLSV2_SETUP="singleconductor" 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 # TODO(derekh): investigate if this is actually needed
devstack_localrc base """ devstack_localrc base """
[[post-config|\$KEYSTONE_CONF]] [[post-config|\$KEYSTONE_CONF]]

4
devstack/upgrade/upgrade.sh
View File

@ -36,10 +36,6 @@ set -o errexit
# Upgrade Ironic # 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 # Duplicate some setup bits from target DevStack
source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/stackrc
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls