Add gcp vars for service accounts (#3696)

ansible/artifacts-download.yml

@@ -21,6 +21,8 @@
         name: gcp-cloud-storage
         tasks_from: download.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
         gcp_path: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"

ansible/artifacts-upload.yml

@@ -22,6 +22,8 @@
         name: gcp-cloud-storage
         tasks_from: upload.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
         gcp_path: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"

ansible/assets-upload.yml

@@ -56,6 +56,8 @@
     block:
     - name: set common gcloud variables
       set_fact:
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
         gcp_path: ""
         file_delete_pattern: ""

ansible/deploy-plugins.yml

@@ -141,6 +141,8 @@
               name: gcp-cloud-storage
               tasks_from: "{{ item[0] }}"
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               file_delete_pattern: "content-plugins/{{ item[1] }}/*"
               gcp_path: "content-plugins/{{ item[1] }}"
               local_file_or_folder_path: "{{ source_folder }}/{{ item[1] }}"

ansible/desktop-faq-upload.yml

@@ -95,6 +95,8 @@
               name: gcp-cloud-storage
               tasks_from: upload.yml
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               gcp_bucket_name: "{{ cloud_storage_public_bucketname }}"
           tags:
             - upload-desktop-faq
@@ -105,6 +107,8 @@
               name: gcp-cloud-storage
               tasks_from: upload.yml
             vars:
+              gcp_storage_service_account_name: "{{ cloud_private_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_private_storage_secret }}"
               gcp_bucket_name: "{{ cloud_storage_label_bucketname }}"
           tags:
             - upload-label
@@ -115,6 +119,8 @@
               name: gcp-cloud-storage
               tasks_from: upload-batch.yml
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               gcp_bucket_name: "{{ cloud_storage_chatbot_bucketname }}"
           tags:
             - upload-chatbot-config
@@ -125,6 +131,8 @@
               name: gcp-cloud-storage
               tasks_from: upload-batch.yml
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               gcp_bucket_name: "{{ cloud_storage_sourcing_bucketname }}"
           tags:
             - upload-csv-template
@@ -135,6 +143,8 @@
               name: gcp-cloud-storage
               tasks_from: upload-batch.yml
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               gcp_bucket_name: "{{ cloud_storage_discussionui_bucketname }}"
           tags:
             - upload-discussion-ui

ansible/dial_upload-schema.yml

@@ -50,6 +50,8 @@
               name: gcp-cloud-storage
               tasks_from: upload-batch.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_dial_bucketname }}"
         gcp_path: "schemas/local"
         local_file_or_folder_path: "dial_schema_template_files"

ansible/kp_upload-schema.yml

@@ -34,6 +34,8 @@
           name: gcp-cloud-storage
           tasks_from: upload-batch.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_content_bucketname }}"
         gcp_path: "{{ schemas/local"
         local_file_or_folder_path: "{{ source_name }}"

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

@@ -63,6 +63,8 @@
     name: gcp-cloud-storage
     tasks_from: upload-batch.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_cassandrabackup_bucketname }}"
     gcp_path: "{{ cloud_storage_cassandrabackup_foldername }}"
     local_file_or_folder_path: "/data/cassandra/backup/{{ cassandra_backup_folder_name }}"

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

@@ -37,6 +37,8 @@
     name: gcp-cloud-storage
     tasks_from: download.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_cassandrabackup_bucketname }}"
     gcp_path: "{{ cloud_storage_cassandrabackup_foldername }}/{{ cassandra_restore_gzip_file_name }}"
     local_file_or_folder_path: "{{ cassandra_restore_gzip_file_path }}"

ansible/roles/cert-templates/tasks/main.yml

@@ -62,6 +62,8 @@
     name: gcp-cloud-storage
     tasks_from: upload-batch.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_private_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_private_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_certservice_bucketname }}"
     gcp_path: ""
     local_file_or_folder_path: "{{ cert_location }}/cert-templates/certUtilScripts/out"

ansible/roles/desktop-deploy/tasks/main.yml

@@ -108,6 +108,8 @@
   block:
     - name: set common gcloud variables
       set_fact:
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_offlineinstaller_bucketname }}"
 
     - name: upload batch of files to gcloud storage

ansible/roles/gcp-cloud-storage/defaults/main.yml

+# GCP service account name
+# Example -
+# gcp_storage_service_account_name: test@sunbird.iam.gserviceaccount.com
+gcp_storage_service_account_name: ""
+
 # GCP bucket name
 # Example -
 # bucket_name: "sunbird-dev-public"

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

@@ -50,6 +50,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_grafanabackup_bucketname }}"
     gcp_path: "{{ cloud_storage_grafanabackup_foldername }}/{{ grafana_backup_gzip_file_name }}"
     local_file_or_folder_path: "{{ grafana_backup_gzip_file_path }}"

ansible/roles/jenkins-backup-upload/tasks/main.yml

@@ -43,6 +43,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_jenkinsbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_jenkinsbackup_foldername  }}/{{ LATEST_BACKUP_DIR.stdout }}.zip"
     local_file_or_folder_path: "/tmp/{{ LATEST_BACKUP_DIR.stdout }}.zip"

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

@@ -45,6 +45,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_mongodbbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_mongodbbackup_foldername }}/{{ mongo_backup_file_name }}.tar.gz"
     local_file_or_folder_path: "{{ mongo_backup_file_path }}.tar.gz"

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

@@ -72,6 +72,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_postgresqlbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_postgresqlbackup_foldername }}/{{ postgresql_backup_gzip_file_name }}.zip"
     local_file_or_folder_path: "{{ postgresql_backup_gzip_file_path }}"

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

@@ -39,6 +39,8 @@
     name: gcp-cloud-storage
     tasks_from: download.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_postgresqlbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_postgresqlbackup_foldername }}/{{ postgres_backup_filename }}"
     local_file_or_folder_path: "{{ postgres_restore_dir }}/{{ postgres_backup_filepath }}"

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

@@ -44,6 +44,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_postgresqlbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_postgresqlbackup_foldername }}/{{ postgresql_backup_gzip_file_name }}"
     local_file_or_folder_path: "{{ postgresql_backup_gzip_file_path }}"

ansible/roles/postgresql-restore/tasks/main.yml

@@ -34,6 +34,8 @@
     name: gcp-cloud-storage
     tasks_from: download.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_postgresqlbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_postgresqlbackup_foldername }}/{{ postgresql_restore_gzip_file_name }}"
     local_file_or_folder_path: "{{ postgresql_restore_gzip_file_path }}"

ansible/roles/prometheus-backup-v2/tasks/main.yml

@@ -47,6 +47,8 @@
     name: gcp-cloud-storage
     tasks_from: upload.yml
   vars:
+    gcp_storage_service_account_name: "{{ cloud_management_storage_accountname }}"
+    gcp_storage_key_file: "{{ cloud_management_storage_secret }}"
     gcp_bucket_name: "{{ cloud_storage_prometheusbackup_bucketname }}"
     gcp_path: "{{ cloud_storage_prometheusbackup_foldername }}/{{ prometheus_backup_prefix }}_{{ snapshot_name }}.tar.gz"
     local_file_or_folder_path: "/tmp/{{ prometheus_backup_prefix }}_{{ snapshot_name }}.tar.gz"