openstack/nova
Code Issues Proposed changes

change install_ref.admin_password to instance_ref.admin_pass to match the DB

Browse Source
This commit is contained in:
Chris Behrens
2011-05-25 17:01:20 +00:00
parent 9b9f2c40d8
commit ed582a8b86
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@@ -221,7 +221,7 @@ class ComputeManager(manager.SchedulerDependentManager):
context = context.elevated()
instance_ref = self.db.instance_get(context, instance_id)
instance_ref.injected_files = kwargs.get('injected_files', [])
instance_ref.admin_password = kwargs.get('admin_password', None)
instance_ref.admin_pass = kwargs.get('admin_password', None)
if instance_ref['name'] in self.driver.list_instances():
raise exception.Error(_("Instance has already been created"))
LOG.audit(_("instance %s: starting..."), instance_id,

2
nova/virt/xenapi/vmops.py
View File

@@ -204,7 +204,7 @@ class VMOps(object):
self.inject_file(instance, path, contents)
def _set_admin_password():
admin_password = instance.admin_password
admin_password = instance.admin_pass
if admin_password:
LOG.debug(_("Setting admin password"))
self.set_admin_password(instance, admin_password)