]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Use nova_utils for keypair validation
authorSteve Baker <sbaker@redhat.com>
Thu, 15 Aug 2013 23:39:42 +0000 (11:39 +1200)
committerSteve Baker <sbaker@redhat.com>
Mon, 19 Aug 2013 02:03:39 +0000 (14:03 +1200)
This removes unnecessary code.

Change-Id: Ide1d12a44213ffd8b7bd414eb00a4d12e3f6cc2a

heat/engine/resources/instance.py

index 9972a34c07cc20eb1b8b35e5cb7a71e21fba00ce..587040d8bf397332cba405e6632a782e1471759c 100644 (file)
@@ -373,9 +373,7 @@ class Instance(resource.Resource):
         # check validity of key
         key_name = self.properties.get('KeyName', None)
         if key_name:
-            keypairs = self.nova().keypairs.list()
-            if not any(k.name == key_name for k in keypairs):
-                raise exception.UserKeyPairMissing(key_name=key_name)
+            nova_utils.get_keypair(self.nova(), key_name)
 
         # check validity of security groups vs. network interfaces
         security_groups = self._get_security_groups()