Merge "Fix restore_prev_rsrc assert weakref"
This commit is contained in:
commit
f0b2d1759b
heat/engine/resources/openstack
@ -538,8 +538,9 @@ class Port(neutron.NeutronResource):
|
|||||||
def restore_prev_rsrc(self, convergence=False):
|
def restore_prev_rsrc(self, convergence=False):
|
||||||
# In case of convergence, during rollback, the previous rsrc is
|
# In case of convergence, during rollback, the previous rsrc is
|
||||||
# already selected and is being acted upon.
|
# already selected and is being acted upon.
|
||||||
bakup_resources = self.stack._backup_stack().resources
|
backup_stack = self.stack._backup_stack()
|
||||||
prev_port = self if convergence else bakup_resources.get(self.name)
|
backup_res = backup_stack.resources.get(self.name)
|
||||||
|
prev_port = self if convergence else backup_res
|
||||||
fixed_ips = prev_port.data().get('port_fip', [])
|
fixed_ips = prev_port.data().get('port_fip', [])
|
||||||
|
|
||||||
props = {'fixed_ips': []}
|
props = {'fixed_ips': []}
|
||||||
|
@ -477,7 +477,8 @@ class ServerNetworkMixin(object):
|
|||||||
|
|
||||||
# In case of convergence, during rollback, the previous rsrc is
|
# In case of convergence, during rollback, the previous rsrc is
|
||||||
# already selected and is being acted upon.
|
# 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
|
prev_server = self if convergence else backup_res
|
||||||
|
|
||||||
if convergence:
|
if convergence:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user