summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-12 13:31:57 +0000
committerGerrit Code Review <review@openstack.org>2013-02-12 13:31:57 +0000
commitd4be934a4883d24e58685760283604f85569c3c3 (patch)
tree22e3a8edab812738638b6d2d61e9f699bf15979d
parentd905aea697ae14c19b416eebe523226a8b8448a0 (diff)
parentba48398552b73d4392f508e31304685cace72269 (diff)
downloadnova-d4be934a4883d24e58685760283604f85569c3c3.tar.gz
nova-d4be934a4883d24e58685760283604f85569c3c3.tar.xz
nova-d4be934a4883d24e58685760283604f85569c3c3.zip
Merge "Don't call 'vif.plug' twice during VM startup"
-rwxr-xr-xnova/virt/libvirt/driver.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 5f19f0c18..7e34aef3d 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1892,7 +1892,6 @@ class LibvirtDriver(driver.ComputeDriver):
guest.add_device(cfg)
for (network, mapping) in network_info:
- self.vif_driver.plug(instance, (network, mapping))
cfg = self.vif_driver.get_config(instance,
network, mapping)
guest.add_device(cfg)