openstack/ironic
Code Issues Proposed changes

Merge "Switch grenade nic driver to e1000"

Browse Source
This commit is contained in:
Zuul 2018-09-29 15:34:11 +00:00 committed by Gerrit Code Review
commit cde14aaf5e
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
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]]

4
devstack/upgrade/upgrade.sh
View File

@ -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