Author: arkurth
Date: Tue Sep 14 20:16:26 2010
New Revision: 997071
URL: http://svn.apache.org/viewvc?rev=997071&view=rev
Log:
VCL-357
Updated vcl.sql:
Removed entry for old VMware module from the provisioning table. Removed entry
for ESX provisioning module in provisioning and module tables. Renamed new
VMware module to remove vSphere from the name. Updated update-2.2.sql to match
renamed entries.
Modified:
incubator/vcl/trunk/mysql/update-2.2.sql
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/update-2.2.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-2.2.sql?rev=997071&r1=997070&r2=997071&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-2.2.sql (original)
+++ incubator/vcl/trunk/mysql/update-2.2.sql Tue Sep 14 20:16:26 2010
@@ -391,7 +391,7 @@ INSERT IGNORE INTO `affiliation` (`name`
UPDATE IGNORE `module` SET `name` = 'provisioning_vmware_1x', `prettyname` =
'VMware Server 1.x Provisioning Module' WHERE `name` =
'provisioning_vmware_gsx';
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('os_win7', 'Windows 7 OS Module', '',
'VCL::Module::OS::Windows::Version_6::7');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_xcat_2x', 'xCAT 2.x Provisioning Module',
'', 'VCL::Module::Provisioning::xCAT2');
-INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_vmware_vsphere', 'VMware vSphere
Provisioning Module', '', 'VCL::Module::Provisioning::VMware::VMware');
+INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_vmware', 'VMware Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('state_image', 'VCL Image State Module', '',
'VCL::image');
-- --------------------------------------------------------
@@ -412,7 +412,7 @@ INSERT IGNORE INTO `OS` (`name`, `pretty
--
INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('xcat_2x', 'xCAT 2.x', (SELECT `id` FROM `module` WHERE `name` LIKE
'provisioning_xcat_2x'));
-INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('vmware_vsphere', 'VMware vSphere', (SELECT `id` FROM `module` WHERE `name`
LIKE 'provisioning_vmware_vsphere'));
+INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('vmware', 'VMware', (SELECT `id` FROM `module` WHERE `name` LIKE
'provisioning_vmware'));
-- --------------------------------------------------------
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=997071&r1=997070&r2=997071&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Tue Sep 14 20:16:26 2010
@@ -1263,7 +1263,6 @@ INSERT INTO `module` (`id`, `name`, `pre
(7, 'os_winvista', 'Windows Vista OS Module', '',
'VCL::Module::OS::Windows::Version_6::Vista'),
(8, 'predictive_level_0', 'Predictive Loading Module Level 0', 'Selects an
image to load based on upcoming reservations.',
'VCL::Module::Predictive::Level_0'),
(9, 'predictive_level_1', 'Predictive Loading Module Level 1', 'Selects an
image to load based on historical data. Loads the most popular image that can
be run on the machine that is not currently loaded and available on another
node.', 'VCL::Module::Predictive::Level_1'),
-(10, 'provisioning_vmware_esx', 'VMware ESX Provisioning Module', '',
'VCL::Module::Provisioning::esx'),
(11, 'provisioning_xcat_21', 'xCAT 2.1 Provisioning Module', '',
'VCL::Module::Provisioning::xCAT21'),
(12, 'os_winxp', 'Windows XP OS Module', '',
'VCL::Module::OS::Windows::Version_5::XP'),
(13, 'os_win2003', 'Windows Server 2003 OS Module', '',
'VCL::Module::OS::Windows::Version_5::2003'),
@@ -1272,7 +1271,7 @@ 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', 'VMware Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware'),
(22, 'state_image', 'VCL Image State Module', '', 'VCL::image');
--
@@ -1360,12 +1359,10 @@ INSERT INTO `privnode` (`id`, `parent`,
INSERT INTO `provisioning` (`id`, `name`, `prettyname`, `moduleid`) VALUES
(1, 'xcat_13', 'xCAT 1.3', 1),
-(2, 'vmware_server_gsx', 'VMware Server 1.x', 2),
(3, 'lab', 'Computing Lab', 3),
-(4, 'vmware_esx', 'VMware ESX', 10),
(5, 'xcat_21', 'xCAT 2.1', 11),
(6, 'xcat_2x', 'xCAT 2.x', 20),
-(7, 'vmware_vsphere', 'VMware vSphere', 21);
+(7, 'vmware', 'VMware', 21);
--
-- Dumping data for table `resource`
