Merge pull request sap-linuxlab#1228 from berndfinger/preconfigure-vars-fixes-for-ansible-219

sap_general_preconfigure, sap_hana_preconfigure: Fixes for Ansible 2.19

Author: berndfinger

roles/sap_general_preconfigure/meta/argument_specs.yml

@@ -157,7 +157,8 @@ argument_specs:
         example:
           '@minimal-environment'
         required: false
-        type: str
+        type: list
+        elements: str
 
       sap_general_preconfigure_envgroups:
         default: "{{ __sap_general_preconfigure_envgroups }}"
@@ -167,7 +168,8 @@ argument_specs:
         example:
           '@minimal-environment'
         required: false
-        type: str
+        type: list
+        elements: str
 
       sap_general_preconfigure_patterns:
         default: "{{ __sap_general_preconfigure_patterns }}"

roles/sap_general_preconfigure/vars/RedHat_7.yml

@@ -59,8 +59,6 @@ __sap_general_preconfigure_req_hana_repos:
 __sap_general_preconfigure_req_ha_repos:
   - rhel-ha-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ __sap_general_preconfigure_rhel_7_ha_arch_string }}-{{ __sap_general_preconfigure_max_repo_type_ha_string }}rpms
 
-__sap_general_preconfigure_envgroups: ""
-
 __sap_general_preconfigure_packagegroups_x86_64:
   - "@base"
   - "@compat-libraries"
@@ -145,9 +143,9 @@ __sap_general_preconfigure_required_ppc64le:
   - ppc64-diag
   - IBMinvscout
 
-__sap_general_preconfigure_min_packages_7_2:
+__sap_general_preconfigure_min_packages_7_2: []
 
-__sap_general_preconfigure_min_packages_7_3:
+__sap_general_preconfigure_min_packages_7_3: []
 
 # SAP note 2812427:
 __sap_general_preconfigure_min_packages_7_4:
@@ -161,11 +159,11 @@ __sap_general_preconfigure_min_packages_7_5:
 __sap_general_preconfigure_min_packages_7_6:
   - [ 'kernel', '3.10.0-957.35.1.el7' ]
 
-__sap_general_preconfigure_min_packages_7_7:
+__sap_general_preconfigure_min_packages_7_7: []
 
-__sap_general_preconfigure_min_packages_7_8:
+__sap_general_preconfigure_min_packages_7_8: []
 
-__sap_general_preconfigure_min_packages_7_9:
+__sap_general_preconfigure_min_packages_7_9: []
 
 __sap_general_preconfigure_min_pkgs: "{{ lookup('vars', '__sap_general_preconfigure_min_packages_' + ansible_facts['distribution_version'] | replace(\".\", \"_\")) }}"
 

roles/sap_general_preconfigure/vars/SLES_15.yml

@@ -34,8 +34,6 @@ __sap_general_preconfigure_packages_2578899:
   - sysctl-logger
 
 __sap_general_preconfigure_min_pkgs: []
-__sap_general_preconfigure_packagegroups:
-__sap_general_preconfigure_envgroups:
 __sap_general_preconfigure_kernel_parameters_default: []
 
 # SLES_SAP is using saptune, but SLES is using sapconf.

roles/sap_general_preconfigure/vars/SLES_SAP_15.yml

@@ -35,8 +35,6 @@ __sap_general_preconfigure_packages_2578899:
   - sysctl-logger
 
 __sap_general_preconfigure_min_pkgs: []
-__sap_general_preconfigure_packagegroups:
-__sap_general_preconfigure_envgroups:
 __sap_general_preconfigure_kernel_parameters_default: []
 
 # SLES_SAP is using saptune, but SLES is using sapconf.

roles/sap_general_preconfigure/vars/SLES_SAP_16.yml

@@ -29,8 +29,6 @@ __sap_general_preconfigure_packages:
   - lsof
 
 __sap_general_preconfigure_min_pkgs: []
-__sap_general_preconfigure_packagegroups:
-__sap_general_preconfigure_envgroups:
 __sap_general_preconfigure_kernel_parameters_default: []
 
 # SLES_SAP is using saptune, but SLES is using sapconf.

roles/sap_general_preconfigure/vars/main.yml

@@ -2,8 +2,8 @@
 ---
 
 # dummy entries for passing the arg spec validation:
-__sap_general_preconfigure_packagegroups: ''
-__sap_general_preconfigure_envgroups: ''
+__sap_general_preconfigure_packagegroups: []
+__sap_general_preconfigure_envgroups: []
 __sap_general_preconfigure_patterns: []
 __sap_general_preconfigure_packages: []
 __sap_general_preconfigure_min_pkgs: []

roles/sap_hana_preconfigure/vars/RedHat_10.yml

@@ -132,8 +132,6 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_precon
 
 # In SAP Note XXX, certain minimal required packages for the different RHEL 10 minor releases are listed.
 # The following will assign them properly to __sap_hana_preconfigure_min_pkgs.
