commit 8e5417e876a4c29dc9fb60659fa4c011bbb43d99
author Jenkins <jenkins@review.openstack.org> Tue Aug 09 04:18:25 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 09 04:18:25 2016 +0000
tree df80207e9750decf2fc650fccc09bfbd18b66c2f
parent 94ba325302e97516abb7a9617854873e76bab68c
parent c694e55ad9707426c05a2139edee037104b009f4

Merge "XenAPI: Don't assume specific network interfaces"

lib/nova_plugins/hypervisor-xenserver

diff --git a/lib/nova_plugins/hypervisor-xenserver b/lib/nova_plugins/hypervisor-xenserver
index e7f1e87..e75226a 100644
--- a/lib/nova_plugins/hypervisor-xenserver
+++ b/lib/nova_plugins/hypervisor-xenserver
@@ -24,8 +24,6 @@
 # Defaults
 # --------
 
-PUBLIC_INTERFACE_DEFAULT=eth2
-GUEST_INTERFACE_DEFAULT=eth1
 # Allow ``build_domU.sh`` to specify the flat network bridge via kernel args
 FLAT_NETWORK_BRIDGE_DEFAULT=$(sed -e 's/.* flat_network_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline)
 if is_service_enabled neutron; then