resolve conflicts after upstream merge

1 files changed, 2 insertions, 2 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 7c1b388c0..b3932c644 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1068,10 +1068,10 @@ class API(base.Base):
         """Unpause the given instance."""
         self._cast_compute_message('unpause_instance', context, instance_id)
 
-    def _call_compute_message_for_host(self, context, host, params):
+    def _call_compute_message_for_host(self, action, context, host, params):
         """Call method deliberately designed to make host/service only calls"""
         queue = self.db.queue_get_for(context, FLAGS.compute_topic, host)
-        kwargs = {'method': method, 'args': params}
+        kwargs = {'method': action, 'args': params}
         return rpc.call(context, queue, kwargs)
 
     def set_host_enabled(self, context, host, enabled):