fix error on terminate instance relating to elastic ip

This commit is contained in:
Vishvananda Ishaya
2010-08-04 15:53:24 -07:00
parent 99cfb17985
commit cdfc317608

View File

@@ -611,9 +611,8 @@ class CloudController(object):
logging.warning("Instance %s was not found during terminate" logging.warning("Instance %s was not found during terminate"
% i) % i)
continue continue
address = network_model.get_public_ip_for_instance(i) elastic_ip = network_model.get_public_ip_for_instance(i)
if address: if elastic_ip:
elastic_ip = address['public_ip']
logging.debug("Disassociating address %s" % elastic_ip) logging.debug("Disassociating address %s" % elastic_ip)
# NOTE(vish): Right now we don't really care if the ip is # NOTE(vish): Right now we don't really care if the ip is
# disassociated. We may need to worry about # disassociated. We may need to worry about