diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-22 22:04:52 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-22 22:04:52 +0000 |
| commit | 164afd51017721b9cbaf2880b9dada3d4cd9b42c (patch) | |
| tree | d676efb63c69d1229c2e4c7ebb9c927d4e1685ea | |
| parent | 3b9af8a63abb21aac1ef9ef8dcb801b7a3686ce8 (diff) | |
| download | nova-164afd51017721b9cbaf2880b9dada3d4cd9b42c.tar.gz nova-164afd51017721b9cbaf2880b9dada3d4cd9b42c.tar.xz nova-164afd51017721b9cbaf2880b9dada3d4cd9b42c.zip | |
remove auth manager from instance helper
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 5 | ||||
| -rw-r--r-- | nova/auth/manager.py | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 7249f1261..2034e8ada 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -20,6 +20,7 @@ import webob from webob import exc from xml.dom import minidom +from nova import db from nova import exception from nova import flags from nova import log as logging @@ -29,7 +30,6 @@ from nova import utils from nova.compute import instance_types from nova.api.openstack import wsgi -from nova.auth import manager as auth_manager LOG = logging.getLogger('nova.api.openstack.create_instance_helper') @@ -77,7 +77,8 @@ class CreateInstanceHelper(object): key_name = 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: key_pair = key_pairs[0] key_name = key_pair['name'] diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 5118abba2..6205cfb56 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -738,10 +738,6 @@ class AuthManager(object): with self.driver() as drv: 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): """Get credential zip for user in project""" if not isinstance(user, User): |