Release 5.1.0 - csp changes (#3667)

ansible/assets-upload.yml

@@ -13,7 +13,6 @@
         blob_container_folder_path: ""
         storage_account_name: "{{ cloud_public_storage_accountname }}"
         storage_account_key: "{{ cloud_public_storage_secret }}"
-        storage_account_sas_token: "{{ azure_public_storage_account_sas }}"
 
     - name: delete files and folders from azure storage using azcopy
       include_role:

ansible/deploy-plugins.yml

@@ -19,7 +19,6 @@
             container_public_access: "container"
             storage_account_name: "{{ cloud_public_storage_accountname }}"
             storage_account_key: "{{ cloud_public_storage_secret }}"
-            storage_account_sas_token: "{{ azure_public_storage_account_sas }}"
           tags:
             - always
           no_log: True

ansible/roles/azure-cloud-storage/tasks/delete-using-azcopy.yml

 ---
+- name: generate SAS token for azcopy
+  shell: |
+   sas_expiry=`date -u -d "1 hour" '+%Y-%m-%dT%H:%MZ'`
+   sas_token=?`az storage container generate-sas -n {{ blob_container_name }} --account-name {{ storage_account_name }} --account-key {{ storage_account_key }} --https-only --permissions dlrw --expiry $sas_expiry -o tsv`
+   echo $sas_token
+  register: sas_token
+
+- set_fact:
+   container_sas_token: "{{ sas_token.stdout}}"
+
 - name: delete files and folders from azure storage using azcopy
-  shell: "azcopy rm 'https://{{ storage_account_name }}.blob.core.windows.net/{{ blob_container_name }}{{ blob_container_folder_path }}{{ storage_account_sas_token }}' --recursive"
+  shell: "azcopy rm 'https://{{ storage_account_name }}.blob.core.windows.net/{{ blob_container_name }}{{ blob_container_folder_path }}{{ container_sas_token }}' --recursive"
   environment:
     AZCOPY_CONCURRENT_FILES: "10"
   async: 10800

ansible/roles/azure-cloud-storage/tasks/upload-using-azcopy.yml

 ---
+- name: generate SAS token for azcopy
+  shell: |
+   sas_expiry=`date -u -d "1 hour" '+%Y-%m-%dT%H:%MZ'`
+   sas_token=?`az storage container generate-sas -n {{ blob_container_name }} --account-name {{ storage_account_name }} --account-key {{ storage_account_key }} --https-only --permissions dlrw --expiry $sas_expiry -o tsv`
+   echo $sas_token
+  register: sas_token
+
+- set_fact:
+   container_sas_token: "{{ sas_token.stdout}}"
+
 - name: create container in azure storage if it doesn't exist
   include_role:
     name: azure-cloud-storage
@@ -6,7 +16,7 @@
   when: create_container == True
 
 - name: upload files and folders to azure storage using azcopy
-  shell: "azcopy copy {{ local_file_or_folder_path }} 'https://{{ storage_account_name }}.blob.core.windows.net/{{ blob_container_name }}{{ blob_container_folder_path }}{{ storage_account_sas_token }}' --recursive"
+  shell: "azcopy copy {{ local_file_or_folder_path }} 'https://{{ storage_account_name }}.blob.core.windows.net/{{ blob_container_name }}{{ blob_container_folder_path }}{{ container_sas_token }}' --recursive"
   environment:
     AZCOPY_CONCURRENT_FILES: "10"
   async: 10800

ansible/roles/cassandra-backup/tasks/main.yml

@@ -42,7 +42,7 @@
     blob_container_folder_path: ""
     local_file_or_folder_path: "/data/cassandra/backup/{{ cassandra_backup_folder_name }}"
     storage_account_name: "{{ cloud_management_storage_accountname }}"
-    storage_account_sas_token: "{{ azure_management_storage_account_sas }}"
+    storage_account_key: "{{ cloud_management_storage_secret }}"
   when: cloud_service_provider == "azure"
 
 - name: upload backup to S3

ansible/roles/postgres-managed-service-restore/tasks/main.yml

@@ -26,7 +26,7 @@
     name: aws-cloud-storage
     tasks_from: download.yml
   vars:
-    s3_bucket_name: "{{ cloud_storage_management_bucketname }}"
+    s3_bucket_name: "{{ cloud_storage_postgresqlbackup_bucketname }}"
     aws_access_key_id: "{{ cloud_management_storage_accountname }}"
     aws_secret_access_key: "{{ cloud_management_storage_secret }}"
     aws_default_region: "{{ cloud_public_storage_region }}"