gistfile1.txt

@@ -311,14 +312,16 @@ class InstanceMetadata(object):
                 self.instance.key_name: self.instance.key_data
             }
 
-            keypair = keypair_obj.KeyPair.get_by_name(
-                context.get_admin_context(), self.instance.user_id,
-                self.instance.key_name)
-            metadata['keys'] = [
-                {'name': keypair.name,
-                 'type': keypair.type,
-                 'data': keypair.public_key}
-            ]
+            # TODO(coreywright): removed as key_pairs db table doesn't
+            #                    exist in cell db
+            # keypair = keypair_obj.KeyPair.get_by_name(
+            #     context.get_admin_context(), self.instance.user_id,
+            #     self.instance.key_name)
+            # metadata['keys'] = [
+            #     {'name': keypair.name,
+            #      'type': keypair.type,
+            #      'data': keypair.public_key}
+            # ]

diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 382378f..4ffaef9 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -311,13 +311,15 @@ class InstanceMetadata(object):
                 self.instance.key_name: self.instance.key_data
             }

-            keypair = keypair_obj.KeyPair.get_by_name(
-                context.get_admin_context(), self.instance.user_id,
-                self.instance.key_name)
+            if self.instance.key_data.startswith(keypair_obj.KEYPAIR_TYPE_SSH):
+                key_type = keypair_obj.KEYPAIR_TYPE_SSH
+            else:
+                key_type = keypair_obj.KEYPAIR_TYPE_X509
+
             metadata['keys'] = [
-                {'name': keypair.name,
-                 'type': keypair.type,
-                 'data': keypair.public_key}
+                {'name': self.instance.key_name,
+                 'type': key_type,
+                 'data': self.instance.key_data}
             ]

         metadata['hostname'] = self._get_hostname()