oradb-rman: Some changes from upstream

Some templates were changed from upstream.

Author: Rendanic

roles/oradb-rman/defaults/main.yml

@@ -1,22 +1,37 @@
 
+  master_node: true
   oracle_user: oracle 
   oracle_base: /u01/app/oracle
 
-  # set rman_cronfile: "" for using the user cron
   rman_cronfile: oracle_rman_ansible
-  rman_cron_logdir: /var/log/oracle/rman
+  rman_cron_logdir: /var/log/oracle/rman/log
+
+  rman_script_dir: "{% if item is defined and item.0.rman_script_dir is defined %}{{item.0.rman_script_dir}}{% else %}{{oracle_base}}/rman/{% endif %}"
+  rman_log_dir: "{% if item is defined and item.0.rman_log_dir is defined %}{{item.0.rman_log_dir}}{% else %}{{oracle_base}}/rman/log/{% endif %}"
+
+  rman_tns_admin: /u01/app/oracle/rman/network/admin
+  rman_wallet_loc: "{{oracle_base}}/rman/network/wallet"
+  rman_wallet_password: "oracleWallet1"
 
   rmanautofs: false
 
+  rman_cron_mkjob: False
+
   oracle_home_db: "{% if item.0 is defined %}{% if item.0.oracle_home is defined %}{{ item.0.oracle_home}}{% else %}{{ oracle_base }}/{{ item.0.oracle_version_db }}/{{ item.0.home }}{% endif %}{% else %}{% if item.oracle_home is defined %}{{ item.oracle_home }}{% else %}{{ oracle_base }}/{{ item.oracle_version_db }}/{{ item.home }}{% endif %}{% endif %}"
-  oracle_admin_db: "{% if item.0 is defined %}{{oracle_base}}/admin/{{item.0.oracle_db_name}}{% endif %}"
 
   rman_retention_policy_default: "RECOVERY WINDOW OF 14 DAYS"
   rman_channel_disk_default: "'/u10/rmanbackup/%d/%d_%T_%U'"
-  rman_controlfile_autobackup_disk_default: "'/u10/rmanbackup/%d/%d_%T_%U'"
-  rman_device_type_disk: 'PARALLELISM 1 BACKUP TYPE TO COMPRESSED BACKUPSET'
+  rman_controlfile_autobackup_disk_default: "'/u10/rmanbackup/%d/%d_%F'"
+  rman_device_type_disk_default: 'PARALLELISM 1 BACKUP TYPE TO COMPRESSED BACKUPSET'
 
   rman_retention_policy: "{% if item.0.rman_retention_policy is defined %}{{item.0.rman_retention_policy}}{% else %}{{rman_retention_policy_default}}{% endif %}"
   rman_channel_disk: "{% if item.0.rman_channel_disk is defined %}{{item.0.rman_channel_disk}}{% else %}{{rman_channel_disk_default}}{% endif %}"
+  rman_controlfile_autobackup_disk: "{% if item.0.rman_controlfile_autobackup_disk is defined %}{{item.0.rman_controlfile_autobackup_disk}}{% else %}{{rman_controlfile_autobackup_disk_default}}{% endif %}"
 
   rman_service_param: "{% if item.1.service is defined %}--service {{item.1.service}}{% else %}{% endif %}"
+
+  check_mk_mkjob: "{% if rman_cron_mkjob %}/usr/bin/mk-job rman_{{item.0.oracle_db_name}}_{{item.1.name}} {% endif %}"
+
+  rmanbackuplogdir:    "{% if item.0.rman_log_dir is defined %}-l {{item.0.rman_log_dir}}{% else %}{% endif %}"
+  rmanbackupscriptdir: "{% if item.0.rman_script_dir is defined %}-r {{item.0.rman_script_dir}}{% else %}{% endif %}"
+  rman_catalog_param: "{% if item.0.rman_wallet is defined and item.0.rman_wallet %}-c /@{{item.0.rman_tnsalias}}{% else %}{% if item.0.rman_user is defined %}-c {{item.0.rman_user}}/{{item.0.rman_password}}@{{item.0.rman_tnsalias}}{% endif %}{% endif %}"

roles/oradb-rman/templates/offline_level0.rman.j2

@@ -12,7 +12,5 @@ shutdown immediate
 startup mount
 backup check logical incremental level 0 database filesperset 1;
 startup
-backup archivelog all not backed up 1 times filesperset 50;
-delete noprompt  archivelog all backed up 1 times to disk;
 delete noprompt obsolete;
 }

roles/oradb-rman/templates/parameter.rman.j2

@@ -6,6 +6,6 @@
 #
 CONFIGURE RETENTION POLICY TO {{rman_retention_policy}};
 CONFIGURE CONTROLFILE AUTOBACKUP ON;
-CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk_default}};
+CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk}};
 CONFIGURE DEVICE TYPE DISK PARALLELISM 1 BACKUP TYPE TO COMPRESSED BACKUPSET;
 CONFIGURE CHANNEL DEVICE TYPE DISK {{ rman_channel_disk }};

roles/oradb-rman/templates/parameter_fra_disk.rman.j2

@@ -6,6 +6,8 @@
 #
 CONFIGURE RETENTION POLICY TO {{rman_retention_policy}};
 CONFIGURE CONTROLFILE AUTOBACKUP ON;
-CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk_default}};
+CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk}};
 CONFIGURE DEVICE TYPE DISK PARALLELISM 1 BACKUP TYPE TO COMPRESSED BACKUPSET;
 CONFIGURE CHANNEL DEVICE TYPE DISK clear;
+CONFIGURE SNAPSHOT CONTROLFILE NAME TO '+{{oracle_dbf_dir_asm}}/{{ item.0.oracle_db_name }}/snapcf_{{ item.0.oracle_db_name }}.f';
+

roles/oradb-rman/templates/parameter_rac.rman.j2

@@ -6,7 +6,7 @@
 #
 CONFIGURE RETENTION POLICY TO {{rman_retention_policy}};
 CONFIGURE CONTROLFILE AUTOBACKUP ON;
-CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk_default}};
+CONFIGURE CONTROLFILE AUTOBACKUP FORMAT FOR DEVICE TYPE DISK TO {{rman_controlfile_autobackup_disk}};
 CONFIGURE DEVICE TYPE DISK {{rman_device_type_disk}};
 CONFIGURE CHANNEL DEVICE TYPE DISK {{ rman_channel_disk }};
 CONFIGURE SNAPSHOT CONTROLFILE NAME TO '{{oracle_dbf_dir_asm}}/%d/snapcf_PLANETP1.f'; # default