Skip to content

Commit ab223b5

Browse files
bartowlRendanic
authored andcommitted
fix to enable removal of old jobs
1 parent defbb29 commit ab223b5

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- "oradb_rman: better handle rman_jobs with state: absent (oravirt#374)"

roles/oradb_rman/tasks/main.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
- "{{ oracle_databases }}"
117117
- rman_jobs
118118
- skip_missing: true
119+
when: item.1.state | default('present') == 'present'
119120
loop_control:
120121
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }} job {{ item.1.name | default('') }}"
121122
tags:
@@ -308,6 +309,7 @@
308309
when:
309310
- item.1.immediate is defined
310311
- item.1.immediate
312+
- item.1.state | default('present') == 'present'
311313
- "((configure_cluster and inventory_hostname == cluster_master) or not configure_cluster )"
312314
tags:
313315
- rmanexecute
@@ -343,7 +345,7 @@
343345
cron_file: "{{ rman_cronfile }}"
344346
user: "{{ oracle_user }}"
345347
disabled: "{{ item.1.disabled | default(false) }}"
346-
state: "{{ item.1.state | default('present') }}"
348+
state: "present"
347349
day: "{{ item.1.day }}"
348350
weekday: "{{ item.1.weekday }}"
349351
hour: "{{ item.1.hour }}"
@@ -367,6 +369,29 @@
367369
- item.1.hour is defined
368370
- item.1.minute is defined
369371
- item.1.name is defined
372+
- item.1.state | default('present') == 'present'
373+
tags:
374+
- rmancron
375+
376+
- name: Remove crontab entries for RMAN Backup
377+
ansible.builtin.cron:
378+
name: rman_backup_{{ item.0.oracle_db_name }}_{{ item.1.name }}
379+
cron_file: "{{ rman_cronfile }}"
380+
user: "{{ oracle_user }}"
381+
state: "absent"
382+
# noqa yaml
383+
with_subelements:
384+
- "{{ oracle_databases }}"
385+
- rman_jobs
386+
- skip_missing: true
387+
loop_control:
388+
label: >-
389+
oracle_db_name: {{ item.0.oracle_db_name | default('') }}
390+
state: {{ item.1.state | default('present') }}
391+
when:
392+
- item.1 is defined
393+
- item.1.name is defined
394+
- item.1.state | default('present') == 'absent'
370395
tags:
371396
- rmancron
372397

0 commit comments

Comments
 (0)