From 20bdc0f0dd9b4f137531aaaf94a8bf4e0848f047 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 16 Aug 2013 11:39:42 +1200 Subject: [PATCH] Use nova_utils for keypair validation This removes unnecessary code. Change-Id: Ide1d12a44213ffd8b7bd414eb00a4d12e3f6cc2a --- heat/engine/resources/instance.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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() -- 2.45.2