diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-21 19:27:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-21 19:27:16 +0000 |
| commit | 9dc1b976cf0fa12fb3be673f5269212cde11c740 (patch) | |
| tree | 47c08b7566791b62a89912982a8096b35d24ea18 /nova | |
| parent | cc2d8fc5a874df1a28dc87c7b7ed8e2d1117566e (diff) | |
| parent | 577ba6267994baecd5f9e05105624536d320cc9b (diff) | |
Merge "Ensure hybrid driver creates veth pair only once."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/libvirt/vif.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 1a64765b1..ea0834d87 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -212,15 +212,15 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver, br_name = self.get_br_name(iface_id) v1_name, v2_name = self.get_veth_pair_names(iface_id) - linux_net._create_veth_pair(v1_name, v2_name) - if not linux_net._device_exists(br_name): utils.execute('brctl', 'addbr', br_name, run_as_root=True) - utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True) - utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True) - self.create_ovs_vif_port(v2_name, iface_id, mapping['mac'], - instance['uuid']) + if not linux_net._device_exists(v2_name): + linux_net._create_veth_pair(v1_name, v2_name) + utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True) + utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True) + self.create_ovs_vif_port(v2_name, iface_id, mapping['mac'], + instance['uuid']) network['bridge'] = br_name return self._get_configurations(instance, network, mapping) |