Port 4.20 - Configuração para desconsiderar _settings_ durante a criação de templates

Author: Henrique Sato

engine/components-api/src/main/java/com/cloud/template/TemplateManager.java

@@ -56,6 +56,16 @@ public interface TemplateManager {
             + "will validate if the provided URL is resolvable during the register of templates/ISOs before persisting them in the database.",
             true);
 
+    ConfigKey<String> TemplateSettingsInheritanceDenyList = new ConfigKey<>(
+            String.class,
+            "template.settings.inheritance.deny.list",
+            "Advanced",
+            "",
+            "List of settings to not consider when creating a template. The template settings are inherited from the instance the volume or snapshot belongs to.",
+            true,
+            ConfigKey.Scope.Global, null, null, null, null, null,
+            ConfigKey.Kind.CSV, null);
+
     static final String VMWARE_TOOLS_ISO = "vmware-tools.iso";
     static final String XS_TOOLS_ISO = "xs-tools.iso";
 

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -1960,6 +1960,7 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
         VMTemplateVO template = _tmpltDao.persist(privateTemplate);
         // Increment the number of templates
         if (template != null) {
+            List<String> templateSettingsDenyList = List.of(TemplateSettingsInheritanceDenyList.value().split(","));
             Map<String, String> details = new HashMap<String, String>();
 
             if (sourceTemplateId != null) {
@@ -1976,9 +1977,10 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
                     if (userVm != null) {
                         _userVmDao.loadDetails(userVm);
                         Map<String, String> vmDetails = userVm.getDetails();
+                        logger.debug("Removing the {} settings from template because they were defined in the {} global setting.", templateSettingsDenyList, TemplateSettingsInheritanceDenyList.key());
                         vmDetails = vmDetails.entrySet()
                                 .stream()
-                                .filter(map -> map.getValue() != null)
+                                .filter(map -> map.getValue() != null && !templateSettingsDenyList.contains(map.getKey()))
                                 .collect(Collectors.toMap(map -> map.getKey(), map -> map.getValue()));
                         details.putAll(vmDetails);
                     }
@@ -2364,7 +2366,7 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {AllowPublicUserTemplates, TemplatePreloaderPoolSize, ValidateUrlIsResolvableBeforeRegisteringTemplate};
+        return new ConfigKey<?>[] {AllowPublicUserTemplates, TemplatePreloaderPoolSize, ValidateUrlIsResolvableBeforeRegisteringTemplate, TemplateSettingsInheritanceDenyList};
     }
 
     public List<TemplateAdapter> getTemplateAdapters() {