diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-07-26 20:47:53 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-26 20:47:53 +0000 |
| commit | 4a52d4984e9349115f37d34e47e4d1141a8cf6fc (patch) | |
| tree | 3308bda3ded41aaa84cd6e87ed5a4e1fe06f756e | |
| parent | b45fa225f9477f4bae11cd379288db459d4b3c02 (diff) | |
| parent | 79c06e6f9597a83ec172451eb2622927f5b9accd (diff) | |
compute now appends self.host to the call to add an additional fixed ip to an instance
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/network/api.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c79abd696..173469bc3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -871,7 +871,7 @@ class ComputeManager(manager.SchedulerDependentManager): """ self.network_api.add_fixed_ip_to_instance(context, instance_id, - network_id) + self.host, network_id) self.inject_network_info(context, instance_id) self.reset_network(context, instance_id) diff --git a/nova/network/api.py b/nova/network/api.py index 33a9fe239..247768722 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -164,9 +164,10 @@ class API(base.Base): {'method': 'deallocate_for_instance', 'args': args}) - def add_fixed_ip_to_instance(self, context, instance_id, network_id): + def add_fixed_ip_to_instance(self, context, instance_id, host, network_id): """Adds a fixed ip to instance from specified network.""" args = {'instance_id': instance_id, + 'host': host, 'network_id': network_id} rpc.cast(context, FLAGS.network_topic, {'method': 'add_fixed_ip_to_instance', |