From bbfef12d88689aaffbc4794a0fab44d38fa4a549 Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:17:17 +0530 Subject: [PATCH 1/3] Added OCI vars for offline desktop upload --- ansible/roles/desktop-deploy/tasks/main.yml | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ansible/roles/desktop-deploy/tasks/main.yml b/ansible/roles/desktop-deploy/tasks/main.yml index 6a01f97b0c..8031d8b16b 100644 --- a/ansible/roles/desktop-deploy/tasks/main.yml +++ b/ansible/roles/desktop-deploy/tasks/main.yml @@ -128,3 +128,30 @@ gcp_path: "latest" local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets/{{ time }}/" when: cloud_service_provider == "gcloud" + +### OCI Tasks ### +- name: this block consists of tasks related to OCI + block: + - name: set common oci variables + set_fact: + oss_bucket_name: "{{ cloud_storage_offlineinstaller_bucketname }}" + oss_path: "{{ offline_installer_storage }}/latest" + local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets" + + - name: upload batch of files to oci oss + include_role: + name: oci-cloud-storage + tasks_from: upload-folder.yml + vars: + oss_path: "{{ offline_installer_storage }}" + local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets" + + - name: upload batch of files to oci oss + include_role: + name: oci-cloud-storage + tasks_from: upload-folder.yml + vars: + oss_path: "{{ offline_installer_storage }}/latest" + local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets/{{ time }}/" + when: cloud_service_provider == "oci" + From 2fb5d4a0d89687340724a19af6b46932ce4d654a Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:29:43 +0530 Subject: [PATCH 2/3] Fixed OCI common variable oss_path --- ansible/roles/desktop-deploy/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/desktop-deploy/tasks/main.yml b/ansible/roles/desktop-deploy/tasks/main.yml index 8031d8b16b..43e15eb4a2 100644 --- a/ansible/roles/desktop-deploy/tasks/main.yml +++ b/ansible/roles/desktop-deploy/tasks/main.yml @@ -135,7 +135,7 @@ - name: set common oci variables set_fact: oss_bucket_name: "{{ cloud_storage_offlineinstaller_bucketname }}" - oss_path: "{{ offline_installer_storage }}/latest" + oss_path: "{{ offline_installer_storage }}" local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets" - name: upload batch of files to oci oss From 4f1dede3418a5c9b78562486569d4214e236f4b5 Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:53:48 +0530 Subject: [PATCH 3/3] removed oss_path from set_fact --- ansible/roles/desktop-deploy/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/desktop-deploy/tasks/main.yml b/ansible/roles/desktop-deploy/tasks/main.yml index 43e15eb4a2..db807bcaf0 100644 --- a/ansible/roles/desktop-deploy/tasks/main.yml +++ b/ansible/roles/desktop-deploy/tasks/main.yml @@ -135,7 +135,6 @@ - name: set common oci variables set_fact: oss_bucket_name: "{{ cloud_storage_offlineinstaller_bucketname }}" - oss_path: "{{ offline_installer_storage }}" local_file_or_folder_path: "{{ offline_repo_location }}/desktop_uploader_assets" - name: upload batch of files to oci oss