Author: arkurth
Date: Tue Sep 25 18:57:15 2012
New Revision: 1390050
URL: http://svn.apache.org/viewvc?rev=1390050&view=rev
Log:
Merged revision(s) 1390049 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm:
Merged revision(s) 1390049 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm:
VCL-633
Updated all lines in VMware.pm and vbox.pm which evaluate the value of
vmprofile.vmdisk to check for "local" and "dedicated" instead of only "local".
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(contents, props changed)
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.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=1390050&r1=1390049&r2=1390050&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 Sep 25 18:57:15 2012
@@ -603,7 +603,7 @@ sub capture {
my $repository_mounted_on_vmhost =
$self->is_repository_mounted_on_vmhost();
# Make sure the VM profile repository path is configured if the VM
profile disk type is local
- if ($vmprofile_vmdisk =~ /local/ &&
!$self->get_repository_vmdk_base_directory_path()) {
+ if ($vmprofile_vmdisk =~ /(local|dedicated)/ &&
!$self->get_repository_vmdk_base_directory_path()) {
notify($ERRORS{'CRITICAL'}, 0, "disk type is set to
'$vmprofile_vmdisk' but the repository path is NOT configured for VM profile
'$vmprofile_name', this configuration is not allowed because it may result in
vmdk directories being deleted without a backup copy saved in the image
repository");
return;
}
@@ -729,7 +729,7 @@ sub capture {
}
}
- if ($vmprofile_vmdisk =~ /local/ && $repository_mounted_on_vmhost) {
+ if ($vmprofile_vmdisk =~ /(local|dedicated)/ &&
$repository_mounted_on_vmhost) {
notify($ERRORS{'DEBUG'}, 0, "vmx and vmdk files will not be
copied or renamed directly on the host, the VM profile disk type is
$vmprofile_vmdisk and the image repository is mounted on the host");
$vmdk_file_path_renamed = $vmdk_file_path_original;
$vmx_file_path_renamed = $vmx_file_path_original;
@@ -2683,7 +2683,7 @@ sub reclaim_vmhost_disk_space {
notify($ERRORS{'DEBUG'}, 0, "VM $vmx_file_name can be deleted");
}
- if ($vmhost_profile_vmdisk =~ /local/) {
+ if ($vmhost_profile_vmdisk =~ /(local|dedicated)/) {
for my $vmdk_directory_path (sort keys %$vmdk_directories) {
$vmdk_directories->{$vmdk_directory_path}{deletable} =
1;
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 25 18:57:15 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm:1390049
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.pm?rev=1390050&r1=1390049&r2=1390050&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.pm
Tue Sep 25 18:57:15 2012
@@ -245,7 +245,7 @@ sub load {
} ## end if (open(SIZE, "du -k
$image_repository_path/$requestedimagename 2>&1 |"...
notify($ERRORS{'DEBUG'}, 0, "file size
$myvmdkfilesize of $requestedimagename");
- if ($vmprofile_vmdisk eq "localdisk") {
+ if ($vmprofile_vmdisk =~ /(local|dedicated)/) {
notify($ERRORS{'OK'}, 0, "copying base
image files $requestedimagename to $hostnode");
if
(run_scp_command("$image_repository_path\/vbox\/$requestedimagename",
"$hostnode:\"$datastorepath\/vbox\/\"", $management_node_keys)) {
#recheck host server for files
- the scp output is not being captured
@@ -273,7 +273,7 @@ sub load {
unlink($tmplockfile);
return 0;
}
- } ## end if ($vmprofile_vmdisk eq "localdisk")
+ } ## end if ($vmprofile_vmdisk =~
/(local|dedicated)/)
notify($ERRORS{'OK'}, 0, "confirm image exist
process complete removing lock on $tmplockfile");
close(TMPLOCK);
unlink($tmplockfile);
@@ -554,7 +554,7 @@ sub capture { ## This is going to need t
}
}
- if ($vmprofile_vmdisk eq "localdisk") {
+ if ($vmprofile_vmdisk =~ /(local|dedicated)/) {
# copy vdi files
# confirm they were copied
notify($ERRORS{'OK'}, 0, "Removing VM");
@@ -589,7 +589,7 @@ sub capture { ## This is going to need t
notify($ERRORS{'CRITICAL'}, 0, "failed to copy .vdi
file to image repository");
return 0;
}
- } ## end if ($vmprofile_vmdisk eq "localdisk")
+ } ## end if ($vmprofile_vmdisk =~ /(local|dedicated)/)
} ## end sub capture
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/vbox.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 25 18:57:15 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm:1378995,1383454,1390049
