Merge pull request #3135 from dnephin/fix_down_idempotency

Make down idempotent, continue to remove resources if one is missing
This commit is contained in:
Aanand Prasad 2016-03-16 20:26:18 +00:00
commit abddabfb0a
3 changed files with 30 additions and 2 deletions

View file

@ -149,7 +149,10 @@ class ProjectNetworks(object):
if not self.use_networking:
return
for network in self.networks.values():
network.remove()
try:
network.remove()
except NotFound:
log.warn("Network %s not found.", network.full_name)
def initialize(self):
if not self.use_networking:

View file

@ -76,7 +76,10 @@ class ProjectVolumes(object):
def remove(self):
for volume in self.volumes.values():
volume.remove()
try:
volume.remove()
except NotFound:
log.warn("Volume %s not found.", volume.full_name)
def initialize(self):
try: