Merge pull request #940 from berndfinger/issue-939

sap_netweaver_preconfigure: fix argument_specs validation error
sap-linuxlab · Jan 24, 2025 · 8515230 · 8515230
2 parents 70d7cb1 + 260196c
commit 8515230
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/roles/sap_netweaver_preconfigure/README.md b/roles/sap_netweaver_preconfigure/README.md
@@ -115,6 +115,13 @@ In assertion mode, the role will abort when encountering any assertion error.<br
 If this parameter is set to `false`, the role will *not* abort when encountering an assertion error.<br>
 This is useful if the role is used for reporting a system's SAP notes compliance.<br>
 
+### sap_netweaver_preconfigure_packages
+- _Type:_ `list` with elements of type `str`
+- _Default:_ (set by platform/environment specific variables)
+
+The list of packages to be installed for SAP NETWEAVER.<br>
+The default for this variable is set in the vars file which corresponds to the detected OS version.<br>
+
 ### sap_netweaver_preconfigure_min_swap_space_mb
 - _Type:_ `str`
 - _Default:_ `20480`
@@ -156,4 +163,4 @@ Set this parameter to `true` when using Adobe Document Services, to ensure all r
 
 (SUSE specific) Specifies the saptune solution to apply.<br>
 Available values: `NETWEAVER`, `NETWEAVER+HANA`, `S4HANA-APP+DB`, `S4HANA-APPSERVER`, `S4HANA-DBSERVER`
-<!-- END Role Variables -->
+<!-- END Role Variables -->
diff --git a/roles/sap_netweaver_preconfigure/meta/argument_specs.yml b/roles/sap_netweaver_preconfigure/meta/argument_specs.yml
@@ -8,15 +8,6 @@ argument_specs:
     short_description: Variables for SAP NetWeaver preconfiguration
     options:
 
-      sap_netweaver_preconfigure_packages:
-        default: "{{ __sap_netweaver_preconfigure_packages }}"
-        description:
-          - The list of packages to be installed for SAP NETWEAVER.
-          - The default for this variable is set in the vars file which corresponds to the detected OS version.
-        required: false
-        type: list
-        elements: str
-
       sap_netweaver_preconfigure_config_all:
         default: true
         description:
@@ -57,6 +48,15 @@ argument_specs:
         required: false
         type: bool
 
+      sap_netweaver_preconfigure_packages:
+        default: "{{ __sap_netweaver_preconfigure_packages }}"
+        description:
+          - The list of packages to be installed for SAP NETWEAVER.
+          - The default for this variable is set in the vars file which corresponds to the detected OS version.
+        required: false
+        type: list
+        elements: str
+
       sap_netweaver_preconfigure_min_swap_space_mb:
         default: '20480'
         description:

diff --git a/roles/sap_netweaver_preconfigure/vars/main.yml b/roles/sap_netweaver_preconfigure/vars/main.yml
@@ -4,3 +4,6 @@
 # define variables here that will not change
 # Those are valid for all OS
 #
+
+# dummy entry for passing the arg spec validation:
+__sap_netweaver_preconfigure_packages: []