# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1429112653 25200
# Node ID aa4cf84f88f2612f5bc964a8a2c1a22df47c3fd7
# Parent  84726155ce06cf63ea49fa5fafb85d5eb8886a51
backout 20867780 - needs more work

diff -r 84726155ce06 -r aa4cf84f88f2 components/openstack/nova/files/solariszones/driver.py
--- a/components/openstack/nova/files/solariszones/driver.py	Tue Apr 14 23:14:37 2015 -0500
+++ b/components/openstack/nova/files/solariszones/driver.py	Wed Apr 15 08:44:13 2015 -0700
@@ -1810,9 +1810,6 @@
         with ZoneConfig(zone) as zc:
             zc.addresource("device", [zonemgr.Property("storage", suri)])
 
-        # apply the configuration to the running zone
-        zone.apply()
-
     def detach_volume(self, connection_info, instance, mountpoint,
                       encryption=None):
         """Detach the disk attached to the instance."""
@@ -1839,9 +1836,6 @@
         with ZoneConfig(zone) as zc:
             zc.removeresources("device", [zonemgr.Property("storage", suri)])
 
-        # apply the configuration to the running zone
-        zone.apply()
-
     def swap_volume(self, old_connection_info, new_connection_info,
                     instance, mountpoint, resize_to):
         """Replace the disk attached to the instance.