summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-04-01 15:28:21 +0000
committerCory Wright <cory.wright@rackspace.com>2011-04-01 15:28:21 +0000
commit367581e63d4eb0018db293034dc1b096d2584720 (patch)
tree69c306854c96d45a7ce98fa7b12cdb415aa2d858 /plugins
parentd7c51db418d554094c341639a0540ecfec8ddb19 (diff)
downloadnova-367581e63d4eb0018db293034dc1b096d2584720.tar.gz
nova-367581e63d4eb0018db293034dc1b096d2584720.tar.xz
nova-367581e63d4eb0018db293034dc1b096d2584720.zip
change bridge
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py
index 7bad39830..2faf4e5c0 100755
--- a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py
+++ b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py
@@ -29,7 +29,7 @@ import simplejson as json
# FIXME(dubs) this needs to be able to be passed in, check xen vif script
-XEN_BRIDGE = 'xenbr1'
+XEN_BRIDGE = 'xenbr0'
OVS_OFCTL = '/usr/bin/ovs-ofctl'
@@ -86,6 +86,7 @@ def main(dom_id, command, net_type, only_this_vif=None):
params = dict(VIF_NAME=vif,
VIF_MAC=data['mac'],
VIF_OFPORT=vif_ofport)
+
if net_type in ('ipv4', 'all'):
for ip4 in data['ips']:
params.update({'VIF_IPv4': ip4['ip']})