From: Steve Baker <sbaker@redhat.com>
Date: Thu, 15 Aug 2013 23:39:42 +0000 (+1200)
Subject: Use nova_utils for keypair validation
X-Git-Tag: 2014.1~192
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=20bdc0f0dd9b4f137531aaaf94a8bf4e0848f047;p=openstack-build%2Fheat-build.git

Use nova_utils for keypair validation

This removes unnecessary code.

Change-Id: Ide1d12a44213ffd8b7bd414eb00a4d12e3f6cc2a
---

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 9972a34c..587040d8 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -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()