orahost_logrotate: fixes for oravirt#449

opitzconsulting · Apr 26, 2024 · f7c80e5 · f7c80e5
1 parent 401981c
commit f7c80e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/changelogs/fragments/logrotate.yml b/changelogs/fragments/logrotate.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "orahost_logrotate: logrotate setup for oracle files should be optional (oravirt#449)"
diff --git a/roles/orahost_logrotate/README.md b/roles/orahost_logrotate/README.md
@@ -12,7 +12,7 @@ Configure logrotate for ansible-oracle
   - [oracle_home_gi_cl](#oracle_home_gi_cl)
   - [oracle_home_gi_so](#oracle_home_gi_so)
   - [oracle_trace_cleanup_days](#oracle_trace_cleanup_days)
-- [Discovered Tags](#discovered-tags)
+  - [orahost_logrotate_setup_logrotate](#orahost_logrotate_setup_logrotate)
 - [Open Tasks](#open-tasks)
 - [Dependencies](#dependencies)
 - [License](#license)
@@ -108,11 +108,16 @@ Define number of days for ADR in Oracle.
 oracle_trace_cleanup_days: 7
 ```
 
-## Discovered Tags
+### orahost_logrotate_setup_logrotate
 
-**_cleanup_**
+Setup of logrotate/cleanup is optional
+
+#### Default value
+
+```YAML
+orahost_logrotate_setup_logrotate: true
+```
 
-**_logrotate_**
 
 ## Open Tasks
 

diff --git a/roles/orahost_logrotate/defaults/main.yml b/roles/orahost_logrotate/defaults/main.yml
@@ -6,17 +6,17 @@ oracle_home_gi: "{% if _oraswgi_meta_configure_cluster %}{{ oracle_home_gi_cl }}
 
 # @var oracle_cleanup_days:description: >
 # Define number of days for oracle_cleanup.sh logfiles and audit files.
-# @dev
+# @end
 oracle_cleanup_days: 14
 
 # @var oracle_trace_cleanup_days:description: >
 # Define number of days for ADR in Oracle.
-# @dev
+# @end
 oracle_trace_cleanup_days: 7
 
 # @var logrotate_config:description: >
 # Configuration of logrotate definitions.
-# @dev
+# @end
 logrotate_config:
   - name: oracle_alert
     file: "{{ oracle_base }}/diag/rdbms/*/*/trace/*alert*.log {{ oracle_base }}/diag/asm/*/*/trace/alert*+ASM*.log"
@@ -45,5 +45,5 @@ logrotate_config:
       - rotate 24
       - dateext
 
-# @var orahost_logrotate_setup_logrotate: Setup of logrotate/cleanup is optional
+# @var orahost_logrotate_setup_logrotate:description: Setup of logrotate/cleanup is optional
 orahost_logrotate_setup_logrotate: true
diff --git a/roles/orahost_logrotate/tasks/main.yml b/roles/orahost_logrotate/tasks/main.yml
@@ -2,6 +2,7 @@
 # tasks file for orahost-logrotate
 
 - name: Setup logrotate
+  when: orahost_logrotate_setup_logrotate
   block:
 
     - name: Manage logrotate
@@ -21,5 +22,3 @@
         mode: "0744"
       when: logrotate_config is defined
       tags: cleanup
-
-  when: orahost_logrotate_setup_logrotate