summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-01-06 15:53:11 -0600
committerEd Leafe <ed@leafe.com>2011-01-06 15:53:11 -0600
commite66f3017373dcf9135c53ae4d510b0b2a5dcecf0 (patch)
tree33e07b321be994a9231e23603a6039518aacf625 /nova/compute
parented6a4974f19ab7b13c90d41b83ae279403e272e8 (diff)
downloadnova-e66f3017373dcf9135c53ae4d510b0b2a5dcecf0.tar.gz
nova-e66f3017373dcf9135c53ae4d510b0b2a5dcecf0.tar.xz
nova-e66f3017373dcf9135c53ae4d510b0b2a5dcecf0.zip
Got the basic 'set admin password' stuff working
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 201fffc68..52acfebea 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -83,7 +83,6 @@ class ComputeManager(manager.Manager):
# FIXME(ja): include other fields from state?
instance_ref = self.db.instance_get(context, instance_id)
try:
- #info = self.driver.get_info(instance_ref['name'])
info = self.driver.get_info(instance_ref)
state = info['state']
except exception.NotFound:
@@ -266,8 +265,6 @@ class ComputeManager(manager.Manager):
logging.debug('instance %s: setting admin password',
instance_ref['name'])
- self.db.instance_set_state(context, instance_id,
- power_state.NOSTATE, 'setting_password')
if new_pass is None:
# Generate a random password
new_pass = self._generate_password(FLAGS.password_length)