← Back to branch summary

~danwent/nova/trunk

« back to all changes in this revision

Viewing changes to nova/compute/manager.py

  • Committer: Tarmac
  • Author(s): Dan Prince
  • Date: 2011-08-18 20:44:30 UTC
  • mfrom: (1449.2.3 nuke_admin_pass)
  • Revision ID: tarmac-20110818204430-pf95isfixv8kmbrh
Remove instances.admin_pass column.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/manager.py
392
392
        updates = {}
393
393
        updates['host'] = self.host
394
394
        updates['launched_on'] = self.host
395
 
        # NOTE(vish): used by virt but not in database
396
 
        updates['injected_files'] = kwargs.get('injected_files', [])
397
 
        updates['admin_pass'] = kwargs.get('admin_password', None)
398
395
        instance = self.db.instance_update(context,
399
396
                                           instance_id,
400
397
                                           updates)
 
398
        instance['injected_files'] = kwargs.get('injected_files', [])
 
399
        instance['admin_pass'] = kwargs.get('admin_password', None)
 
400
 
401
401
        self.db.instance_set_state(context,
402
402
                                   instance_id,
403
403
                                   power_state.NOSTATE,