Merge remote-tracking branch 'origin/master' into DCD-802-create-shared-home-with-product-user-ownership

This commit is contained in:
Ben Partridge
2019-11-18 13:44:26 +11:00

View File

@@ -68,7 +68,9 @@
overwrite: different overwrite: different
bucket: "{{ atl_backup_manifest.artifacts.db.location.location | urlsplit('hostname') }}" bucket: "{{ atl_backup_manifest.artifacts.db.location.location | urlsplit('hostname') }}"
object: "{{ atl_backup_manifest.artifacts.db.location.location | urlsplit('path') }}" object: "{{ atl_backup_manifest.artifacts.db.location.location | urlsplit('path') }}"
dest: "{{ atl_backup_db_dest }}" # We save the backup as a .tar file so that the postgresql_db module uses pg_restore instead of psql to do restore
# This can be removed when ansible 2.10 is released
dest: "{{ atl_backup_db_dest }}.tar"
- name: Fetch Home backup from S3 - name: Fetch Home backup from S3
aws_s3: aws_s3:
@@ -96,7 +98,8 @@
template: "{{ atl_jdbc_template }}" template: "{{ atl_jdbc_template }}"
# Depends on fetch_backup roles # Depends on fetch_backup roles
state: restore state: restore
target: "{{ atl_backup_db_dest }}" target: "{{ atl_backup_db_dest }}.tar"
target_opts: "-Fc"
register: result register: result
# managed DBs in cloud providers are not allowing full root access to the DB engine, we can safely ignore the COMMENT ON EXTENSION error # managed DBs in cloud providers are not allowing full root access to the DB engine, we can safely ignore the COMMENT ON EXTENSION error
failed_when: failed_when: