openstack
/
heat
Code Issues Proposed changes

Merge "Move name resolving before get server"

This commit is contained in:
Jenkins 2014-08-25 10:04:21 +00:00 committed by Gerrit Code Review
parent 9f74b09d6f 99d8ca4b64
commit 5b4a7bc0a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/server.py
View File

@ -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: