From 135fc421d13c44b951a1a7a43e3155ae6ec5c935 Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:16:07 +0530 Subject: [PATCH 1/3] Add OCI vars for desktop offline upload --- ansible/roles/desktop-deploy/tasks/main.yml | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ansible/roles/desktop-deploy/tasks/main.yml b/ansible/roles/desktop-deploy/tasks/main.yml index 6a01f97b0c..affbf7aa8f 100644 --- a/ansible/roles/desktop-deploy/tasks/main.yml +++ b/ansible/roles/desktop-deploy/tasks/main.yml @@ -128,3 +128,29 @@ 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 ec23095bf1168550be5874f21eaa2705e2b82e4a Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:28:12 +0530 Subject: [PATCH 2/3] removed latest suffix --- 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 affbf7aa8f..44f32c9041 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 e0fda4747b681dc99e7ee20455679554794bd008 Mon Sep 17 00:00:00 2001 From: Prasath Sivasubramaniyan Date: Sun, 21 Jan 2024 02:52:39 +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 44f32c9041..b447f3d2ad 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