diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-12 16:19:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-12 16:19:53 +0000 |
| commit | e47ddfd23efb9bd6c5b67b183df348252d4e8d04 (patch) | |
| tree | 017930253932dc5ff252bce7bc2f03620ffe4eab /plugins | |
| parent | 93378ee627a0155820a8dc28bc4cde647a910d67 (diff) | |
| parent | 16e3f2effcddf838cc8927cc6fc8a968de0034bd (diff) | |
| download | nova-e47ddfd23efb9bd6c5b67b183df348252d4e8d04.tar.gz nova-e47ddfd23efb9bd6c5b67b183df348252d4e8d04.tar.xz nova-e47ddfd23efb9bd6c5b67b183df348252d4e8d04.zip | |
Merge "Use ovs-vsctl iface-to-br to look up the bridge associated with the given VIF. This avoids assuming that vifX.Y is attached to xenbrY, which is untrue in the general case."
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 3 |
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 accd08b91..d97d6686b 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 @@ -51,7 +51,8 @@ def main(command, vif_raw, net_type): vif_name, dom_id, vif_index = vif_raw.split('-') vif = "%s%s.%s" % (vif_name, dom_id, vif_index) - bridge = "xenbr%s" % vif_index + + bridge = execute_get_output('/usr/bin/ovs-vsctl', 'iface-to-br', vif) xsls = execute_get_output('/usr/bin/xenstore-ls', '/local/domain/%s/vm-data/networking' % dom_id) |