214 lines
6.7 KiB
Diff
214 lines
6.7 KiB
Diff
commit a622092d5063c2fb0d7996775521a52549e3a65a
|
|
Author: Bernd Finger <bfinger@redhat.com>
|
|
Date: Mon Jun 22 22:35:59 2020 +0200
|
|
|
|
some improvements according to pull request 100 feedbacks
|
|
variables should be in vars files in the same order as they are used in tasks
|
|
|
|
diff --git a/tasks/RedHat/installation.yml b/tasks/RedHat/installation.yml
|
|
index fcacce6..0a8e1c2 100644
|
|
--- a/tasks/RedHat/installation.yml
|
|
+++ b/tasks/RedHat/installation.yml
|
|
@@ -112,43 +112,20 @@
|
|
{% endfor %}
|
|
{{ ns.pkgs }}
|
|
|
|
-# - name: check if minimum release needs to be installed
|
|
-# shell: |
|
|
-# set -x
|
|
-# required_pkg={{ pkg | join('-') }}
|
|
-# newest=$(echo -e "$required_pkg\n$(rpm -q {{ pkg[0] }} )"| sed "s,\.el,.0.0.," | sort -V | tail -1)
|
|
-# if [ $newest == ${required_pkg/.el/.0.0.} ]; then
|
|
-# echo $newest
|
|
-# fi
|
|
-# loop: "{{ __sap_hana_preconfigure_min_pkgs }}"
|
|
-# loop_control:
|
|
-# loop_var: pkg
|
|
-# check_mode: no
|
|
-# register: sap_hana_preconfigure_register_minpkglist
|
|
-# changed_when: false
|
|
-
|
|
-# - name: Initialize an empty list for our strings
|
|
-# set_fact:
|
|
-# sap_hana_preconfigure_fact_minpkglist: []
|
|
-
|
|
-# - name: Create list of packages to be installed
|
|
-# set_fact:
|
|
-# sap_hana_preconfigure_fact_minpkglist: "{{ sap_hana_preconfigure_fact_minpkglist | difference(['']) + [ pkg.stdout ] }}"
|
|
-# loop: "{{ sap_hana_preconfigure_register_minpkglist.results }}"
|
|
-# loop_control:
|
|
-# loop_var: pkg
|
|
-
|
|
- debug: var=sap_hana_preconfigure_fact_minpkglist
|
|
|
|
+# yum:
|
|
- name: Install minimum packages if required
|
|
- yum:
|
|
+ package:
|
|
name: "{{ sap_hana_preconfigure_fact_minpkglist }}"
|
|
state: present
|
|
- when: not ( sap_hana_preconfigure_fact_minpkglist == [ "" ] )
|
|
+ when: sap_hana_preconfigure_fact_minpkglist | d([])
|
|
+# when: not ( sap_hana_preconfigure_fact_minpkglist == [ "" ] )
|
|
|
|
when:
|
|
- sap_hana_preconfigure_min_package_check|bool
|
|
- - not( (__sap_hana_preconfigure_min_pkgs is undefined) or (__sap_hana_preconfigure_min_pkgs is none) or (__sap_hana_preconfigure_min_pkgs | trim == '') )
|
|
+ - __sap_hana_preconfigure_min_pkgs | d([])
|
|
+# - not( (__sap_hana_preconfigure_min_pkgs is undefined) or (__sap_hana_preconfigure_min_pkgs is none) or (__sap_hana_preconfigure_min_pkgs | trim == '') )
|
|
|
|
- set_fact:
|
|
needs_restarting_command: "needs-restarting -r"
|
|
diff --git a/vars/RedHat_7.yml b/vars/RedHat_7.yml
|
|
index 8ac6939..3978317 100644
|
|
--- a/vars/RedHat_7.yml
|
|
+++ b/vars/RedHat_7.yml
|
|
@@ -16,33 +16,6 @@ __sap_hana_preconfigure_sapnotes:
|
|
- "2292690"
|
|
- "2382421"
|
|
|
|
-# As per https://www14.software.ibm.com/support/customercare/sas/f/lopdiags/home.html :
|
|
-__sap_hana_preconfigure_required_ppc64le:
|
|
- - librtas
|
|
- - src
|
|
- - rsct.core.utils
|
|
- - rsct.core
|
|
- - rsct.basic
|
|
- - rsct.opt.storagerm
|
|
- - devices.chrp.base.ServiceRM
|
|
- - DynamicRM
|
|
- - ncurses-libs
|
|
- - readline
|
|
- - sqlite
|
|
- - sg3_utils
|
|
- - libgcc
|
|
- - libstdc++
|
|
- - zlib
|
|
- - iprutils
|
|
- - lsvpd
|
|
- - libvpd
|
|
- - libservicelog
|
|
- - servicelog
|
|
- - powerpc-utils
|
|
- - powerpc-utils-python
|
|
- - ppc64-diag
|
|
- - IBMinvscout
|
|
-
|
|
# 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,
|
|
@@ -123,6 +96,33 @@ __sap_hana_preconfigure_packages:
|
|
# libtool-ltdl: See https://answers.sap.com/questions/476177/hana-db-installation-ended-with-exit-code-127.html
|
|
# This is required since HANA 2 SPS 03, and so we always install it.
|
|
|
|
+# As per https://www14.software.ibm.com/support/customercare/sas/f/lopdiags/home.html :
|
|
+__sap_hana_preconfigure_required_ppc64le:
|
|
+ - librtas
|
|
+ - src
|
|
+ - rsct.core.utils
|
|
+ - rsct.core
|
|
+ - rsct.basic
|
|
+ - rsct.opt.storagerm
|
|
+ - devices.chrp.base.ServiceRM
|
|
+ - DynamicRM
|
|
+ - ncurses-libs
|
|
+ - readline
|
|
+ - sqlite
|
|
+ - sg3_utils
|
|
+ - libgcc
|
|
+ - libstdc++
|
|
+ - zlib
|
|
+ - iprutils
|
|
+ - lsvpd
|
|
+ - libvpd
|
|
+ - libservicelog
|
|
+ - servicelog
|
|
+ - powerpc-utils
|
|
+ - powerpc-utils-python
|
|
+ - ppc64-diag
|
|
+ - IBMinvscout
|
|
+
|
|
# Network related kernel parameters as set in SAP Note 2382421:
|
|
__sap_hana_preconfigure_kernel_parameters_default:
|
|
# The following two parameter should always be set:
|
|
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
|
|
index 3975dad..94d862b 100644
|
|
--- a/vars/RedHat_8.yml
|
|
+++ b/vars/RedHat_8.yml
|
|
@@ -19,37 +19,6 @@ __sap_hana_preconfigure_sapnotes:
|
|
- "2382421"
|
|
# - "2235581" # no specific requirements for RHEL 8 yet
|
|
|
|
-# The packages for RHEL8 are almost the same as for RHEL7.
|
|
-# IBM publishes the packages as a repository here:
|
|
-# https://public.dhe.ibm.com/software/server/POWER/Linux/yum/OSS/RHEL/8/ppc64le/
|
|
-# To install the packages, you need to create an appropriate repofile
|
|
-# or clone this repository (e.g. with Satellite product)
|
|
-__sap_hana_preconfigure_required_ppc64le:
|
|
- - librtas
|
|
- - src
|
|
- - rsct.core.utils
|
|
- - rsct.core
|
|
- - rsct.basic
|
|
- - rsct.opt.storagerm
|
|
- - devices.chrp.base.ServiceRM
|
|
- - DynamicRM
|
|
- - ncurses-libs
|
|
- - readline
|
|
- - sqlite
|
|
- - sg3_utils
|
|
- - libgcc
|
|
- - libstdc++
|
|
- - zlib
|
|
- - iprutils
|
|
- - lsvpd
|
|
- - libvpd
|
|
- - libservicelog
|
|
- - servicelog
|
|
- - powerpc-utils
|
|
-# - powerpc-utils-python # this package is no longer available for RHEL8
|
|
- - ppc64-diag
|
|
- - IBMinvscout
|
|
-
|
|
# 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,
|
|
@@ -127,6 +96,37 @@ __sap_hana_preconfigure_packages:
|
|
# SAP NOTE 2777782:
|
|
- tuned-profiles-sap-hana
|
|
|
|
+# The packages for RHEL8 are almost the same as for RHEL7.
|
|
+# IBM publishes the packages as a repository here:
|
|
+# https://public.dhe.ibm.com/software/server/POWER/Linux/yum/OSS/RHEL/8/ppc64le/
|
|
+# To install the packages, you need to create an appropriate repofile
|
|
+# or clone this repository (e.g. with Satellite product)
|
|
+__sap_hana_preconfigure_required_ppc64le:
|
|
+ - librtas
|
|
+ - src
|
|
+ - rsct.core.utils
|
|
+ - rsct.core
|
|
+ - rsct.basic
|
|
+ - rsct.opt.storagerm
|
|
+ - devices.chrp.base.ServiceRM
|
|
+ - DynamicRM
|
|
+ - ncurses-libs
|
|
+ - readline
|
|
+ - sqlite
|
|
+ - sg3_utils
|
|
+ - libgcc
|
|
+ - libstdc++
|
|
+ - zlib
|
|
+ - iprutils
|
|
+ - lsvpd
|
|
+ - libvpd
|
|
+ - libservicelog
|
|
+ - servicelog
|
|
+ - powerpc-utils
|
|
+# - powerpc-utils-python # this package is no longer available for RHEL8
|
|
+ - ppc64-diag
|
|
+ - IBMinvscout
|
|
+
|
|
# Network related kernel parameters as set in SAP Note 2382421:
|
|
__sap_hana_preconfigure_kernel_parameters_default:
|
|
# The following two parameter should always be set:
|