-# If variable __sap_hana_preconfigure_min_packages_VERSION_ARCH is not defined,
-# variable __sap_hana_preconfigure_min_pkgs will be undefined as well.
 
 # Minimum required package levels for RHEL 10.0:
 __sap_hana_preconfigure_min_packages_10_0_x86_64:

roles/sap_hana_preconfigure/vars/RedHat_7.yml

@@ -58,8 +58,6 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_precon
 
 # In SAP Note 2235581, certain minimal required packages for the different RHEL 7 minor releases are listed.
 # The following will assign them properly to __sap_hana_preconfigure_min_pkgs.
-# If variable __sap_hana_preconfigure_min_packages_VERSION is not defined,
-# variable __sap_hana_preconfigure_min_pkgs will be undefined as well.
 
 __sap_hana_preconfigure_min_packages_7_2_x86_64:
   - [ 'kernel', '3.10.0-327.62.4.el7' ]
@@ -88,9 +86,9 @@ __sap_hana_preconfigure_min_packages_7_4_ppc64le:
   - [ 'kernel', '3.10.0-693.11.6.el7' ]
   - [ 'tuned-profiles-sap-hana', '2.8.0-5.el7_4.2' ]
 
-__sap_hana_preconfigure_min_packages_7_5_x86_64:
+__sap_hana_preconfigure_min_packages_7_5_x86_64: []
 
-__sap_hana_preconfigure_min_packages_7_5_ppc64le:
+__sap_hana_preconfigure_min_packages_7_5_ppc64le: []
 
 # Attention: SAP note 2812427 requires more recent package kernel-3.10.0-957.35.1, covered by role sap_general_preconfigure
 __sap_hana_preconfigure_min_packages_7_6_x86_64:
@@ -106,9 +104,9 @@ __sap_hana_preconfigure_min_packages_7_7_x86_64:
 __sap_hana_preconfigure_min_packages_7_7_ppc64le:
   - [ 'kernel', '3.10.0-1062.26.1.el7' ]
 
-__sap_hana_preconfigure_min_packages_7_8_x86_64:
+__sap_hana_preconfigure_min_packages_7_8_x86_64: []
 
-__sap_hana_preconfigure_min_packages_7_8_ppc64le:
+__sap_hana_preconfigure_min_packages_7_8_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_7_9_x86_64:
   - [ 'kernel', '3.10.0-1160.11.1.el7' ]

roles/sap_hana_preconfigure/vars/RedHat_8.yml

@@ -138,12 +138,10 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_precon
 
 # In SAP Note 2777782, certain minimal required packages for the different RHEL 8 minor releases are listed.
 # The following will assign them properly to __sap_hana_preconfigure_min_pkgs.
-# If variable __sap_hana_preconfigure_min_packages_VERSION_ARCH is not defined,
-# variable __sap_hana_preconfigure_min_pkgs will be undefined as well.
 
 # Minimum required package levels for RHEL 8.0:
 # Attention: SAP note 2812427 requires more recent package kernel-4.18.0-80.15.1.el8_0 also for x86_64, covered by role sap_general_preconfigure
-__sap_hana_preconfigure_min_packages_8_0_x86_64:
+__sap_hana_preconfigure_min_packages_8_0_x86_64: []
 
 __sap_hana_preconfigure_min_packages_8_0_ppc64le:
   - [ 'kernel', '4.18.0-80.15.1.el8_0' ]
@@ -160,38 +158,38 @@ __sap_hana_preconfigure_min_packages_8_2_x86_64:
 __sap_hana_preconfigure_min_packages_8_2_ppc64le:
   - [ 'kernel', '4.18.0-193.40.1.el8_2' ]
 
-__sap_hana_preconfigure_min_packages_8_3_x86_64:
+__sap_hana_preconfigure_min_packages_8_3_x86_64: []
 
-__sap_hana_preconfigure_min_packages_8_3_ppc64le:
+__sap_hana_preconfigure_min_packages_8_3_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_8_4_x86_64:
   - [ 'kernel', '4.18.0-305.3.1.el8_4' ]
 
 __sap_hana_preconfigure_min_packages_8_4_ppc64le:
   - [ 'kernel', '4.18.0-305.17.1.el8_4' ]
 
-__sap_hana_preconfigure_min_packages_8_5_x86_64:
+__sap_hana_preconfigure_min_packages_8_5_x86_64: []
 
-__sap_hana_preconfigure_min_packages_8_5_ppc64le:
+__sap_hana_preconfigure_min_packages_8_5_ppc64le: []
 
-__sap_hana_preconfigure_min_packages_8_6_x86_64:
+__sap_hana_preconfigure_min_packages_8_6_x86_64: []
 
 __sap_hana_preconfigure_min_packages_8_6_ppc64le:
   - [ 'kernel', '4.18.0-372.32.1.el8_6' ]
 
