OS-1148 rename zfs_storage_pool_name to zpool, include deprecation wa…

…rning and backward compat.
TritonDataCenter · May 3, 2012 · d411aae · d411aae
1 parent 7695691
commit d411aae
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 28 deletions.
diff --git a/src/vm/man/vmadm.1m.md b/src/vm/man/vmadm.1m.md
@@ -1340,19 +1340,6 @@ tab-complete UUIDs rather than having to type them out for every command.
         update: yes (live update)
         default: 100
 
-    zfs_storage_pool_name:
-
-        This defines which ZFS pool the VM's zone dataset will be created in
-        For OS VMs, this dataset is where all the data in the zone will live.
-        For KVM VMs, this is only used by the zone shell that the VM runs in.
-
-        type: string (zpool name)
-        vmtype: OS,KVM
-        listable: yes
-        create: yes
-        update: no
-        default: zones
-
     zone_state:
 
         This property will show up when fetching a VMs JSON.  this shows the
@@ -1404,6 +1391,19 @@ tab-complete UUIDs rather than having to type them out for every command.
         create: no
         update: no
 
+    zpool:
+
+        This defines which ZFS pool the VM's zone dataset will be created in
+        For OS VMs, this dataset is where all the data in the zone will live.
+        For KVM VMs, this is only used by the zone shell that the VM runs in.
+
+        type: string (zpool name)
+        vmtype: OS,KVM
+        listable: yes
+        create: yes
+        update: no
+        default: zones
+
 
 ## EXAMPLES
 

diff --git a/src/vm/node_modules/VM.js b/src/vm/node_modules/VM.js
diff --git a/src/vm/sbin/vmadm.js b/src/vm/sbin/vmadm.js
@@ -88,7 +88,7 @@ var LIST_FIELDS = {
     uuid: {header: 'UUID', width: 36},
     vcpus: {header: 'VCPUS', width: 5},
     zfs_io_priority: {header: 'IO_PRIORITY', width: 11},
-    zfs_storage_pool_name: {header: 'ZFS_POOL', width: 12},
+    zpool: {header: 'ZPOOL', width: 12},
     zonename: {header: 'ZONENAME', width: 12},
     zonepath: {header: 'ZONEPATH', width: 40},
     zoneid: {header: 'ZONEID', width: 6}

diff --git a/src/vm/tests/test-defaults.js b/src/vm/tests/test-defaults.js
@@ -27,7 +27,7 @@ var zone_defaults = {
     'quota': [10],
     'cpu_shares': [100],
     'zfs_io_priority': [100],
-    'zfs_storage_pool_name': ['zones'],
+    'zpool': ['zones'],
     'max_lwps': [2000],
     'tmpfs': ['max_physical_memory', zone_property],
     'max_locked_memory': ['max_physical_memory', zone_property],