svn commit: r1729417 - /vcl/trunk/managementnode/lib/VCL/Module.pm

[ar...@apache.org]

Author: arkurth
Date: Tue Feb  9 17:21:55 2016
New Revision: 1729417

URL: http://svn.apache.org/viewvc?rev=1729417&view=rev
Log:
VCL-844
Added additional check to Module.pm::create_vmhost_os_object where it checks which OS module to use. Overrides to Linux.pm if OS is Windows 2003, XP, or Vista. A VM host OS module object would never use these modules.

Modified:
    vcl/trunk/managementnode/lib/VCL/Module.pm

Modified: vcl/trunk/managementnode/lib/VCL/Module.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module.pm?rev=1729417&r1=1729416&r2=1729417&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module.pm Tue Feb  9 17:21:55 2016
@@ -631,7 +631,8 @@ sub create_vmhost_os_object {
 	}
 	
 	# Do not try to load the UnixLab module for VM hosts -- most likely not the intended OS module
-	if ($vmhost_os_perl_package =~ /UnixLab/i || $vmhost_os_perl_package =~ /^VCL::Module::OS$/) {
+	# TODO: add additional checks here, VM host image may be something like XP
+	if ($vmhost_os_perl_package =~ /(UnixLab|2003|XP|Vista)/i || $vmhost_os_perl_package =~ /^VCL::Module::OS$/) {
 		my $vmhost_os_perl_package_override = 'VCL::Module::OS::Linux';
 		notify($ERRORS{'OK'}, 0, "VM host OS image Perl package is $vmhost_os_perl_package, most likely will not work correctly, changing to Linux");
 		$vmhost_os_perl_package = $vmhost_os_perl_package_override;