diff options
Diffstat (limited to 'devstack/upgrade')
| -rw-r--r-- | devstack/upgrade/settings | 4 | ||||
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 929f25d5c..3a4f9ba99 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 34fb61fe5..f4cb426e1 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 |