Author: arkurth
Date: Tue Jan 22 17:27:02 2013
New Revision: 1437064
URL: http://svn.apache.org/viewvc?rev=1437064&view=rev
Log:
Merged revision(s) 1437063 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm:
VCL-668
Updated code in VMware.pm which checks the output of the vmkfstools command
used to copy a vmdk image. It was checking for a "100% done" line in the
output. This line is not always displayed with ESXi 5.1.
........
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(contents, props changed)
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1437064&r1=1437063&r2=1437064&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
Tue Jan 22 17:27:02 2013
@@ -5902,7 +5902,7 @@ sub copy_vmdk {
return;
}
}
- elsif (grep(/Failed to clone disk/, @$output) || !grep(/(100\%
done|success)/, @$output)) {
+ elsif (grep(/(failed|warning|error)/i, @$output)) {
notify($ERRORS{'WARNING'}, 0, "failed to copy virtual
disk\ncommand: '$command'\noutput:\n" . join("\n", @$output));
}
else {
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
------------------------------------------------------------------------------
Merged
/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm:r1437063
