fixes for #453

oravirt · Apr 26, 2024 · 0b288f7 · 0b288f7
1 parent 80b0c74
commit 0b288f7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/changelogs/fragments/orahost_meta_env.yml b/changelogs/fragments/orahost_meta_env.yml
@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - "set custom environment for executables with oracle_script_env (oravirt#453)"
+  - "orahost_meta: added oracle_tmp_stage for hardened systems (oravirt#453)"
diff --git a/roles/orahost_meta/README.md b/roles/orahost_meta/README.md
@@ -19,8 +19,10 @@ Meta role used by other roles to share variable defaults.
   - [oracle_group](#oracle_group)
   - [oracle_inventory_loc](#oracle_inventory_loc)
   - [oracle_rsp_stage](#oracle_rsp_stage)
+  - [oracle_script_env](#oracle_script_env)
   - [oracle_seclimits](#oracle_seclimits)
   - [oracle_stage](#oracle_stage)
+  - [oracle_tmp_stage](#oracle_tmp_stage)
   - [oracle_user](#oracle_user)
   - [oracle_user_home](#oracle_user_home)
   - [role_separation](#role_separation)
@@ -220,6 +222,21 @@ There is usually no need to change this variable.
 oracle_rsp_stage: '{{ oracle_stage }}/rsp'
 ```
 
+### oracle_script_env
+
+(Minimum) environment settings to pass to Oracle scripts.
+Usually passed to shell: or command: through "environment:" keyword
+
+#### Default value
+
+```YAML
+oracle_script_env:
+  TMPDIR: '{{ oracle_tmp_stage }}'
+  _JAVA_OPTIONS: -Djava.io.tmpdir={{ oracle_tmp_stage }}
+  CV_ASSUME_DISTID: |-
+    {{ (ansible_facts.os_family == 'RedHat') | ternary('OL7', omit) }}
+```
+
 ### oracle_seclimits
 
 ulimit definition for orahost role.
@@ -252,6 +269,19 @@ There is usually no need to change this variable.
 oracle_stage: /u01/stage
 ```
 
+### oracle_tmp_stage
+
+Defines the temporary directory to be used by Oracle scripts.
+(on hardened systems, /tmp usually is noexec-flagged and thus not usable to execute scripts)
+
+There is usually no need to change this variable.
+
+#### Default value
+
+```YAML
+oracle_tmp_stage: '{{ oracle_stage }}/tmp'
+```
+
 ### oracle_user
 
 Defines the os-User for Oracle Database installation.

diff --git a/roles/orahost_meta/defaults/main.yml b/roles/orahost_meta/defaults/main.yml
@@ -81,12 +81,14 @@ oracle_tmp_stage: "{{ oracle_stage }}/tmp"
 # @var oracle_script_env:description: >
 # (Minimum) environment settings to pass to Oracle scripts.
 # Usually passed to shell: or command: through "environment:" keyword
-# 
+#
 # @end
 oracle_script_env:
   TMPDIR: "{{ oracle_tmp_stage }}"
   _JAVA_OPTIONS: "-Djava.io.tmpdir={{ oracle_tmp_stage }}"
-  CV_ASSUME_DISTID: "OL7" # forward compatibility for GI < 19.7 on Linux 8/9
+  # forward compatibility for GI < 19.7 on Linux 8/9
+  CV_ASSUME_DISTID: |-
+    {{ (ansible_facts.os_family == 'RedHat') | ternary('OL7', omit) }}
 
 # @var oracle_seclimits:description: ulimit definition for orahost role.
 oracle_seclimits: