|
|
015049 |
commit f011979fa05e938165c95a134bbdcc37a33f4eea
|
|
|
015049 |
Author: Bernd Finger <bfinger@redhat.com>
|
|
|
015049 |
Date: Sat Aug 1 01:28:00 2020 +0200
|
|
|
015049 |
|
|
|
015049 |
114: remove all trailing whitespaces
|
|
|
015049 |
|
|
|
015049 |
diff --git a/handlers/main.yml b/handlers/main.yml
|
|
|
015049 |
index 543d238..b3dbdec 100644
|
|
|
015049 |
--- a/handlers/main.yml
|
|
|
015049 |
+++ b/handlers/main.yml
|
|
|
015049 |
@@ -19,7 +19,7 @@
|
|
|
015049 |
command: grub2-mkconfig -o /boot/grub2/grub.cfg
|
|
|
015049 |
register: command_result
|
|
|
015049 |
listen: "Regenerate grub2 conf handler"
|
|
|
015049 |
- when:
|
|
|
015049 |
+ when:
|
|
|
015049 |
- not efi_exists.stat.exists
|
|
|
015049 |
- sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
|
015049 |
|
|
|
015049 |
diff --git a/tasks/RedHat/configuration.yml b/tasks/RedHat/configuration.yml
|
|
|
015049 |
index 04bb486..0d77b5d 100644
|
|
|
015049 |
--- a/tasks/RedHat/configuration.yml
|
|
|
015049 |
+++ b/tasks/RedHat/configuration.yml
|
|
|
015049 |
@@ -5,7 +5,7 @@
|
|
|
015049 |
# verbosity: "{{ debuglevel }}"
|
|
|
015049 |
#
|
|
|
015049 |
- name: list of required SAP Notes
|
|
|
015049 |
- debug:
|
|
|
015049 |
+ debug:
|
|
|
015049 |
var: __sap_hana_preconfigure_sapnotes | difference([''])
|
|
|
015049 |
|
|
|
015049 |
# We want to disable firewalld, so we need to check if firewalld is installed
|
|
|
015049 |
@@ -13,10 +13,10 @@
|
|
|
015049 |
package_facts:
|
|
|
015049 |
manager: auto
|
|
|
015049 |
|
|
|
015049 |
-- name: include configuration actions for required sapnotes
|
|
|
015049 |
+- name: include configuration actions for required sapnotes
|
|
|
015049 |
include_tasks: "sapnote/{{ item }}.yml"
|
|
|
015049 |
with_items: "{{ __sap_hana_preconfigure_sapnotes | difference(['']) }}"
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- include_tasks: "{{ './' + ansible_distribution + '_' + ansible_distribution_major_version + '/recommendations.yml' }}"
|
|
|
015049 |
|
|
|
015049 |
...
|
|
|
015049 |
diff --git a/tasks/RedHat/generic/configure-tuned.yml b/tasks/RedHat/generic/configure-tuned.yml
|
|
|
015049 |
index ce66b31..50b8752 100644
|
|
|
015049 |
--- a/tasks/RedHat/generic/configure-tuned.yml
|
|
|
015049 |
+++ b/tasks/RedHat/generic/configure-tuned.yml
|
|
|
015049 |
@@ -22,7 +22,7 @@
|
|
|
015049 |
block:
|
|
|
015049 |
- name: Switch to tuned profile sap-hana if not currently active
|
|
|
015049 |
command: /usr/sbin/tuned-adm profile sap-hana
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- name: Show active tuned profile
|
|
|
015049 |
command: bash -lc "/usr/sbin/tuned-adm active | grep ":" | cut -d ":" -f 2 | awk '{$1=$1;print}'"
|
|
|
015049 |
register: new_profile
|
|
|
015049 |
@@ -67,7 +67,7 @@
|
|
|
015049 |
block:
|
|
|
015049 |
- name: Switch to tuned profiles sap-hana sap-hana-ppc64le if not currently active
|
|
|
015049 |
command: /usr/sbin/tuned-adm profile sap-hana sap-hana-ppc64le
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- name: Show active tuned profile
|
|
|
015049 |
command: bash -lc "/usr/sbin/tuned-adm active | grep ":" | cut -d ":" -f 2 | awk '{$1=$1;print}'"
|
|
|
015049 |
register: new_profile_ppc64le
|
|
|
015049 |
diff --git a/tasks/RedHat/generic/disable-coredumps.yml b/tasks/RedHat/generic/disable-coredumps.yml
|
|
|
015049 |
index 640a60c..a40a4c5 100644
|
|
|
015049 |
--- a/tasks/RedHat/generic/disable-coredumps.yml
|
|
|
015049 |
+++ b/tasks/RedHat/generic/disable-coredumps.yml
|
|
|
015049 |
@@ -4,11 +4,11 @@
|
|
|
015049 |
msg: "imported RedHat/generic/disable-coredumps.yml"
|
|
|
015049 |
|
|
|
015049 |
- name: disable core file creation for all users
|
|
|
015049 |
- pam_limits:
|
|
|
015049 |
+ pam_limits:
|
|
|
015049 |
dest: /etc/security/limits.d/99-sap.conf
|
|
|
015049 |
- domain: "*"
|
|
|
015049 |
- limit_item: core
|
|
|
015049 |
- limit_type: "{{ line_item }}"
|
|
|
015049 |
+ domain: "*"
|
|
|
015049 |
+ limit_item: core
|
|
|
015049 |
+ limit_type: "{{ line_item }}"
|
|
|
015049 |
value: '0'
|
|
|
015049 |
with_items:
|
|
|
015049 |
- hard
|
|
|
015049 |
diff --git a/tasks/RedHat/installation.yml b/tasks/RedHat/installation.yml
|
|
|
015049 |
index ec6e546..9bd3dfa 100644
|
|
|
015049 |
--- a/tasks/RedHat/installation.yml
|
|
|
015049 |
+++ b/tasks/RedHat/installation.yml
|
|
|
015049 |
@@ -21,7 +21,7 @@
|
|
|
015049 |
state: present
|
|
|
015049 |
|
|
|
015049 |
when: sap_hana_preconfigure_enable_sap_hana_repos
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- name: Detect if the minor RHEL release is set
|
|
|
015049 |
shell: subscription-manager release --show | awk '{print $NF}'
|
|
|
015049 |
register: subscription_manager_release_result
|
|
|
015049 |
@@ -131,7 +131,7 @@
|
|
|
015049 |
when: sap_hana_preconfigure_fact_minpkglist | d([])
|
|
|
015049 |
# when: not ( sap_hana_preconfigure_fact_minpkglist == [ "" ] )
|
|
|
015049 |
|
|
|
015049 |
- when:
|
|
|
015049 |
+ when:
|
|
|
015049 |
- sap_hana_preconfigure_min_package_check|bool
|
|
|
015049 |
- __sap_hana_preconfigure_min_pkgs | d([])
|
|
|
015049 |
# - not( (__sap_hana_preconfigure_min_pkgs is undefined) or (__sap_hana_preconfigure_min_pkgs is none) or (__sap_hana_preconfigure_min_pkgs | trim == '') )
|
|
|
015049 |
diff --git a/tasks/RedHat_7/recommendations.yml b/tasks/RedHat_7/recommendations.yml
|
|
|
015049 |
index 80a8eb0..fefa213 100644
|
|
|
015049 |
--- a/tasks/RedHat_7/recommendations.yml
|
|
|
015049 |
+++ b/tasks/RedHat_7/recommendations.yml
|
|
|
015049 |
@@ -3,11 +3,11 @@
|
|
|
015049 |
## This creates the SAP Users in case you define them in your playbook
|
|
|
015049 |
## This has been done for providers who want to create the SAP users before handing
|
|
|
015049 |
## over the image to clients
|
|
|
015049 |
-- name: ensure sapadm group and sapadm user is created
|
|
|
015049 |
+- name: ensure sapadm group and sapadm user is created
|
|
|
015049 |
block:
|
|
|
015049 |
- - name: ensure sapdm user exists
|
|
|
015049 |
- group:
|
|
|
015049 |
- name: sapsys
|
|
|
015049 |
+ - name: ensure sapdm user exists
|
|
|
015049 |
+ group:
|
|
|
015049 |
+ name: sapsys
|
|
|
015049 |
gid: "{{ sap_sapsys_gid }}"
|
|
|
015049 |
- name: ensure sapadm user exists
|
|
|
015049 |
user:
|
|
|
015049 |
@@ -19,7 +19,7 @@
|
|
|
015049 |
- sap_sapsys_gid is defined
|
|
|
015049 |
- sap_sapadm_uid is defined
|
|
|
015049 |
- sap_sapadm_pw_clear is defined
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
### Disable tempfile handling, otherwise things are gone after reboot
|
|
|
015049 |
# already in sap-preconfigure, sapnote/2002167/06-additional-notes-for-installing-sap-systems.yml
|
|
|
015049 |
# - name: disable temp file handling for SAP applications
|
|
|
015049 |
diff --git a/tasks/RedHat_8/recommendations.yml b/tasks/RedHat_8/recommendations.yml
|
|
|
015049 |
index f3ba349..382eda1 100644
|
|
|
015049 |
--- a/tasks/RedHat_8/recommendations.yml
|
|
|
015049 |
+++ b/tasks/RedHat_8/recommendations.yml
|
|
|
015049 |
@@ -3,11 +3,11 @@
|
|
|
015049 |
## Most of this is described in SAP Note 2009879
|
|
|
015049 |
|
|
|
015049 |
## TODO: Next task should be moved to sap-deploy, or sap-hostagent install !
|
|
|
015049 |
-- name: ensure sapsys group and sapadm user are created
|
|
|
015049 |
+- name: ensure sapsys group and sapadm user are created
|
|
|
015049 |
block:
|
|
|
015049 |
- - name: ensure sapsys group exists
|
|
|
015049 |
- group:
|
|
|
015049 |
- name: sapsys
|
|
|
015049 |
+ - name: ensure sapsys group exists
|
|
|
015049 |
+ group:
|
|
|
015049 |
+ name: sapsys
|
|
|
015049 |
gid: "{{ sap_sapsys_gid }}"
|
|
|
015049 |
- name: ensure sapadm user exists
|
|
|
015049 |
user:
|
|
|
015049 |
@@ -20,7 +20,6 @@
|
|
|
015049 |
- sap_sapsys_gid is defined
|
|
|
015049 |
- sap_sapadm_uid is defined
|
|
|
015049 |
- sap_sapadm_pw_clear is defined
|
|
|
015049 |
-
|
|
|
015049 |
|
|
|
015049 |
### Firewall Settings can only be done if SAP instance ID is known,
|
|
|
015049 |
### otherwise disable firewall
|
|
|
015049 |
diff --git a/tasks/SLES/configuration.yml b/tasks/SLES/configuration.yml
|
|
|
015049 |
index b0b4503..f665c73 100644
|
|
|
015049 |
--- a/tasks/SLES/configuration.yml
|
|
|
015049 |
+++ b/tasks/SLES/configuration.yml
|
|
|
015049 |
@@ -5,13 +5,13 @@
|
|
|
015049 |
# verbosity: "{{ debuglevel }}"
|
|
|
015049 |
#
|
|
|
015049 |
- name: list of required SAP Notes
|
|
|
015049 |
- debug:
|
|
|
015049 |
+ debug:
|
|
|
015049 |
var: __sap_hana_preconfigure_sapnotes | difference([''])
|
|
|
015049 |
|
|
|
015049 |
-- name: include configuration actions for required sapnotes
|
|
|
015049 |
+- name: include configuration actions for required sapnotes
|
|
|
015049 |
include_tasks: "sapnotes/{{ item }}/configuration.yml"
|
|
|
015049 |
with_items: "{{ __sap_hana_preconfigure_sapnotes | difference(['']) }}"
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- include_tasks: "{{ './' + ansible_distribution + ansible_distribution_major_version + '/recommendations.yml' }}"
|
|
|
015049 |
|
|
|
015049 |
...
|
|
|
015049 |
diff --git a/tasks/SLES/installation.yml b/tasks/SLES/installation.yml
|
|
|
015049 |
index d9b3472..fab2b34 100644
|
|
|
015049 |
--- a/tasks/SLES/installation.yml
|
|
|
015049 |
+++ b/tasks/SLES/installation.yml
|
|
|
015049 |
@@ -5,11 +5,11 @@
|
|
|
015049 |
# verbosity: "{{ debuglevel }}"
|
|
|
015049 |
#
|
|
|
015049 |
- name: list of required SAP Notes
|
|
|
015049 |
- debug:
|
|
|
015049 |
+ debug:
|
|
|
015049 |
var: __sap_hana_preconfigure_sapnotes | difference([''])
|
|
|
015049 |
|
|
|
015049 |
-- name: include configuration actions for required sapnotes
|
|
|
015049 |
+- name: include configuration actions for required sapnotes
|
|
|
015049 |
include_tasks: "tasks/sapnote/{{ item }}/installation.yml"
|
|
|
015049 |
with_items: "{{ __sap_hana_preconfigure_sapnotes | difference(['']) }}"
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
...
|
|
|
015049 |
diff --git a/tasks/SLES15/recommendations.yml b/tasks/SLES15/recommendations.yml
|
|
|
015049 |
index 71fcd3b..821bb46 100644
|
|
|
015049 |
--- a/tasks/SLES15/recommendations.yml
|
|
|
015049 |
+++ b/tasks/SLES15/recommendations.yml
|
|
|
015049 |
@@ -1,12 +1,11 @@
|
|
|
015049 |
---
|
|
|
015049 |
|
|
|
015049 |
-
|
|
|
015049 |
## TODO: Next task should be moved to sap-deploy, or sap-hostagent install !
|
|
|
015049 |
-- name: ensure sapadm group and sapadm user is created
|
|
|
015049 |
+- name: ensure sapadm group and sapadm user is created
|
|
|
015049 |
block:
|
|
|
015049 |
- - name: ensure sapadm user exists
|
|
|
015049 |
- group:
|
|
|
015049 |
- name: sapsys
|
|
|
015049 |
+ - name: ensure sapadm user exists
|
|
|
015049 |
+ group:
|
|
|
015049 |
+ name: sapsys
|
|
|
015049 |
gid: "{{ sap_sapsys_gid }}"
|
|
|
015049 |
- name: ensure sapadm user exists
|
|
|
015049 |
user:
|
|
|
015049 |
@@ -18,6 +17,5 @@
|
|
|
015049 |
- sap_sapsys_gid is defined
|
|
|
015049 |
- sap_sapadm_uid is defined
|
|
|
015049 |
- sap_sapadm_pw_clear is defined
|
|
|
015049 |
-
|
|
|
015049 |
|
|
|
015049 |
...
|
|
|
015049 |
diff --git a/tasks/sapnote/1275776/configuration.yml b/tasks/sapnote/1275776/configuration.yml
|
|
|
015049 |
index 88e55f7..15d869c 100644
|
|
|
015049 |
--- a/tasks/sapnote/1275776/configuration.yml
|
|
|
015049 |
+++ b/tasks/sapnote/1275776/configuration.yml
|
|
|
015049 |
@@ -14,7 +14,7 @@
|
|
|
015049 |
|
|
|
015049 |
- name: "1275776 - Configuration saptune sap note 1275776"
|
|
|
015049 |
command: "saptune note apply 1275776"
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- name: "1275776 - Configuration saptune sap note 1984787"
|
|
|
015049 |
command: "saptune note apply 1984787"
|
|
|
015049 |
|
|
|
015049 |
diff --git a/tasks/sapnote/1944799/installation.yml b/tasks/sapnote/1944799/installation.yml
|
|
|
015049 |
index 385d727..9260ede 100644
|
|
|
015049 |
--- a/tasks/sapnote/1944799/installation.yml
|
|
|
015049 |
+++ b/tasks/sapnote/1944799/installation.yml
|
|
|
015049 |
@@ -25,10 +25,9 @@
|
|
|
015049 |
- name: "1944799 - PDF 8.1 Package List Packages"
|
|
|
015049 |
zypper:
|
|
|
015049 |
name: "{{ packages }}"
|
|
|
015049 |
- type: package
|
|
|
015049 |
+ type: package
|
|
|
015049 |
vars:
|
|
|
015049 |
packages:
|
|
|
015049 |
- libssh2-1
|
|
|
015049 |
- libopenssl1_0_0
|
|
|
015049 |
...
|
|
|
015049 |
-
|
|
|
015049 |
diff --git a/tasks/sapnote/2009879_7.yml b/tasks/sapnote/2009879_7.yml
|
|
|
015049 |
index c86b364..89dc1a5 100644
|
|
|
015049 |
--- a/tasks/sapnote/2009879_7.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2009879_7.yml
|
|
|
015049 |
@@ -25,7 +25,7 @@
|
|
|
015049 |
with_items:
|
|
|
015049 |
- { src: 'libssl.so.1.0.1e', dest: 'libssl.so.1.0.1' }
|
|
|
015049 |
- { src: 'libcrypto.so.1.0.1e', dest: 'libcrypto.so.1.0.1' }
|
|
|
015049 |
- when:
|
|
|
015049 |
+ when:
|
|
|
015049 |
( ansible_distribution_version == '7.2' )
|
|
|
015049 |
loop_control:
|
|
|
015049 |
loop_var: line_item
|
|
|
015049 |
@@ -35,7 +35,7 @@
|
|
|
015049 |
with_items:
|
|
|
015049 |
- { src: 'libssl.so.10', dest: 'libssl.so.1.0.1' }
|
|
|
015049 |
- { src: 'libcrypto.so.10', dest: 'libcrypto.so.1.0.1' }
|
|
|
015049 |
- when:
|
|
|
015049 |
+ when:
|
|
|
015049 |
( ansible_distribution_version != '7.2' )
|
|
|
015049 |
loop_control:
|
|
|
015049 |
loop_var: line_item
|
|
|
015049 |
diff --git a/tasks/sapnote/2055470.yml b/tasks/sapnote/2055470.yml
|
|
|
015049 |
index aa7da75..b958e52 100644
|
|
|
015049 |
--- a/tasks/sapnote/2055470.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2055470.yml
|
|
|
015049 |
@@ -36,7 +36,7 @@
|
|
|
015049 |
when: not( (sap_hana_preconfigure_ppcle_tso_if is undefined) or (sap_hana_preconfigure_ppcle_tso_if is none) or (sap_hana_preconfigure_ppcle_tso_if | trim == '') )
|
|
|
015049 |
loop_control:
|
|
|
015049 |
loop_var: line_item
|
|
|
015049 |
-
|
|
|
015049 |
+
|
|
|
015049 |
- name: add largesend parameter
|
|
|
015049 |
sysctl:
|
|
|
015049 |
sysctl_file: /etc/sysctl.d/ibm_largesend.conf
|
|
|
015049 |
diff --git a/tasks/sapnote/2382421.yml b/tasks/sapnote/2382421.yml
|
|
|
015049 |
index 794e728..3847edc 100644
|
|
|
015049 |
--- a/tasks/sapnote/2382421.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2382421.yml
|
|
|
015049 |
@@ -3,10 +3,10 @@
|
|
|
015049 |
# SAP Note: 2382421 - Optimizing the Network Configuration on HANA- and OS-Level
|
|
|
015049 |
#
|
|
|
015049 |
- name: setting kernel tunables as in SAP NOTE 2382421
|
|
|
015049 |
- sysctl:
|
|
|
015049 |
+ sysctl:
|
|
|
015049 |
sysctl_file: "{{ __sap_hana_preconfigure_etc_sysctl_saphana_conf }}"
|
|
|
015049 |
name: "{{ line_item.name }}"
|
|
|
015049 |
- value: "{{ line_item.value }}"
|
|
|
015049 |
+ value: "{{ line_item.value }}"
|
|
|
015049 |
state: present
|
|
|
015049 |
sysctl_set: yes
|
|
|
015049 |
reload: yes
|
|
|
015049 |
diff --git a/tasks/sapnote/2578899/configuration.yml b/tasks/sapnote/2578899/configuration.yml
|
|
|
015049 |
index e554a2d..9f221cb 100644
|
|
|
015049 |
--- a/tasks/sapnote/2578899/configuration.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2578899/configuration.yml
|
|
|
015049 |
@@ -1,6 +1,6 @@
|
|
|
015049 |
---
|
|
|
015049 |
|
|
|
015049 |
-- name: 2588899 - I/O scheduler
|
|
|
015049 |
+- name: 2588899 - I/O scheduler
|
|
|
015049 |
lineinfile:
|
|
|
015049 |
path: /etc/default/grub
|
|
|
015049 |
backup: yes
|
|
|
015049 |
diff --git a/tasks/sapnote/2578899/installation.yml b/tasks/sapnote/2578899/installation.yml
|
|
|
015049 |
index 28d798e..0c41def 100644
|
|
|
015049 |
--- a/tasks/sapnote/2578899/installation.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2578899/installation.yml
|
|
|
015049 |
@@ -10,7 +10,7 @@
|
|
|
015049 |
- libopenssl1_0_0
|
|
|
015049 |
|
|
|
015049 |
|
|
|
015049 |
-- name: 2578899 - sysstat - monitoring data
|
|
|
015049 |
+- name: 2578899 - sysstat - monitoring data
|
|
|
015049 |
package:
|
|
|
015049 |
name: "sysstat"
|
|
|
015049 |
|
|
|
015049 |
diff --git a/tasks/sapnote/2684254/configuration.yml b/tasks/sapnote/2684254/configuration.yml
|
|
|
015049 |
index 53fd4d9..f7b9411 100644
|
|
|
015049 |
--- a/tasks/sapnote/2684254/configuration.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2684254/configuration.yml
|
|
|
015049 |
@@ -1,10 +1,10 @@
|
|
|
015049 |
---
|
|
|
015049 |
-- name: 2684254 - Increase UserTasksMax
|
|
|
015049 |
+- name: 2684254 - Increase UserTasksMax
|
|
|
015049 |
copy:
|
|
|
015049 |
dest: "/etc/systemd/logind.conf.d/sap.conf"
|
|
|
015049 |
content: |
|
|
|
015049 |
[Login]
|
|
|
015049 |
- UserTasksMax=infinity
|
|
|
015049 |
+ UserTasksMax=infinity
|
|
|
015049 |
#- name: Turn off auto-numa balancing
|
|
|
015049 |
# sysctl:
|
|
|
015049 |
# sysctl_file: /etc/sysctl.d/sap_hana.conf
|
|
|
015049 |
diff --git a/tasks/sapnote/2684254/installation.yml b/tasks/sapnote/2684254/installation.yml
|
|
|
015049 |
index f24fb54..d669d01 100644
|
|
|
015049 |
--- a/tasks/sapnote/2684254/installation.yml
|
|
|
015049 |
+++ b/tasks/sapnote/2684254/installation.yml
|
|
|
015049 |
@@ -8,7 +8,7 @@
|
|
|
015049 |
package:
|
|
|
015049 |
name: "{{ packages }}"
|
|
|
015049 |
vars:
|
|
|
015049 |
- packages:
|
|
|
015049 |
+ packages:
|
|
|
015049 |
- libopenssl1_0_0
|
|
|
015049 |
- libssh2-1
|
|
|
015049 |
|