openstack/nova
Code Issues Proposed changes

Review feedback.

Browse Source
This commit is contained in:
Josh Kearney
2011-05-13 10:26:50 -05:00
parent b4357fef25
commit 60dcc66db2
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/servers.py
View File

@@ -14,7 +14,6 @@
# under the License. # under the License.
import base64 import base64
import eventlet
import traceback import traceback
from webob import exc from webob import exc
@@ -176,9 +175,8 @@ class Controller(common.OpenstackController):
builder = self._get_view_builder(req) builder = self._get_view_builder(req)
server = builder.build(inst, is_detail=True) server = builder.build(inst, is_detail=True)
server['server']['adminPass'] = password server['server']['adminPass'] = password
# We don't want this to block self.compute_api.set_admin_password(context, server['server']['id'],
eventlet.spawn(self.compute_api.set_admin_password( password)
context, server['server']['id'], password))
return server return server
def _deserialize_create(self, request): def _deserialize_create(self, request):

18
nova/compute/api.py
View File

@@ -19,6 +19,7 @@
"""Handles all requests relating to instances (guest vms).""" """Handles all requests relating to instances (guest vms)."""
import datetime import datetime
import eventlet
import re import re
import time import time
@@ -495,6 +496,15 @@ class API(base.Base):
raise exception.Error(_("Unable to find host for Instance %s") raise exception.Error(_("Unable to find host for Instance %s")
% instance_id) % instance_id)
def _set_admin_password(self, context, instance_id, password):
"""Set the root/admin password for the given instance."""
host = self._find_host(context, instance_id)
rpc.cast(context,
self.db.queue_get_for(context, FLAGS.compute_topic, host),
{"method": "set_admin_password",
"args": {"instance_id": instance_id, "new_pass": password}})
def snapshot(self, context, instance_id, name): def snapshot(self, context, instance_id, name):
"""Snapshot the given instance. """Snapshot the given instance.
@@ -648,12 +658,8 @@ class API(base.Base):
def set_admin_password(self, context, instance_id, password=None): def set_admin_password(self, context, instance_id, password=None):
"""Set the root/admin password for the given instance.""" """Set the root/admin password for the given instance."""
host = self._find_host(context, instance_id) eventlet.spawn_n(self._set_admin_password(context, instance_id,
password))
rpc.cast(context,
self.db.queue_get_for(context, FLAGS.compute_topic, host),
{"method": "set_admin_password",
"args": {"instance_id": instance_id, "new_pass": password}})
def inject_file(self, context, instance_id): def inject_file(self, context, instance_id):
"""Write a file to the given instance.""" """Write a file to the given instance."""