Merge pull request #182 from ministryofjustice/DBA-640

Default environment variables

Author: ranbeersingh1

playbooks/oracle_backup/backup.yml

@@ -144,9 +144,9 @@
           async: "{{ allowable_duration|default(28800) }}"
           poll: 60
           environment:
-            ASSUME_ROLE_NAME: "{{ secretsmanager_passwords['catalog'].assume_role_name }}"
-            SECRET_ACCOUNT_ID: "{{ account_ids[secretsmanager_passwords['catalog'].account_name] }}"
-            SECRET: "{{ secretsmanager_passwords['catalog'].secret }}"
+            ASSUME_ROLE_NAME: "{{ secretsmanager_passwords['catalog'].assume_role_name | default() }}"
+            SECRET_ACCOUNT_ID: "{{ account_ids[secretsmanager_passwords['catalog'].account_name] | default() }}"
+            SECRET: "{{ secretsmanager_passwords['catalog'].secret | default() }}"
           register: backup_cmd_output
 
       rescue:

playbooks/oracle_backup/rman_backup.sh

@@ -212,7 +212,7 @@ validate () {
                          error "Catalog mode is $CATALOGMODE, specify catalog db"
                        else
                          get_rman_password
-                         [ -z ${RMANPASS} ] && error "Password for RMAN catalog user ${RMANPASS} does not exist"
+                         [ -z ${RMANPASS} ] && error "Password for RMAN catalog user rcvcatowner does not exist"
                          CATALOG_CONNECT=rcvcatowner/${RMANPASS}@$CATALOG_DB
                        fi
                      fi