You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2014/12/19 20:26:05 UTC

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

Author: arkurth
Date: Fri Dec 19 19:26:05 2014
New Revision: 1646839

URL: http://svn.apache.org/r1646839
Log:
VCL-685
Added condition to override the VM host OS object to Linux if an attempt to use VCL::Module::OS is made.

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=1646839&r1=1646838&r2=1646839&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module.pm Fri Dec 19 19:26:05 2014
@@ -559,7 +559,7 @@ 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) {
+	if ($vmhost_os_perl_package =~ /UnixLab/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;