openstack/nova
Code Issues Proposed changes

remove auth manager from instance helper

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-07-22 22:04:52 +00:00
parent 3b9af8a63a
commit 164afd5101
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/create_instance_helper.py
View File

@@ -20,6 +20,7 @@ import webob
from webob import exc from webob import exc
from xml.dom import minidom from xml.dom import minidom
from nova import db
from nova import exception from nova import exception
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -29,7 +30,6 @@ from nova import utils
from nova.compute import instance_types from nova.compute import instance_types
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.auth import manager as auth_manager
LOG = logging.getLogger('nova.api.openstack.create_instance_helper') LOG = logging.getLogger('nova.api.openstack.create_instance_helper')
@@ -77,7 +77,8 @@ class CreateInstanceHelper(object):
key_name = None key_name = None
key_data = None key_data = None
key_pairs = auth_manager.AuthManager.get_key_pairs(context) key_pairs = db.key_pair_get_all_by_user(context.elevated(),
context.user_id)
if key_pairs: if key_pairs:
key_pair = key_pairs[0] key_pair = key_pairs[0]
key_name = key_pair['name'] key_name = key_pair['name']

4
nova/auth/manager.py
View File

@@ -738,10 +738,6 @@ class AuthManager(object):
with self.driver() as drv: with self.driver() as drv:
drv.modify_user(uid, access_key, secret_key, admin) drv.modify_user(uid, access_key, secret_key, admin)
@staticmethod
def get_key_pairs(context):
return db.key_pair_get_all_by_user(context.elevated(), context.user_id)
def get_credentials(self, user, project=None, use_dmz=True): def get_credentials(self, user, project=None, use_dmz=True):
"""Get credential zip for user in project""" """Get credential zip for user in project"""
if not isinstance(user, User): if not isinstance(user, User):