collection: Merge dev to main for release 1.8.0 - #1145
Merged
Merged
Conversation
The related SAP note is 611361 and it defines the criteria for valid hostnames for SAP ABAP Platform systems. Solves issue #1104. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
collection: Adjust roles for ansible-core 2.19 part 1
Relates to #1104. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
sap_swpm: Implement a test and a filter for validating hostnames
Signed-off-by: Bernd Finger <bfinger@redhat.com>
…9-part-2 Collection: ansible core 2.19 part 2
- var-naming[no-role-prefix] - jinja[spacing]
This commit is to demonstrate how it could work. If we use this method, we can easily add more validation code in templates/inifile_params.j2. Relates to #1060. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Main changes in this commit:
- All variables in defaults/main.yml are now defined, typically with an
empty string.
- Some long comments in defaults/main.yml are rearranged to shorten the
line length.
- In tasks/pre_install.yml, we are now detecting early if an inifile
exists at location {{ sap_swpm_inifile_directory }}/inifile.params.
This allows for early detection of the 4 essential role variables:
- sap_swpm_software_path
- sap_swpm_product_catalog_id
- sap_swpm_sid
- sap_swpm_fqdn
- We are now validating all the important role parameters (as contained
in the section "# Following variables are defined and validated:" of the
Ansible Playbooks for SAP), using the Ansible template module, in two
stages:
- Any undefined variable which is used in a defined inifile section
(there should be none due to the new definitions in
defaults/main.yml) will cause the template task to fail immediately.
- Further validation is done using Jinja2 if-else-endif inside the file
templates/inifile_params.j2, so that there will be one output line in
the templating result for any validation failure. The output lines
must start with "FAIL: " so that these outputs can easily be collected
and displayed. After step 2, all the validation failures are reported
in one task.
If the validation has failed in step 2, the remplating result can be
kept by running the role/playbook with -v or more verbosity. By
default, the templating result will be removed.
If the validation has not failed, the remplating result will always be
removed.
No validation of the variables of inifile sections will be performed
if an existing inifile has been found, because then the existing
infile will be used and a reverse extraction of the role variables is
not possible and not necessary.
Signed-off-by: Bernd Finger <bfinger@redhat.com>
sap_ha_install_hana_hsr: Fix linter failures
Signed-off-by: Bernd Finger <bfinger@redhat.com>
We don't want to find "FAIL:" if it occurs in lines starting with a comment sign. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Also add type_debug to the boolean failure messages to make it easier to understand and fix wrong boolean vars definitions Signed-off-by: Bernd Finger <bfinger@redhat.com>
- First validation of essential vars only after redefining vars from sap_swpm_templates_install_dictionary - Further changes for when condition for Ansible 2.19 - some loop variable renamings - name change for the task in which the validation test is run - name change for the file in which the validation test results are stored - reordered the order of the second validation of the four essential vars Signed-off-by: Bernd Finger <bfinger@redhat.com>
... in task "Set fact for the sapinst command line" Signed-off-by: Bernd Finger <bfinger@redhat.com>
- Define most password vars in templates/inifile_params.j2 from
sap_swpm_master_password, either directly or as a fallback but only
if the latter is defined. If not, a FAIL message containing is
issued, including the the inifile parameter name for which the
password is required. This should make it easy to decide if the master
password should be used or rather the specific password variable.
No password validation is performed for:
nwUsers.sidadmPassword = {{ sap_swpm_master_password }}
because nwUsers.sidadmPassword can be an empty string.
- Set no_log:true for password related tasks, to hide the passwords also
in verbose mode
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
If sap_hana_install_modify_selinux_labels is defined in a playbook or inventory, use that one instead of sap_hana_install_configure_selinux (which is also defined in defaults/main.ylm). If sap_hana_install_use_fapolicyd is defined in a playbook or inventory, use that one instead of sap_hana_install_configure_fapolicyd (which is also defined in defaults/main.ylm). As a consequence, when using the new variables, the old ones should be removed from the playbook or inventory - otherwise, the new variables will be ignored. Relates to #1134. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Relates to #1134. Signed-off-by: Bernd Finger <bfinger@redhat.com>
sap_ha_install_hana_hsr: Rework role with new features, validations and compatibility for 2.20
…yd-dir-definitions-02 sap_hana_install: simplified and more flexible SELinux and fapolicyd handling
Solves issue #1137. Also adds tag sap_hana_install_check_hana_exists. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Relates to #1137 Signed-off-by: Bernd Finger <bfinger@redhat.com>
Relates to #1137. Signed-off-by: Bernd Finger <bfinger@redhat.com>
The tag sap_hana_install_check_installation has been removed in this commit, for reducing complexity and testing efforts. Relates to #1137. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Relates to #1137. Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
sap_hana_install_hdblcm_commandline, from tasks/main.yml. Signed-off-by: Bernd Finger <bfinger@redhat.com>
…sap_hana_install sap_hana_install: Rework tags
sap_storage_setup/SUSE: Add btrfs support for SLES 16
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
Signed-off-by: Bernd Finger <bfinger@redhat.com>
collection: Prepare for v1.8.0
ja9fuchs
approved these changes
Jan 12, 2026
ja9fuchs
left a comment
ja9fuchs
left a comment
Contributor
There was a problem hiding this comment.
👍
The content was already reviewed when it was added to dev.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.