diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 0a8c253d0..896fad917 100644 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -187,7 +187,7 @@ vmmaster => { } }, vm => { - cols => [qw(node mgr host migrationdest template storage storagemodel cfgstore memory cpus nics nicmodel bootorder clockoffset virtflags master vncport textconsole powerstate beacon datacenter cluster guestostype othersettings vidmodel vidproto vidpassword comments disable)], + cols => [qw(node mgr host migrationdest storage storagemodel cfgstore memory cpus nics nicmodel bootorder clockoffset virtflags master vncport textconsole powerstate beacon datacenter cluster guestostype othersettings vidmodel vidproto vidpassword comments disable)], keys => [qw(node)], table_desc => 'Virtualization parameters', descriptions => { @@ -195,7 +195,6 @@ vm => { 'mgr' => 'The function manager for the virtual machine', 'host' => 'The system that currently hosts the VM', 'migrationdest' => 'A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use', - 'template' => 'The template that creating vm will base on', 'storage' => 'A list of storage files or devices to be used. i.e. /cluster/vm/ or nfs:///path/to/folder/', 'storagemodel' => 'Model of storage devices to provide to guest', 'cfgstore' => 'Optional location for persistant storage separate of emulated hard drives for virtualization solutions that require persistant store to place configuration data', @@ -1858,10 +1857,6 @@ my @nodeattrs = ( tabentry => 'vm.migrationdest', access_tabentry => 'vm.node=attr:node', }, - {attr_name => 'vmtemplate', - tabentry => 'vm.template', - access_tabentry => 'vm.node=attr:node', - }, {attr_name => 'vmstorage', tabentry => 'vm.storage', access_tabentry => 'vm.node=attr:node', @@ -1898,6 +1893,10 @@ my @nodeattrs = ( tabentry => 'vm.virtflags', access_tabentry => 'vm.node=attr:node', }, + {attr_name => 'vmmaster', + tabentry => 'vm.master', + access_tabentry => 'vm.node=attr:node', + }, {attr_name => 'vmvncport', tabentry => 'vm.vncport', access_tabentry => 'vm.node=attr:node', diff --git a/perl-xCAT/xCAT/Schema.pm.PCM b/perl-xCAT/xCAT/Schema.pm.PCM index 61d98a27a..104db5cfa 100644 --- a/perl-xCAT/xCAT/Schema.pm.PCM +++ b/perl-xCAT/xCAT/Schema.pm.PCM @@ -187,7 +187,7 @@ vmmaster => { } }, vm => { - cols => [qw(node mgr host migrationdest template storage storagemodel cfgstore memory cpus nics nicmodel bootorder clockoffset virtflags master vncport textconsole powerstate beacon datacenter cluster guestostype othersettings vidmodel vidproto vidpassword comments disable)], + cols => [qw(node mgr host migrationdest storage storagemodel cfgstore memory cpus nics nicmodel bootorder clockoffset virtflags master vncport textconsole powerstate beacon datacenter cluster guestostype othersettings vidmodel vidproto vidpassword comments disable)], keys => [qw(node)], tablespace =>'XCATTBS32K', table_desc => 'Virtualization parameters', @@ -196,7 +196,6 @@ vm => { 'mgr' => 'The function manager for the virtual machine', 'host' => 'The system that currently hosts the VM', 'migrationdest' => 'A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use', - 'template' => 'The template that creating vm will base on', 'storage' => 'A list of storage files or devices to be used. i.e. /cluster/vm/ or nfs:///path/to/folder/', 'storagemodel' => 'Model of storage devices to provide to guest', 'cfgstore' => 'Optional location for persistant storage separate of emulated hard drives for virtualization solutions that require persistant store to place configuration data', @@ -2004,10 +2003,6 @@ my @nodeattrs = ( tabentry => 'vm.migrationdest', access_tabentry => 'vm.node=attr:node', }, - {attr_name => 'vmtemplate', - tabentry => 'vm.template', - access_tabentry => 'vm.node=attr:node', - }, {attr_name => 'vmstorage', tabentry => 'vm.storage', access_tabentry => 'vm.node=attr:node', @@ -2044,6 +2039,10 @@ my @nodeattrs = ( tabentry => 'vm.virtflags', access_tabentry => 'vm.node=attr:node', }, + {attr_name => 'vmmaster', + tabentry => 'vm.master', + access_tabentry => 'vm.node=attr:node', + }, {attr_name => 'vmvncport', tabentry => 'vm.vncport', access_tabentry => 'vm.node=attr:node',