Author: arkurth
Date: Mon Aug 23 20:39:10 2010
New Revision: 988303
URL: http://svn.apache.org/viewvc?rev=988303&view=rev
Log:
VCL-164
Added module table entry for the VCL::image module. This entry is used by the
vcld setup interface to locate modules which implement a setup subroutine.
Increased OS.prettyname from 35 to 64 and modified the values for consistency.
These values are displayed as a list of choices when capturing a base image.
Modified:
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=988303&r1=988302&r2=988303&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Mon Aug 23 20:39:10 2010
@@ -540,7 +540,7 @@ CREATE TABLE IF NOT EXISTS `module` (
CREATE TABLE IF NOT EXISTS `OS` (
`id` tinyint(3) unsigned NOT NULL auto_increment,
`name` varchar(20) NOT NULL,
- `prettyname` varchar(35) NOT NULL default '',
+ `prettyname` varchar(64) NOT NULL default '',
`type` varchar(30) NOT NULL,
`installtype` varchar(30) NOT NULL default 'image',
`sourcepath` varchar(30) default NULL,
@@ -1279,47 +1279,48 @@ INSERT INTO `module` (`id`, `name`, `pre
(16, 'os_win2008', 'Windows Server 2008 OS Module', '',
'VCL::Module::OS::Windows::Version_6::2008'),
(17, 'os_win7', 'Windows 7 OS Module', '',
'VCL::Module::OS::Windows::Version_6::7'),
(20, 'provisioning_xCAT_2x', 'xCAT 2.x Provisioning Module', '',
'VCL::Module::Provisioning::xCAT2'),
-(21, 'provisioning_vmware_vsphere', 'VMware vSphere Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware');
+(21, 'provisioning_vmware_vsphere', 'VMware vSphere Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware'),
+(22, 'state_image', 'VCL Image State Module', '', 'VCL::image');
--
-- Dumping data for table `OS`
--
INSERT INTO `OS` (`id`, `name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES
-(2, 'sun4x_58', 'Solaris 5.8', 'unix', 'none', NULL, 15),
-(3, 'win2k', 'Windows 2000', 'windows', 'partimage', 'image', 4),
-(6, 'rhel3', 'Red Hat Enterprise Linux 3.0', 'linux', 'kickstart', 'rhas3', 5),
-(7, 'winxp', 'Windows XP', 'windows', 'partimage', 'image', 12),
-(8, 'realmrhel3', 'Realm Red Hat Enterprise Linux 3.0', 'linux', 'none', NULL,
15),
-(9, 'realmrhel4', 'Realm Red Hat Enterprise Linux 4.0', 'linux', 'none', NULL,
15),
-(10, 'win2003', 'Windows 2003 Server', 'windows', 'partimage', 'image', 13),
-(11, 'rh3image', 'RHEL 3 image', 'linux', 'partimage', 'image', 5),
-(12, 'rhel4', 'Red Hat Enterprise Linux 4', 'linux', 'kickstart', 'rhas4', 5),
-(13, 'rh4image', 'RHEL4 image', 'linux', 'partimage', 'image', 5),
-(14, 'fc5image', 'RH Fedora Core 5 image', 'linux', 'partimage', 'image', 5),
-(15, 'rhfc5', 'Red Hat Fedora Core 5', 'linux', 'kickstart', 'rhfc5', 5),
-(16, 'vmwarewinxp', 'VMware Windows XP', 'windows', 'vmware', 'vmware_images',
12),
-(17, 'rhfc7', 'RH Fedora Core 7 KS', 'linux', 'kickstart', 'rhfc7', 5),
-(18, 'fc7image', 'RH Fedora Core 7 image', 'linux', 'partimage', 'image', 5),
-(19, 'rhel5', 'Red Hat Enterprise Linux 5', 'linux', 'kickstart', 'rhas5', 5),
-(20, 'esx35', 'VMware ESX 3.5', 'linux', 'kickstart', 'esx35', 5),
-(21, 'vmwareesxwinxp', 'VMware ESX Windows XP', 'windows', 'vmware',
'vmware_images', 12),
-(22, 'realmrhel5', 'Realm Red Hat Enterprise Linux 5.0', 'linux', 'none',
NULL, 15),
-(23, 'sun4x_510 ', 'Solaris 10', 'unix', 'none', NULL, 15),
-(24, 'centos5', 'CentOS 5', 'linux', 'kickstart', 'centos5', 5),
-(25, 'rh5image', 'RedHat Enterprise Linux 5 (rhel5 im', 'linux', 'partimage',
'image', 5),
-(26, 'rhfc9', 'RedHat Fedora Core 9 kickstart', 'linux', 'kickstart', 'rhfc9',
5),
-(27, 'fc9image', 'RedHat Fedora Core 9 image', 'linux', 'partimage', 'image',
5),
-(28, 'winvista', 'Windows Vista', 'windows', 'partimage', 'image', 7),
-(29, 'centos5image', 'centos5image', 'linux', 'partimage', 'image', 5),
-(30, 'ubuntuimage', 'Ubuntu image', 'linux', 'partimage', 'image', 14),
-(31, 'vmwarewin2008', 'VMware Windows Server 2008', 'windows', 'vmware',
'vmware_images', 16),
-(32, 'win2008', 'Windows Server 2008', 'windows', 'partimage', 'image', 16),
-(33, 'vmwarewinvista', 'VMware Windows Vista', 'windows', 'vmware',
'vmware_images', 7),
-(34, 'win7', 'Windows 7', 'windows', 'partimage', 'image', 17),
-(35, 'vmwarewin7', 'VMware Windows 7', 'windows', 'vmware', 'vmware_images',
17),
-(36, 'vmwarelinux', 'VMware Generic Linux', 'linux', 'vmware',
'vmware_images', 5),
-(37, 'vmwarewin2003', 'VMware Windows 2003 Server', 'windows', 'vmware',
'vmware_images', 13);
+(2, 'sun4x_58', 'Solaris 5.8 (Lab)', 'unix', 'none', NULL, 15),
+(3, 'win2k', 'Windows 2000 (Bare Metal)', 'windows', 'partimage', 'image', 4),
+(6, 'rhel3', 'Red Hat Enterprise Linux 3 (Kickstart)', 'linux', 'kickstart',
'rhas3', 5),
+(7, 'winxp', 'Windows XP (Bare Metal)', 'windows', 'partimage', 'image', 12),
+(8, 'realmrhel3', 'Red Hat Enterprise Linux 3 (Lab)', 'linux', 'none', NULL,
15),
+(9, 'realmrhel4', 'Red Hat Enterprise Linux 4 (Lab)', 'linux', 'none', NULL,
15),
+(10, 'win2003', 'Windows 2003 Server (Bare Metal)', 'windows', 'partimage',
'image', 13),
+(11, 'rh3image', 'Red Hat Enterprise Linux 3 (Bare Metal)', 'linux',
'partimage', 'image', 5),
+(12, 'rhel4', 'Red Hat Enterprise Linux 4 (Kickstart)', 'linux', 'kickstart',
'rhas4', 5),
+(13, 'rh4image', 'Red Hat Enterprise Linux 4 (Bare Metal)', 'linux',
'partimage', 'image', 5),
+(14, 'fc5image', 'Fedora Core 5 (Bare Metal)', 'linux', 'partimage', 'image',
5),
+(15, 'rhfc5', 'Fedora Core 5 (Kickstart)', 'linux', 'kickstart', 'rhfc5', 5),
+(16, 'vmwarewinxp', 'Windows XP (VMware)', 'windows', 'vmware',
'vmware_images', 12),
+(17, 'rhfc7', 'Fedora Core 7 (Kickstart)', 'linux', 'kickstart', 'rhfc7', 5),
+(18, 'fc7image', 'Fedora Core 7 (Bare Metal)', 'linux', 'partimage', 'image',
5),
+(19, 'rhel5', 'Red Hat Enterprise Linux 5 (Kickstart)', 'linux', 'kickstart',
'rhas5', 5),
+(20, 'esx35', 'VMware ESX 3.5 (Kickstart)', 'linux', 'kickstart', 'esx35', 5),
+(21, 'vmwareesxwinxp', 'Windows XP (VMware ESX)', 'windows', 'vmware',
'vmware_images', 12),
+(22, 'realmrhel5', 'Red Hat Enterprise Linux 5 (Lab)', 'linux', 'none', NULL,
15),
+(23, 'sun4x_510', 'Solaris 10 (Lab)', 'unix', 'none', NULL, 15),
+(24, 'centos5', 'CentOS 5 (Kickstart)', 'linux', 'kickstart', 'centos5', 5),
+(25, 'rh5image', 'Red Hat Enterprise Linux 5 (Bare Metal)', 'linux',
'partimage', 'image', 5),
+(26, 'rhfc9', 'RedHat Fedora Core 9 (Kickstart)', 'linux', 'kickstart',
'rhfc9', 5),
+(27, 'fc9image', 'Red Hat Fedora Core 9 (Bare Metal)', 'linux', 'partimage',
'image', 5),
+(28, 'winvista', 'Windows Vista (Bare Metal)', 'windows', 'partimage',
'image', 7),
+(29, 'centos5image', 'CentOS 5 (Bare Metal)', 'linux', 'partimage', 'image',
5),
+(30, 'ubuntuimage', 'Ubuntu (Bare Metal)', 'linux', 'partimage', 'image', 14),
+(31, 'vmwarewin2008', 'Windows Server 2008 (VMware)', 'windows', 'vmware',
'vmware_images', 16),
+(32, 'win2008', 'Windows Server 2008 (Bare Metal)', 'windows', 'partimage',
'image', 16),
+(33, 'vmwarewinvista', 'Windows Vista (VMware)', 'windows', 'vmware',
'vmware_images', 7),
+(34, 'win7', 'Windows 7 (Bare Metal)', 'windows', 'partimage', 'image', 17),
+(35, 'vmwarewin7', 'Windows 7 (VMware)', 'windows', 'vmware', 'vmware_images',
17),
+(36, 'vmwarelinux', 'Generic Linux (VMware)', 'linux', 'vmware',
'vmware_images', 5),
+(37, 'vmwarewin2003', 'Windows 2003 Server (VMware)', 'windows', 'vmware',
'vmware_images', 13);
--
-- Dumping data for table `OSinstalltype`
