openstack/devstack
Code Issues Proposed changes

Merge "be a little more clever about interface default"

Browse Source
This commit is contained in:
Jenkins 2014-06-01 09:39:52 +00:00 committed by Gerrit Code Review
commit 47ae725f13
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nova
View File

@ -75,8 +75,13 @@ QEMU_CONF=/etc/libvirt/qemu.conf
# Set default defaults here as some hypervisor drivers override these # Set default defaults here as some hypervisor drivers override these
PUBLIC_INTERFACE_DEFAULT=br100 PUBLIC_INTERFACE_DEFAULT=br100
GUEST_INTERFACE_DEFAULT=eth0
FLAT_NETWORK_BRIDGE_DEFAULT=br100 FLAT_NETWORK_BRIDGE_DEFAULT=br100
# set the GUEST_INTERFACE_DEFAULT to some interface on the box so that
# the default isn't completely crazy. This will match eth*, em*, or
# the new p* interfaces, then basically picks the first
# alphabetically. It's probably wrong, however it's less wrong than
# always using 'eth0' which doesn't exist on new Linux distros at all.
GUEST_INTERFACE_DEFAULT=$(route -n | awk '{print $8}' | grep ^[ep] | sort | head -1)
# Get hypervisor configuration # Get hypervisor configuration
# ---------------------------- # ----------------------------