openstack/grenade
Code Issues Proposed changes

Merge "Fix neutron resource cleanup"

Browse Source
This commit is contained in:
Jenkins
2016-10-05 20:51:21 +00:00
committed by Gerrit Code Review
parent 15a35becd8 8ead048557
commit 2b251e85ea
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/50_neutron/resources.sh
View File

@@ -62,8 +62,7 @@ function destroy {
# Must clean the router before we can remove a net
# set +o errexit
neutron router-gateway-clear $(resource_get network router_id) || /bin/true
neutron router-interface-delete $(resource_get network router_id) $(resource_get network subnet_
id) || /bin/true
neutron router-interface-delete $(resource_get network router_id) $(resource_get network subnet_id) || /bin/true
neutron router-delete $(resource_get network router_id) || /bin/true
neutron net-delete $(resource_get network net_id) || /bin/true
}