--- a/components/openstack/nova/files/solariszones/driver.py	Thu Jun 25 13:27:37 2015 -0700
+++ b/components/openstack/nova/files/solariszones/driver.py	Tue Jun 23 14:51:21 2015 -0700
@@ -195,6 +195,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):