-__sap_hana_preconfigure_min_packages_8_7_x86_64:
+__sap_hana_preconfigure_min_packages_8_7_x86_64: []
 
-__sap_hana_preconfigure_min_packages_8_7_ppc64le:
+__sap_hana_preconfigure_min_packages_8_7_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_8_8_x86_64:
   - [ 'kernel', '4.18.0-477.13.1.el8_8' ]
 
 __sap_hana_preconfigure_min_packages_8_8_ppc64le:
   - [ 'kernel', '4.18.0-477.13.1.el8_8' ]
 
-__sap_hana_preconfigure_min_packages_8_9_x86_64:
+__sap_hana_preconfigure_min_packages_8_9_x86_64: []
 
-__sap_hana_preconfigure_min_packages_8_9_ppc64le:
+__sap_hana_preconfigure_min_packages_8_9_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_8_10_x86_64:
   - [ 'kernel', '4.18.0-553.16.1.el8_10' ]

roles/sap_hana_preconfigure/vars/RedHat_9.yml

@@ -135,8 +135,6 @@ __sap_hana_preconfigure_sapnotes_versions: "{{ lookup('vars', '__sap_hana_precon
 
 # In SAP Note XXX, certain minimal required packages for the different RHEL 9 minor releases are listed.
 # The following will assign them properly to __sap_hana_preconfigure_min_pkgs.
-# If variable __sap_hana_preconfigure_min_packages_VERSION_ARCH is not defined,
-# variable __sap_hana_preconfigure_min_pkgs will be undefined as well.
 
 # Minimum required package levels for RHEL 9.0:
 __sap_hana_preconfigure_min_packages_9_0_x86_64:
@@ -146,29 +144,29 @@ __sap_hana_preconfigure_min_packages_9_0_ppc64le:
   - [ 'kernel', '5.14.0-70.43.1.el9_0' ]
   - [ 'glibc', '2.34-28.el9_0.3' ]
 
-__sap_hana_preconfigure_min_packages_9_1_x86_64:
+__sap_hana_preconfigure_min_packages_9_1_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_1_ppc64le:
+__sap_hana_preconfigure_min_packages_9_1_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_9_2_x86_64:
   - [ 'kernel', '5.14.0-284.25.1.el9_2' ]
 
 __sap_hana_preconfigure_min_packages_9_2_ppc64le:
   - [ 'kernel', '5.14.0-284.25.1.el9_2' ]
 
-__sap_hana_preconfigure_min_packages_9_3_x86_64:
+__sap_hana_preconfigure_min_packages_9_3_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_3_ppc64le:
+__sap_hana_preconfigure_min_packages_9_3_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_9_4_x86_64:
   - [ 'kernel', '5.14.0-427.100.1.el9_4' ]
 
 __sap_hana_preconfigure_min_packages_9_4_ppc64le:
   - [ 'kernel', '5.14.0-427.100.1.el9_4' ]
 
-__sap_hana_preconfigure_min_packages_9_5_x86_64:
+__sap_hana_preconfigure_min_packages_9_5_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_5_ppc64le:
+__sap_hana_preconfigure_min_packages_9_5_ppc64le: []
 
 __sap_hana_preconfigure_min_packages_9_6_x86_64:
   - [ 'kernel', '5.14.0-570.17.1.el9_6' ]
@@ -177,21 +175,21 @@ __sap_hana_preconfigure_min_packages_9_6_ppc64le:
   - [ 'kernel', '5.14.0-570.17.1.el9_6' ]
   - [ 'glibc', '2.34-168.el9_6.20' ]
 
-__sap_hana_preconfigure_min_packages_9_7_x86_64:
+__sap_hana_preconfigure_min_packages_9_7_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_7_ppc64le:
+__sap_hana_preconfigure_min_packages_9_7_ppc64le: []
 
-__sap_hana_preconfigure_min_packages_9_8_x86_64:
+__sap_hana_preconfigure_min_packages_9_8_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_8_ppc64le:
+__sap_hana_preconfigure_min_packages_9_8_ppc64le: []
 
-__sap_hana_preconfigure_min_packages_9_9_x86_64:
+__sap_hana_preconfigure_min_packages_9_9_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_9_ppc64le:
+__sap_hana_preconfigure_min_packages_9_9_ppc64le: []
 
-__sap_hana_preconfigure_min_packages_9_10_x86_64:
+__sap_hana_preconfigure_min_packages_9_10_x86_64: []
 
-__sap_hana_preconfigure_min_packages_9_10_ppc64le:
+__sap_hana_preconfigure_min_packages_9_10_ppc64le: []
 
 __sap_hana_preconfigure_min_pkgs: "{{ lookup('vars', '__sap_hana_preconfigure_min_packages_' + ansible_facts['distribution_version'] | string | replace(\".\", \"_\") + '_' + ansible_facts['architecture']) }}"