Author: jfthomps
Date: Fri Mar 13 16:55:03 2015
New Revision: 1666514
URL: http://svn.apache.org/r1666514
Log:
vcl.sql: changed prettyname of predictive loading modules as follows:
Predictive Loading Module Level 0 -> Reload with last imag
Predictive Loading Module Level 1 -> Reload image based on recent user demand
Predictive Loading Module Level 2 -> Unload/power off after reservation
update-vcl.sql: added updates to change prettyname of predictive loading
modules as follows:
Predictive Loading Module Level 0 -> Reload with last imag
Predictive Loading Module Level 1 -> Reload image based on recent user demand
changed prettyname for insert of level 2 from "Predictive Loading Module Level
2" to "Unload/power off after reservation"
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1666514&r1=1666513&r2=1666514&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Fri Mar 13 16:55:03 2015
@@ -1558,6 +1558,8 @@ UPDATE image SET imagemetaid = NULL WHER
UPDATE IGNORE `module` SET `name` = 'provisioning_vmware_1x', `prettyname` =
'VMware Server 1.x Provisioning Module' WHERE `name` =
'provisioning_vmware_gsx';
UPDATE IGNORE `module` SET `name` = 'provisioning_xCAT', `prettyname` = 'xCAT'
WHERE `name` = 'provisioning_xcat_13';
+UPDATE IGNORE `module` SET `prettyname` = 'Reload with last image' WHERE
`name` = 'predictive_level_0' AND `prettyname` = 'Predictive Loading Module
Level 0';
+UPDATE IGNORE `module` SET `prettyname` = 'Reload image based on recent user
demand' WHERE `name` = 'predictive_level_1' AND `prettyname` = 'Predictive
Loading Module Level 1';
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_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');
@@ -1569,7 +1571,7 @@ INSERT IGNORE INTO `module` (`name`, `pr
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('os_linux_managementnode', 'Management Mode Linux OS
Module', '', 'VCL::Module::OS::Linux::ManagementNode');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('os_win8', 'Windows 8.x OS Module', '',
'VCL::Module::OS::Windows::Version_6::8');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('os_win2012', 'Windows Server 2012 OS Module', '',
'VCL::Module::OS::Windows::Version_6::2012');
-INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('predictive_level_2', 'Predictive Loading Module Level
2', 'Power off computer. If a virtual machine, it will be also destroyed.',
'VCL::Module::Predictive::Level_2');
+INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('predictive_level_2', 'Unload/power off after
reservation', 'Power off computer. If a virtual machine, it will be also
destroyed.', 'VCL::Module::Predictive::Level_2');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_openstack', 'OpenStack Provisioning
Module', '', 'VCL::Module::Provisioning::openstack');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_one', 'OpenNebula Provisioning Module',
'', 'VCL::Module::Provisioning::one');
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1666514&r1=1666513&r2=1666514&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Fri Mar 13 16:55:03 2015
@@ -1691,8 +1691,8 @@ INSERT IGNORE INTO `module` (`id`, `name
(5, 'os_linux', 'Linux OS Module', '', 'VCL::Module::OS::Linux'),
(6, 'os_unix', 'Unix OS Module', '', 'VCL::Module::OS'),
(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'),
+(8, 'predictive_level_0', 'Reload with last image', 'Reloads node with same
image as was just used on it.', 'VCL::Module::Predictive::Level_0'),
+(9, 'predictive_level_1', 'Reload image based on recent user demand', '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'),
(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'),
(14, 'os_linux_ubuntu', 'Ubuntu Linux OS Module', '',
'VCL::Module::OS::Linux::Ubuntu'),
@@ -1709,7 +1709,7 @@ INSERT IGNORE INTO `module` (`id`, `name
(28, 'os_linux_managementnode', 'Management Node Linux OS Module', '',
'VCL::Module::OS::Linux::ManagementNode'),
(29, 'os_win8', 'Windows 8.x OS Module', '',
'VCL::Module::OS::Windows::Version_6::8'),
(30, 'os_win2012', 'Windows Server 2012 OS Module', '',
'VCL::Module::OS::Windows::Version_6::2012'),
-(31, 'predictive_level_2', 'Predictive Loading Module Level 2', 'Power off
computer. If a virtual machine, it will be also destroyed.',
'VCL::Module::Predictive::Level_2'),
+(31, 'predictive_level_2', 'Unload/power off after reservation', 'Power off
computer. If a virtual machine, it will be also destroyed.',
'VCL::Module::Predictive::Level_2'),
(32, 'provisioning_openstack', 'OpenStack Provisioning Module', '',
'VCL::Module::Provisioning::openstack'),
(33, 'provisioning_one', 'OpenNebula Provisioning Module', '',
'VCL::Module::Provisioning::one');
