summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/api/openstack/create_instance_helper.py2
-rw-r--r--nova/compute/api.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 2034e8ada..573153f68 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -77,6 +77,8 @@ class CreateInstanceHelper(object):
key_name = None
key_data = None
+ # TODO(vish): Key pair access should move into a common library
+ # instead of being accessed directly from the db.
key_pairs = db.key_pair_get_all_by_user(context.elevated(),
context.user_id)
if key_pairs:
diff --git a/nova/compute/api.py b/nova/compute/api.py
index d1c3fd6fd..487d23b0d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -676,7 +676,6 @@ class API(base.Base):
all instances in the system.
"""
- LOG.info(locals())
if reservation_id is not None:
recurse_zones = True
instances = self.db.instance_get_all_by_reservation(