From 99d8ca4b64d5eae2bffc8cc42724a5b90a0df014 Mon Sep 17 00:00:00 2001 From: JUNJIE NAN Date: Wed, 6 Aug 2014 13:14:09 +0800 Subject: [PATCH] Move name resolving before get server Since the logic does not need the server instance. Change-Id: Ib1815c988c4dcace6266c7615c347cda30a55ec4 --- heat/engine/resources/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/resources/server.py b/heat/engine/resources/server.py index a020a0fb16..9dfae4a9be 100644 --- a/heat/engine/resources/server.py +++ b/heat/engine/resources/server.py @@ -623,14 +623,14 @@ class Server(stack_user.StackUser): if name == self.FIRST_ADDRESS: return self.client_plugin().server_to_ipaddress( self.resource_id) or '' + if name == self.NAME_ATTR: + return self._server_name() try: server = self.nova().servers.get(self.resource_id) except Exception as e: self.client_plugin().ignore_not_found(e) LOG.warn(_('Instance (%s) not found') % self.resource_id) return '' - if name == self.NAME_ATTR: - return self._server_name() if name == self.ADDRESSES: return self._add_port_for_address(server) if name == self.NETWORKS_ATTR: