Author: arkurth
Date: Thu Mar 19 19:53:53 2015
New Revision: 1667857
URL: http://svn.apache.org/r1667857
Log:
VCL-841
Updated VMware.pm so that configure_vmhost_dedicated_ssh_key is only called for
ESXi 4.x. It is no longer needed for 5.x and causes warnings in vcld.log.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1667857&r1=1667856&r2=1667857&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Thu
Mar 19 19:53:53 2015
@@ -378,7 +378,7 @@ sub initialize {
if ($request_state_name eq 'timeout' && (!$vmhost_lastcheck_time ||
(time - convert_to_epoch_seconds($vmhost_lastcheck_time)) > (60 * 60 * 24 *
30))) {
# Configure the SSH authorized_keys file to persist through
reboots if the VM host is running VMware ESXi
# This shouldn't need to be done more than once, only call this
if the state is 'reclaim'
- if (ref($self->vmhost_os) =~ /Linux/i && $vmhost_product_name
=~ /ESXi/) {
+ if (ref($self->vmhost_os) =~ /Linux/i && $vmhost_product_name
=~ /ESXi 4/) {
$self->configure_vmhost_dedicated_ssh_key();
}
