From 79fd9e5db940c224dd2dc5924225701f82dc4c07 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Thu, 3 Oct 2019 11:47:10 +1000 Subject: [PATCH] DCD-686: More tweaks to manifest handling. --- roles/restore_metadata/tasks/main.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/roles/restore_metadata/tasks/main.yml b/roles/restore_metadata/tasks/main.yml index 7f7c30f..c532608 100644 --- a/roles/restore_metadata/tasks/main.yml +++ b/roles/restore_metadata/tasks/main.yml @@ -4,17 +4,19 @@ - name: Parse the manifest URL set_fact: - atl_backup_manifest_scheme: "{{ atl_backup_manifest_url | urlsplit('scheme') }}" - atl_backup_manifest_bucket: "{{ atl_backup_manifest_url | urlsplit('hostname') }}" - atl_backup_manifest_path: "{{ atl_backup_manifest_url | urlsplit('path') }}" - atl_backup_manifest_filename: "{{ atl_backup_manifest_path | basename}}" - atl_backup_manifest_dest: "{{ atl_installer_temp }}/{{ atl_backup_manifest_path | basename}}" + atl_backup_manifest_url: "{{ atl_backup_manifest_url | urlsplit }}" + + - name: Extract manifest file information + set_fact: + atl_backup_manifest_bucket: "{{ atl_backup_manifest_url.hostname }}" + atl_backup_manifest_path: "{{ atl_backup_manifest_url.path }}" + atl_backup_manifest_dest: "{{ atl_installer_temp }}/{{ atl_backup_manifest_url.path | basename }}" - name: Fetch the manifest from S3 aws_s3: - bucket: "{{ atl_backup_manifest | urlsplit('hostname' }}" - object: "{{ atl_backup_manifest | urlsplit('path' }}" - dest: "{{ atl_installer_temp }}/{{ atl_backup_manifest | urlsplit('path' | }}" + bucket: "{{ atl_backup_manifest_bucket }}" + object: "{{ atl_backup_manifest_path }}" + dest: "{{ atl_backup_manifest_dest }}" when: atl_backup_manifest_scheme == 's3' - name: Fetch the manifest from remote host