commit ea1290a997d5ea6c9ac764fcb9b9dc26b68c811c
author Anthony Young <sleepsonthefloor@gmail.com> Thu Oct 27 12:53:30 2011 -0700
committer Anthony Young <sleepsonthefloor@gmail.com> Thu Oct 27 12:53:30 2011 -0700
tree 71fcb70fc941602b4acb893beb50c5008e29ce1c
parent d7f29e6366bfa74687d750a4f9f17d51527dd205

use better bridge names

stack.sh

diff --git a/stack.sh b/stack.sh
index 4952668..5c3bd88 100755
--- a/stack.sh
+++ b/stack.sh
@@ -629,7 +629,7 @@
     add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
     add_nova_flag "--flat_injected=False"
     add_nova_flag "--flat_interface=eth1"
-    add_nova_flag "--flat_network_bridge=xapi1"
+    add_nova_flag "--flat_network_bridge=xenbr1"
     add_nova_flag "--public_interface=eth3"
 else
     add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"

tools/xen/build_domU.sh

diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index fec1938..08c912f 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -27,12 +27,12 @@
 
 # VM network params
 VM_NETMASK=${VM_NETMASK:-255.255.255.0}
-VM_BR=${VM_BR:-xapi1}
+VM_BR=${VM_BR:-xenbr1}
 VM_VLAN=${VM_VLAN:-100}
 
 # MGMT network params
 MGT_NETMASK=${MGT_NETMASK:-255.255.255.0}
-MGT_BR=${MGT_BR:-xapi2}
+MGT_BR=${MGT_BR:-xenbr2}
 MGT_VLAN=${MGT_VLAN:-101}
 
 # VM Password