CE-110 default interval of 0 minutes means do not mark for cleaning

Author: DaanHoogland

plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java

@@ -33,7 +33,7 @@ public interface VmwareManager {
     public static final ConfigKey<Long> s_vmwareNicHotplugWaitTimeout = new ConfigKey<Long>("Advanced", Long.class, "vmware.nic.hotplug.wait.timeout", "15000",
             "Wait timeout (milli seconds) for hot plugged NIC of VM to be detected by guest OS.", false, ConfigKey.Scope.Global);
 
-    public static final ConfigKey<Long> templateCleanupInterval = new ConfigKey<Long>("Advanced", Long.class, "vmware.full.clone.template.cleanup.period", "1440",
+    public static final ConfigKey<Long> templateCleanupInterval = new ConfigKey<Long>("Advanced", Long.class, "vmware.full.clone.template.cleanup.period", "0",
             "period (in minutes) between the start of template cleanup jobs for vmware full cloned templates.", false, ConfigKey.Scope.Global);
 
     public static final ConfigKey<Boolean> s_vmwareCleanOldWorderVMs = new ConfigKey<Boolean>("Advanced", Boolean.class, "vmware.clean.old.worker.vms", "false",

plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java

@@ -1276,7 +1276,9 @@ private void startTemplateCleanJobSchedule() {
         if(s_logger.isDebugEnabled()) {
             s_logger.debug("checking to see if we should schedule a job to search for fully cloned templates to clean-up");
         }
-        if(StorageManager.StorageCleanupEnabled.value() && StorageManager.TemplateCleanupEnabled.value()) {
+        if(StorageManager.StorageCleanupEnabled.value() &&
+                StorageManager.TemplateCleanupEnabled.value() &&
+                templateCleanupInterval.value() > 0) {
             try {
                 if (s_logger.isInfoEnabled()) {
                     s_logger.info("scheduling job to search for fully cloned templates to clean-up once per " + templateCleanupInterval.value() + " minutes.");