--- a/components/openstack/nova/files/nova-compute	Tue Dec 15 00:08:40 2015 -0800
+++ b/components/openstack/nova/files/nova-compute	Tue Dec 15 00:08:40 2015 -0800
@@ -32,7 +32,7 @@
     parser.read(nova_conf)
 
     # retrieve the suspend path or just get the default
-    default_path = '/var/share/suspend'
+    default_path = '/var/share/zones/SYSsuspend'
     try:
         suspend_path = parser.get('DEFAULT', 'zones_suspend_path')
     except ConfigParser.NoOptionError:
@@ -50,7 +50,7 @@
             rpool = output.split('/')[0]
 
             # the default directory doesn't exist, create a new dataset for it
-            suspend_ds = os.path.join(rpool, 'VARSHARE/suspend')
+            suspend_ds = os.path.join(rpool, 'VARSHARE/zones/SYSsuspend')
             try:
                 check_call(['/usr/bin/pfexec', '/usr/sbin/zfs', 'create', '-p',
                             '-o', 'mountpoint=' + suspend_path, suspend_ds])

--- a/components/openstack/nova/files/nova.conf	Tue Dec 15 00:08:40 2015 -0800
+++ b/components/openstack/nova/files/nova.conf	Tue Dec 15 00:08:40 2015 -0800
@@ -1978,7 +1978,7 @@
 #solariszones_snapshots_directory=$instances_path/snapshots
 
 # Default path for suspend images for Solaris Zones. (string value)
-#zones_suspend_path=/var/share/suspend
+#zones_suspend_path=/var/share/zones/SYSsuspend
 
 
 #

--- a/components/openstack/nova/files/solariszones/driver.py	Tue Dec 15 00:08:40 2015 -0800
+++ b/components/openstack/nova/files/solariszones/driver.py	Tue Dec 15 00:08:40 2015 -0800
@@ -83,7 +83,7 @@
                help='Location where solariszones driver will store snapshots '
                     'before uploading them to the Glance image service'),
     cfg.StrOpt('zones_suspend_path',
-               default='/var/share/suspend',
+               default='/var/share/zones/SYSsuspend',
                help='Default path for suspend images for Solaris Zones.'),
 ]