83 lines
2.9 KiB
Diff
83 lines
2.9 KiB
Diff
diff --git a/README.md b/README.md
|
|
index 61caab5..efb60f1 100644
|
|
--- a/README.md
|
|
+++ b/README.md
|
|
@@ -89,6 +89,7 @@ sap_hana_preconfigure_2292690_[01...07,09,10], example: sap_hana_preconfigure_22
|
|
sap_hana_preconfigure_2009879_3_9
|
|
sap_hana_preconfigure_2009879_3_13
|
|
sap_hana_preconfigure_2009879_3_14_[1...4]
|
|
+sap_hana_preconfigure_2009879_3_15
|
|
sap_hana_preconfigure_2382421
|
|
```
|
|
|
|
diff --git a/tasks/RedHat/configuration.yml b/tasks/RedHat/configuration.yml
|
|
index 0216a99..f0bcbd4 100644
|
|
--- a/tasks/RedHat/configuration.yml
|
|
+++ b/tasks/RedHat/configuration.yml
|
|
@@ -8,6 +8,11 @@
|
|
debug:
|
|
var: __sap_hana_preconfigure_sapnotes | difference([''])
|
|
|
|
+# We want to disable firewalld, so we need to check if firewalld is installed
|
|
+- name: Gather facts about installed packages
|
|
+ package_facts:
|
|
+ manager: auto
|
|
+
|
|
- name: include configuration actions for required sapnotes
|
|
include_tasks: "sapnote/{{ item }}.yml"
|
|
with_items: "{{ __sap_hana_preconfigure_sapnotes | difference(['']) }}"
|
|
diff --git a/tasks/RedHat/generic/configure-epb.yml b/tasks/RedHat/generic/configure-epb.yml
|
|
index 71d8b91..f74ec7f 100644
|
|
--- a/tasks/RedHat/generic/configure-epb.yml
|
|
+++ b/tasks/RedHat/generic/configure-epb.yml
|
|
@@ -21,7 +21,7 @@
|
|
file:
|
|
path: /etc/init.d/boot.local
|
|
state: touch
|
|
- mode: 0644
|
|
+ mode: 0755
|
|
|
|
- name: Configure EPB at boot time
|
|
lineinfile:
|
|
diff --git a/tasks/RedHat/generic/disable-firewall.yml b/tasks/RedHat/generic/disable-firewall.yml
|
|
index 151d045..1bc6596 100644
|
|
--- a/tasks/RedHat/generic/disable-firewall.yml
|
|
+++ b/tasks/RedHat/generic/disable-firewall.yml
|
|
@@ -1,16 +1,14 @@
|
|
---
|
|
-- name: Gathering service facts
|
|
- service_facts:
|
|
- register: services_state
|
|
+
|
|
+- debug:
|
|
+ msg: "imported RedHat/generic/configure-firewall.yml"
|
|
|
|
- name: Stop and disable service firewalld
|
|
systemd:
|
|
name: firewalld
|
|
state: stopped
|
|
enabled: no
|
|
- when: services_state.ansible_facts.services["firewalld.service"].state is defined
|
|
-
|
|
-- debug: var=services_state.ansible_facts.services["firewalld.service"].state
|
|
+ when: "'firewalld' in ansible_facts.packages"
|
|
|
|
- name: Get status of firewalld
|
|
command: bash -lc "systemctl status firewalld"
|
|
diff --git a/tasks/sapnote/2009879_7.yml b/tasks/sapnote/2009879_7.yml
|
|
index 793b921..c86b364 100644
|
|
--- a/tasks/sapnote/2009879_7.yml
|
|
+++ b/tasks/sapnote/2009879_7.yml
|
|
@@ -96,10 +96,7 @@
|
|
### NYI: Set proper firewall rules if SID/instance number is known
|
|
###
|
|
- include_tasks: ../RedHat/generic/disable-firewall.yml
|
|
-# - name: 3.15 Ensure firewall is disabled when instance ID unknown
|
|
-# service: name=firewalld state=stopped enabled=no
|
|
-# ignore_errors: True
|
|
-
|
|
+ when: sap_hana_preconfigure_config_all|d(true) or sap_hana_preconfigure_2009879_3_15|d(false)
|
|
|
|
### Firewall Calculation for SID=xx
|
|
##################################################################
|