Merge pull request #665 from ministryofjustice/oasys_db_refresh_2

Corrected spool file name same as db name

ansible/roles/oracle-db-refresh/tasks/get_latest_backup_control_file.yml

@@ -1,8 +1,8 @@
 ---
-- name: Check if ORACLE_DB_REFRESH_DB_NAME is defined
+- name: Check if SOURCE_DB is defined
   fail:
-    msg: "ORACLE_DB_REFRESH_DB_NAME is not defined"
-  when: ORACLE_DB_REFRESH_DB_NAME == ""
+    msg: "SOURCE_DB is not defined"
+  when: SOURCE_DB == ""
 
 - name: Install SQL Script
   template:
@@ -24,8 +24,8 @@
 
 - name: Copy the latest backup control file handle details to the runner
   fetch:
-    src: /tmp/{{ ORACLE_DB_REFRESH_FILE }}
-    dest: "{{ lookup('env','GITHUB_WORKSPACE') | default('/tmp', true) }}/{{ ORACLE_DB_REFRESH_FILE }}"
+    src: "/tmp/{{ SOURCE_DB }}_control.txt"
+    dest: "{{ lookup('env','GITHUB_WORKSPACE') | default('/tmp', true) }}/{{ SOURCE_DB }}_control.txt"
     flat: yes
     fail_on_missing: yes
 
@@ -34,5 +34,5 @@
     path: "{{ item }}"
     state: absent
   loop:
+    - "/tmp/{{ SOURCE_DB }}_control.txt"
     - "/tmp/get_latest_backup_control_file.sql"
-    - "/tmp/{{ ORACLE_DB_REFRESH_FILE }}"

ansible/roles/oracle-db-refresh/tasks/main.yml

@@ -2,4 +2,9 @@
 - import_tasks: get_latest_backup_control_file.yml
   tags:
     - oracle_db_refresh
-    - oracle_db_refresh_get_latest_backup_control_file
+    - get_latest_backup_control_file
+
+- import_tasks: oracle_db_restore.yml
+  tags:
+    - oracle_db_refresh
+    - refresh_db

ansible/roles/oracle-db-refresh/tasks/oracle_db_restore.yml

@@ -0,0 +1,17 @@
+---
+- name: Check if TARGET_DB is defined
+  fail:
+    msg: "TARGET_DB is not defined"
+  when: TARGET_DB == ""
+
+- name: Check if SOURCE_DB is defined
+  fail:
+    msg: "SOURCE_DB is not defined"
+  when: SOURCE_DB == ""
+
+- name: Copy the latest backup control file handle details to the runner
+  fetch:
+    src: "{{ lookup('env','GITHUB_WORKSPACE') | default('/tmp', true) }}/{{ SOURCE_DB }}_control.txt"
+    dest: "/tmp/{{ TARGET_DB }}_control.txt"
+    flat: yes
+    fail_on_missing: yes

ansible/roles/oracle-db-refresh/templates/get_latest_backup_control_file.sql.j2

@@ -1,9 +1,9 @@
 set head off echo off feedback off 
-spool /tmp/{{ ORACLE_DB_REFRESH_FILE }}
+spool /tmp/{{ SOURCE_DB }}_control.txt
 with controlfile_details as
 (
  select db_key, max(stamp) stamp from rcvcatowner.rc_backup_controlfile
- where autobackup_date is NULL and db_name = '{{ ORACLE_DB_REFRESH_DB_NAME }}' 
+ where autobackup_date is NULL and db_name = '{{ SOURCE_DB }}' 
  group by db_key
 )
 select a.HANDLE from rcvcatowner.rc_backup_piece a, controlfile_details b, rcvcatowner.rc_backup_controlfile c