Merge pull request #909 from SUSE/develop

yeoldegrove · web-flow · commit 38741a5df939 · 2023-07-19T16:52:26.000+02:00
Develop -&gt; Main for 9.1.0 release
diff --git a/.codespell.ignore.words b/.codespell.ignore.words
@@ -1 +1,2 @@
 msdos
+aas
diff --git a/aws/main.tf b/aws/main.tf
@@ -118,7 +118,7 @@ module "common_variables" {
   hana_cluster_vip                    = local.hana_cluster_vip
   hana_cluster_vip_secondary          = var.hana_active_active ? local.hana_cluster_vip_secondary : ""
   hana_ha_enabled                     = var.hana_ha_enabled
-  hana_ignore_min_mem_check           = var.hana_ignore_min_mem_check
+  hana_extra_parameters               = var.hana_extra_parameters
   hana_cluster_fencing_mechanism      = var.hana_cluster_fencing_mechanism
   hana_sbd_storage_type               = var.sbd_storage_type
   hana_scale_out_enabled              = var.hana_scale_out_enabled
diff --git a/aws/terraform.tfvars.example b/aws/terraform.tfvars.example
@@ -227,10 +227,19 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
 # Enable system replication and HA cluster
 #hana_ha_enabled = true
 
-# Disable minimal memory checks for HANA. Useful to deploy development clusters.
-# Low memory usage can cause a failed deployment. Be aware that this option does
-# not work with any memory size and will most likely fail with less than 16 GiB
-#hana_ignore_min_mem_check = false
+# This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+# For more details about the parameters, have a look at the Parameter Reference, e.g.
+# https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+# Some examples:
+#hana_extra_parameters = {
+#  # needed for HANA 2.0 >= SPS07 as
+#  # the local secure store component (LSS) can only be installed in optimized installation mode.
+#  install_execution_mode = "optimized",
+#  # Disable minimal memory checks for HANA. Useful to deploy development clusters.
+#  # Low memory usage can cause a failed deployment. Be aware that this option does
+#  # not work with any memory size and will most likely fail with less than 16 GiB
+#  ignore = "check_min_mem"
+#}
 
 # The next variables define how the HANA installation software is obtained.
 # The installation software must be located in a AWS S3 bucket
diff --git a/aws/variables.tf b/aws/variables.tf
@@ -531,10 +531,20 @@ variable "hana_cluster_vip_secondary" {
   }
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
-  default     = false
+variable "hana_extra_parameters" {
+  type        = map(any)
+  default     = {}
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+    For more details about the parameters, have a look at the Parameter Reference, e.g.
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    Some examples:
+    hana_extra_parameters = {
+      ignore = "check_min_mem",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "scenario_type" {
diff --git a/azure/main.tf b/azure/main.tf
@@ -109,7 +109,7 @@ module "common_variables" {
   hana_cluster_vip                    = var.hana_ha_enabled ? local.hana_cluster_vip : ""
   hana_cluster_vip_secondary          = var.hana_active_active ? local.hana_cluster_vip_secondary : ""
   hana_ha_enabled                     = var.hana_ha_enabled
-  hana_ignore_min_mem_check           = var.hana_ignore_min_mem_check
+  hana_extra_parameters               = var.hana_extra_parameters
   hana_cluster_fencing_mechanism      = var.hana_cluster_fencing_mechanism
   hana_sbd_storage_type               = var.sbd_storage_type
   hana_scale_out_enabled              = var.hana_scale_out_enabled
diff --git a/azure/terraform.tfvars.example b/azure/terraform.tfvars.example
@@ -338,10 +338,19 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
 # Enable system replication and HA cluster
 #hana_ha_enabled = true
 
-# Disable minimal memory checks for HANA. Useful to deploy development clusters.
-# Low memory usage can cause a failed deployment. Be aware that this option does
-# not work with any memory size and will most likely fail with less than 16 GiB
-#hana_ignore_min_mem_check = false
+# This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+# For more details about the parameters, have a look at the Parameter Reference, e.g.
+# https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+# Some examples:
+#hana_extra_parameters = {
+#  # needed for HANA 2.0 >= SPS07 as
+#  # the local secure store component (LSS) can only be installed in optimized installation mode.
+#  install_execution_mode = "optimized",
+#  # Disable minimal memory checks for HANA. Useful to deploy development clusters.
+#  # Low memory usage can cause a failed deployment. Be aware that this option does
+#  # not work with any memory size and will most likely fail with less than 16 GiB
+#  ignore = "check_min_mem"
+#}
 
 # Each host IP address (sequential order). If it's not set the addresses will be auto generated from the provided vnet address range
 #hana_ips = ["10.74.1.11", "10.74.1.12"]
diff --git a/azure/variables.tf b/azure/variables.tf
@@ -504,10 +504,20 @@ variable "hana_cluster_vip_secondary" {
   }
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
-  default     = false
+variable "hana_extra_parameters" {
+  type        = map(any)
+  default     = {}
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+    For more details about the parameters, have a look at the Parameter Reference, e.g.
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    Some examples:
+    hana_extra_parameters = {
+      ignore = "check_min_mem",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "scenario_type" {
diff --git a/gcp/main.tf b/gcp/main.tf
@@ -127,7 +127,7 @@ module "common_variables" {
   hana_cluster_vip                    = local.hana_cluster_vip
   hana_cluster_vip_secondary          = var.hana_active_active ? local.hana_cluster_vip_secondary : ""
   hana_ha_enabled                     = var.hana_ha_enabled
-  hana_ignore_min_mem_check           = var.hana_ignore_min_mem_check
+  hana_extra_parameters               = var.hana_extra_parameters
   hana_cluster_fencing_mechanism      = var.hana_cluster_fencing_mechanism
   hana_sbd_storage_type               = var.sbd_storage_type
   hana_scale_out_enabled              = var.hana_scale_out_enabled
diff --git a/gcp/terraform.tfvars.example b/gcp/terraform.tfvars.example
@@ -261,10 +261,19 @@ hana_count = "2"
 # Enable system replication and HA cluster
 #hana_ha_enabled = true
 
-# Disable minimal memory checks for HANA. Useful to deploy development clusters.
-# Low memory usage can cause a failed deployment. Be aware that this option does
-# not work with any memory size and will most likely fail with less than 16 GiB
-#hana_ignore_min_mem_check = false
+# This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+# For more details about the parameters, have a look at the Parameter Reference, e.g.
+# https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+# Some examples:
+#hana_extra_parameters = {
+#  # needed for HANA 2.0 >= SPS07 as
+#  # the local secure store component (LSS) can only be installed in optimized installation mode.
+#  install_execution_mode = "optimized",
+#  # Disable minimal memory checks for HANA. Useful to deploy development clusters.
+#  # Low memory usage can cause a failed deployment. Be aware that this option does
+#  # not work with any memory size and will most likely fail with less than 16 GiB
+#  ignore = "check_min_mem"
+#}
 
 # Select HANA cluster fencing mechanism. 'native' by default
 # Find more information in `doc/fencing.md` documentation page
diff --git a/gcp/variables.tf b/gcp/variables.tf
@@ -473,10 +473,20 @@ variable "hana_cluster_vip_secondary" {
   }
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
-  default     = false
+variable "hana_extra_parameters" {
+  type        = map(any)
+  default     = {}
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+    For more details about the parameters, have a look at the Parameter Reference, e.g.
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    Some examples:
+    hana_extra_parameters = {
+      ignore = "check_min_mem",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "scenario_type" {
diff --git a/generic_modules/common_variables/hana_variables.tf b/generic_modules/common_variables/hana_variables.tf
@@ -159,9 +159,19 @@ variable "hana_ha_enabled" {
   type        = bool
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
+variable "hana_extra_parameters" {
+  type        = map(any)
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation.
+
+    Have a look at the Parameter Reference:
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    hana_extra_parameters = {
+      ignore = "check_min_mem,check_version",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "hana_cluster_fencing_mechanism" {
diff --git a/generic_modules/common_variables/outputs.tf b/generic_modules/common_variables/outputs.tf
@@ -66,7 +66,7 @@ output "configuration" {
       cluster_vip                    = var.hana_cluster_vip
       cluster_vip_secondary          = var.hana_cluster_vip_secondary
       ha_enabled                     = var.hana_ha_enabled
-      ignore_min_mem_check           = var.hana_ignore_min_mem_check
+      extra_parameters               = var.hana_extra_parameters
       fencing_mechanism              = var.hana_cluster_fencing_mechanism
       sbd_storage_type               = var.hana_sbd_storage_type
       scale_out_enabled              = var.hana_scale_out_enabled
@@ -158,7 +158,7 @@ hana_client_extract_dir: ${var.hana_client_extract_dir}
 hana_cluster_vip_mechanism: ${var.hana_cluster_vip_mechanism}
 hana_cluster_vip: ${var.hana_cluster_vip}
 hana_cluster_vip_secondary: ${var.hana_cluster_vip_secondary}
-hana_ignore_min_mem_check: ${var.hana_ignore_min_mem_check}
+hana_extra_parameters: {${join(", ", formatlist("'%s': '%s'", keys(var.hana_extra_parameters), values(var.hana_extra_parameters), ), )}}
 hana_scale_out_enabled: ${var.hana_scale_out_enabled}
 hana_scale_out_shared_storage_type: ${var.hana_scale_out_shared_storage_type}
 hana_scale_out_addhosts: {${join(", ", formatlist("'%s': '%s'", keys(var.hana_scale_out_addhosts), values(var.hana_scale_out_addhosts), ), )}}
diff --git a/libvirt/main.tf b/libvirt/main.tf
@@ -116,7 +116,7 @@ module "common_variables" {
   hana_cluster_vip                    = local.hana_cluster_vip
   hana_cluster_vip_secondary          = var.hana_active_active ? local.hana_cluster_vip_secondary : ""
   hana_ha_enabled                     = var.hana_ha_enabled
-  hana_ignore_min_mem_check           = var.hana_ignore_min_mem_check
+  hana_extra_parameters               = var.hana_extra_parameters
   hana_cluster_fencing_mechanism      = var.hana_cluster_fencing_mechanism
   hana_sbd_storage_type               = var.sbd_storage_type
   hana_scale_out_enabled              = var.hana_scale_out_enabled
diff --git a/libvirt/terraform.tfvars.example b/libvirt/terraform.tfvars.example
@@ -184,14 +184,23 @@ hana_inst_master = "url-to-your-nfs-share:/sapdata/sap_inst_media/51053381"
 # Enable system replication and HA cluster
 #hana_ha_enabled = true
 
+# This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+# For more details about the parameters, have a look at the Parameter Reference, e.g.
+# https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+# Some examples:
+#hana_extra_parameters = {
+#  # needed for HANA 2.0 >= SPS07 as
+#  # the local secure store component (LSS) can only be installed in optimized installation mode.
+#  install_execution_mode = "optimized",
+#  # Disable minimal memory checks for HANA. Useful to deploy development clusters.
+#  # Low memory usage can cause a failed deployment. Be aware that this option does
+#  # not work with any memory size and will most likely fail with less than 16 GiB
+#  ignore = "check_min_mem"
+#}
+
 # Select SBD as fencing mechanism for the HANA cluster
 #hana_cluster_fencing_mechanism = "sbd"
 
-# Disable minimal memory checks for HANA. Useful to deploy development clusters.
-# Low memory usage can cause a failed deployment. Be aware that this option does
-# not work with any memory size and will most likely fail with less than 16 GiB
-#hana_ignore_min_mem_check = false
-
 # More configuration about the HANA machines
 # Set the IP addresses for the HANA machines. Leave this commented to get an autogenerated addresses
 #hana_ips         = ["192.168.XXX.Y", "192.168.XXX.Y+1"]
diff --git a/libvirt/variables.tf b/libvirt/variables.tf
@@ -418,10 +418,20 @@ variable "hana_cluster_vip_secondary" {
   }
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
-  default     = false
+variable "hana_extra_parameters" {
+  type        = map(any)
+  default     = {}
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+    For more details about the parameters, have a look at the Parameter Reference, e.g.
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    Some examples:
+    hana_extra_parameters = {
+      ignore = "check_min_mem",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "scenario_type" {
diff --git a/openstack/main.tf b/openstack/main.tf
@@ -130,7 +130,7 @@ module "common_variables" {
   hana_cluster_vip                    = local.hana_cluster_vip
   hana_cluster_vip_secondary          = var.hana_active_active ? local.hana_cluster_vip_secondary : ""
   hana_ha_enabled                     = var.hana_ha_enabled
-  hana_ignore_min_mem_check           = var.hana_ignore_min_mem_check
+  hana_extra_parameters               = var.hana_extra_parameters
   hana_cluster_fencing_mechanism      = var.hana_cluster_fencing_mechanism
   hana_sbd_storage_type               = var.sbd_storage_type
   hana_scale_out_enabled              = var.hana_scale_out_enabled
diff --git a/openstack/terraform.tfvars.example b/openstack/terraform.tfvars.example
@@ -278,10 +278,19 @@ hana_cluster_vip_secondary = "10.0.0.13"
 # Enable system replication and HA cluster
 #hana_ha_enabled = true
 
-# Disable minimal memory checks for HANA. Useful to deploy development clusters.
-# Low memory usage can cause a failed deployment. Be aware that this option does
-# not work with any memory size and will most likely fail with less than 16 GiB
-#hana_ignore_min_mem_check = false
+# This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+# For more details about the parameters, have a look at the Parameter Reference, e.g.
+# https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+# Some examples:
+#hana_extra_parameters = {
+#  # needed for HANA 2.0 >= SPS07 as
+#  # the local secure store component (LSS) can only be installed in optimized installation mode.
+#  install_execution_mode = "optimized",
+#  # Disable minimal memory checks for HANA. Useful to deploy development clusters.
+#  # Low memory usage can cause a failed deployment. Be aware that this option does
+#  # not work with any memory size and will most likely fail with less than 16 GiB
+#  ignore = "check_min_mem"
+#}
 
 # Select HANA cluster fencing mechanism. 'native' by default
 # Find more information in `doc/fencing.md` documentation page
diff --git a/openstack/variables.tf b/openstack/variables.tf
@@ -477,10 +477,20 @@ variable "hana_fstype" {
   default     = "xfs"
 }
 
-variable "hana_ignore_min_mem_check" {
-  description = "Disable the min mem check imposed by hana allowing it to run with under 24 GiB"
-  type        = bool
-  default     = false
+variable "hana_extra_parameters" {
+  type        = map(any)
+  default     = {}
+  description = <<EOF
+    This map allows to add any extra parameters to the HANA installation (inside the installation configfile).
+    For more details about the parameters, have a look at the Parameter Reference, e.g.
+    https://help.sap.com/docs/SAP_HANA_PLATFORM/2c1988d620e04368aa4103bf26f17727/c16432a77b6144dcb75aace2b4fcacff.html
+
+    Some examples:
+    hana_extra_parameters = {
+      ignore = "check_min_mem",
+      install_execution_mode = "optimized"
+    }
+  EOF
 }
 
 variable "scenario_type" {
diff --git a/pillar_examples/automatic/hana/hana.sls b/pillar_examples/automatic/hana/hana.sls
@@ -76,15 +76,15 @@ hana:
         {% endif %}
         system_user_password: {{ grains['hana_master_password'] }}
         sapadm_password: {{ grains['hana_master_password'] }}
-        {% if grains['hana_ignore_min_mem_check'] or grains['hana_scale_out_enabled'] %}
         extra_parameters:
-        {% if grains['hana_ignore_min_mem_check'] %}
-          ignore: check_min_mem
-        {% endif %}
+          lss_user_password: {{ grains['hana_master_password'] }}
+          lss_backup_password: {{ grains['hana_master_password'] }}
+        {% for key, val in grains['hana_extra_parameters'].items() %}
+          {{ key }}: {{ val }}
+        {% endfor %}
         {% if grains['hana_scale_out_enabled'] %}
           addhosts: {{ addhosts.site1 }}
         {% endif %}
-        {% endif %}
       {%- if grains.get('ha_enabled') %}
       primary:
         name: {{ grains['hana_primary_site'] }}
@@ -125,15 +125,15 @@ hana:
         {% endif %}
         system_user_password: {{ grains['hana_master_password'] }}
         sapadm_password: {{ grains['hana_master_password'] }}
-        {% if grains['hana_ignore_min_mem_check'] or grains['hana_scale_out_enabled'] %}
         extra_parameters:
-        {% if grains['hana_ignore_min_mem_check'] %}
-          ignore: check_min_mem
-        {% endif %}
+          lss_user_password: {{ grains['hana_master_password'] }}
+          lss_backup_password: {{ grains['hana_master_password'] }}
+        {% for key, val in grains['hana_extra_parameters'].items() %}
+          {{ key }}: {{ val }}
+        {% endfor %}
         {% if grains['hana_scale_out_enabled'] %}
           addhosts: {{ addhosts.site2 }}
         {% endif %}
-        {% endif %}
       {%- if grains.get('ha_enabled') %}
       secondary:
         name: {{ grains['hana_secondary_site'] }}
@@ -171,10 +171,12 @@ hana:
         {% endif %}
         system_user_password: {{ grains['hana_cost_optimized_master_password'] }}
         sapadm_password: {{ grains['hana_cost_optimized_master_password'] }}
-        {% if grains['hana_ignore_min_mem_check'] %}
         extra_parameters:
-          ignore: check_min_mem
-        {% endif %}
+          lss_user_password: {{ grains['hana_master_password'] }}
+          lss_backup_password: {{ grains['hana_master_password'] }}
+        {% for key, val in grains['hana_extra_parameters'].items() %}
+          {{ key }}: {{ val }}
+        {% endfor %}
       {% if grains.get('monitoring_enabled', False) %}
       exporter:
         exposition_port: 9669
diff --git a/salt/provision.sh b/salt/provision.sh
