diff --git a/heat/engine/resources/openstack/neutron/port.py b/heat/engine/resources/openstack/neutron/port.py index 78af5a8321..4ca10292c4 100644 --- a/heat/engine/resources/openstack/neutron/port.py +++ b/heat/engine/resources/openstack/neutron/port.py @@ -538,8 +538,9 @@ class Port(neutron.NeutronResource): def restore_prev_rsrc(self, convergence=False): # In case of convergence, during rollback, the previous rsrc is # already selected and is being acted upon. - bakup_resources = self.stack._backup_stack().resources - prev_port = self if convergence else bakup_resources.get(self.name) + backup_stack = self.stack._backup_stack() + backup_res = backup_stack.resources.get(self.name) + prev_port = self if convergence else backup_res fixed_ips = prev_port.data().get('port_fip', []) props = {'fixed_ips': []} diff --git a/heat/engine/resources/openstack/nova/server_network_mixin.py b/heat/engine/resources/openstack/nova/server_network_mixin.py index 40349860bd..979e2b9251 100644 --- a/heat/engine/resources/openstack/nova/server_network_mixin.py +++ b/heat/engine/resources/openstack/nova/server_network_mixin.py @@ -477,7 +477,8 @@ class ServerNetworkMixin(object): # In case of convergence, during rollback, the previous rsrc is # already selected and is being acted upon. - backup_res = self.stack._backup_stack().resources.get(self.name) + backup_stack = self.stack._backup_stack() + backup_res = backup_stack.resources.get(self.name) prev_server = self if convergence else backup_res if convergence: