diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-14 13:40:56 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-14 13:40:56 -0700 |
| commit | 9171910ff82bd141a761ceaa4d47bdc826b7f73f (patch) | |
| tree | 4c3834a5121b08bb61b8f878b26ad65bcd91d49f | |
| parent | f8e41d8a1e53b7fc7f4bd91815ed5e2a17dcd7da (diff) | |
| parent | 3363b133a927509432cb42d77abf18d3d5248abf (diff) | |
| download | nova-9171910ff82bd141a761ceaa4d47bdc826b7f73f.tar.gz nova-9171910ff82bd141a761ceaa4d47bdc826b7f73f.tar.xz nova-9171910ff82bd141a761ceaa4d47bdc826b7f73f.zip | |
merged trunk
| -rw-r--r-- | nova/api/openstack/servers.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 869ce73ca..a73591ccc 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -259,17 +259,16 @@ class Controller(wsgi.Controller): # TODO(vish): This probably should be done in the scheduler # network is setup when host is assigned - ctxt = context.RequestContext(user_id, user_id) - network_topic = self._get_network_topic(ctxt) + network_topic = self._get_network_topic(ctxt, network_manager) rpc.call(ctxt, network_topic, {"method": "setup_fixed_ip", "args": {"address": address}}) return inst - def _get_network_topic(self, context): + def _get_network_topic(self, context, network_manager): """Retrieves the network host for a project""" - network_ref = self.network_manager.get_network(context) + network_ref = network_manager.get_network(context) host = network_ref['host'] if not host: host = rpc.call(context, |