diff options
| author | Ryu Ishimoto <ryu@midokura.jp> | 2011-07-20 21:34:30 +0900 |
|---|---|---|
| committer | Ryu Ishimoto <ryu@midokura.jp> | 2011-07-20 21:34:30 +0900 |
| commit | 0c66b0b8caad7437fa2afd64a2038bcb166c83a5 (patch) | |
| tree | cfbe9198305d0f5ac11255c484d0ec0a963419c0 /nova/compute | |
| parent | 7bdd244541fd9cef4031d4050b5200f58a15f757 (diff) | |
Merged get_configurations and plug of VIF drivers
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 98f3cc86f..2ade43503 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -299,7 +299,6 @@ class ComputeManager(manager.SchedulerDependentManager): network_info = self.network_api.allocate_for_instance(context, instance, vpn=is_vpn) LOG.debug(_("instance network_info: |%s|"), network_info) - self.driver.plug_vifs(context, instance, network_info) else: # TODO(tr3buchet) not really sure how this should be handled. # virt requires network_info to be passed in but stub_network @@ -646,7 +645,6 @@ class ComputeManager(manager.SchedulerDependentManager): 'rescuing') network_info = self.network_api.get_instance_nw_info(context, instance_ref) - self.driver.plug_vifs(context, instance_ref, network_info) _update_state = lambda result: self._update_state_callback( self, context, instance_id, result) self.driver.rescue(instance_ref, _update_state, network_info) |