# HG changeset patch
# User Brian Reitz <Brian.Reitz@Oracle.COM>
# Date 1435096281 25200
# Node ID 7e2c683157d698b80c0ba53f8063c669ca8df803
# Parent  36222db47113c15ac83acfbb47e2bcc29353a33e
21307395 nova ZoneConfig class should call cancelConfig when editConfig fails in __exit__

diff -r 36222db47113 -r 7e2c683157d6 components/openstack/nova/files/solariszones/driver.py
--- a/components/openstack/nova/files/solariszones/driver.py	Wed Jul 01 01:29:06 2015 -0700
+++ b/components/openstack/nova/files/solariszones/driver.py	Tue Jun 23 14:51:21 2015 -0700
@@ -197,6 +197,9 @@
                 LOG.error(_("Unable to commit the new configuration for "
                             "instance '%s' via zonemgr(3RAD): %s")
                           % (self.zone.name, err))
+
+                # Last ditch effort to cleanup.
+                self.zone.cancelConfig()
                 raise
 
     def setprop(self, resource, prop, value):