Author: fapeeler
Date: Thu Apr 5 14:48:42 2012
New Revision: 1309888
URL: http://svn.apache.org/viewvc?rev=1309888&view=rev
Log:
VCL-276
extended sublog table for block reservation start and end times
Other:
added fedora16 environments
Modified:
incubator/vcl/trunk/mysql/update-vcl.sql
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1309888&r1=1309887&r2=1309888&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-vcl.sql (original)
+++ incubator/vcl/trunk/mysql/update-vcl.sql Thu Apr 5 14:48:42 2012
@@ -681,6 +681,9 @@ CALL AddIndexIfNotExists('statgraphcache
--
CALL AddColumnIfNotExists('sublog', 'hostcomputerid', "smallint(5) unsigned
default NULL");
+CALL AddColumnIfNotExists('sublog', 'blockRequestid', "mediumint(8) unsigned
NOT NULL");
+CALL AddColumnIfNotExists('sublog', 'blockStart', "datetime NOT NULL");
+CALL AddColumnIfNotExists('sublog', 'blockEnd', "datetime NOT NULL");
-- --------------------------------------------------------
@@ -822,6 +825,10 @@ INSERT IGNORE INTO `OS` (`name`, `pretty
INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('vmwarewin2003', 'VMware Windows 2003
Server', 'windows', 'vmware', 'vmware_images', (SELECT `id` FROM `module` WHERE
`name` LIKE 'os_win2003'));
INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('esxi4.1', 'VMware ESXi 4.1', 'linux',
'kickstart', 'esxi4.1', (SELECT `id` FROM `module` WHERE `name` LIKE
'os_esxi'));
INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('vmwareosx', 'OSX Snow Leopard (VMware)',
'osx', 'vmware', 'vmware_images', (SELECT `id` FROM `module` WHERE `name` LIKE
'os_osx'));
+INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('rhel6', 'Red Hat Enterprise Level 6',
'linux', 'kickstart', 'rhel6', (SELECT `id` FROM `module` WHERE `name` LIKE
'os_linux'));
+INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('rh6image', 'Red Hat 6 image', 'linux',
'partimage', 'image', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_linux'));
+INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('fedora16', 'Fedora 16', 'linux',
'kickstart', 'fedora16', (SELECT `id` FROM `module` WHERE `name` LIKE
'os_linux'));
+INSERT IGNORE INTO `OS` (`name`, `prettyname`, `type`, `installtype`,
`sourcepath`, `moduleid`) VALUES ('fedoraimage', 'Fedora 16 image', 'linux',
'partimage', 'image', (SELECT `id` FROM `module` WHERE `name` LIKE 'os_linux'));
-- --------------------------------------------------------
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=1309888&r1=1309887&r2=1309888&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Thu Apr 5 14:48:42 2012
@@ -1022,6 +1022,9 @@ CREATE TABLE IF NOT EXISTS `sublog` (
`managementnodeid` smallint(5) unsigned NOT NULL default '0',
`predictivemoduleid` smallint(5) unsigned NOT NULL default '8',
`hostcomputerid` smallint(5) unsigned default NULL,
+ `blockRequestid` mediumint(8) unsigned NOT NULL,
+ `blockStart` datetime NOT NULL,
+ `blockEnd` datetime NOT NULL,
KEY `logid` (`logid`),
KEY `imageid` (`imageid`),
KEY `imagerevisionid` (`imagerevisionid`),
@@ -1506,7 +1509,11 @@ INSERT INTO `OS` (`id`, `name`, `prettyn
(36, 'vmwarelinux', 'Generic Linux (VMware)', 'linux', 'vmware',
'vmware_images', 5),
(37, 'vmwarewin2003', 'Windows 2003 Server (VMware)', 'windows', 'vmware',
'vmware_images', 13),
(38, 'esxi4.1', 'VMware ESXi 4.1', 'linux', 'kickstart', 'esxi4.1', 25),
-(39, 'vmwareosx', 'OSX Snow Leopard (VMware)', 'osx', 'vmware',
'vmware_images', 26);
+(39, 'vmwareosx', 'OSX Snow Leopard (VMware)', 'osx', 'vmware',
'vmware_images', 26),
+(40, 'rhel6', 'Red Hat Enterprise Lev 6', 'linux', 'kickstart', 'rhel6', 5),
+(41, 'rh6image', 'Red Hat Enterprise 6 image', 'linux', 'partimage', 'image',
5),
+(42, 'fedora16', 'Fedora 16 kickstart', 'linux', 'kickstart', 'fedora16', 5),
+(43, 'fedoraimage', 'Fedora 16 image', 'linux', 'partimage', 'image', 5);
--
-- Dumping data for table `OSinstalltype`
