openstack
/
heat
Code Issues Proposed changes

Merge "Fix restore_prev_rsrc assert weakref"

This commit is contained in:
Jenkins 2017-02-02 17:00:59 +00:00 committed by Gerrit Code Review
parent 067fcea0c3 01580af10a
commit f0b2d1759b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/neutron/port.py
View File

@ -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': []}

3
heat/engine/resources/openstack/nova/server_network_mixin.py
View File

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