From ba38665c4e3bc9fa5e0ab7d7dd15c268cab437e0 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 10 Sep 2012 13:08:46 +0000
Subject: [PATCH] For rhev support: remove the vm.template, but use vm.master
 to replace

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13735 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Schema.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index e55faf9a1..58de2d100 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -186,7 +186,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 => {
@@ -194,7 +194,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/<nodename> or nfs://<server>/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',
@@ -1827,10 +1826,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',
@@ -1867,6 +1862,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',