Merge OCI changes to release-5.2.0 branch

.gitignore

@@ -29,3 +29,4 @@ target/
 *.iml
 **/.settings
 dependency-reduced-pom.xml
+.vscode

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 }}"
@@ -38,3 +40,17 @@
         aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
         aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
       when: cloud_service_provider == "aws"
+
+
+    - name: download artifact from oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"           
+        tasks_from: download.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        oss_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        oss_object_name: "{{ artifact }}"
+      when: cloud_service_provider == "oci"

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 }}"
@@ -39,3 +41,16 @@
         aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
         aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
       when: cloud_service_provider == "aws"
+
+    - name: upload artifact to oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"        
+        tasks_from: upload.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        oss_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        oss_path: "{{ artifact }}"
+      when: cloud_service_provider == "oci"

ansible/lpa_data-products_deploy.yml

@@ -8,4 +8,4 @@
     AZURE_STORAGE_ACCOUNT: "{{cloud_private_storage_accountname}}"
     AZURE_STORAGE_KEY: "{{cloud_private_storage_secret}}"
   roles:
-   - data-products-deploy
+    - data-products-deploy

ansible/oci-bds-spark.provision.yml

@@ -0,0 +1,18 @@
+- hosts: local
+  become: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - oci-bds-spark-cluster
+  tags:
+    - copy-script
+
+- hosts: bds-livy-node
+  become: yes
+  gather_facts: no
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - provision-oci-spark-cluster
+  tags:
+    - spark-provision

ansible/roles/analytics-bootstrap-always/meta/main.yml

@@ -1,6 +1,7 @@
 ---
 dependencies:
   - { role: jdk11 , become: yes }
-  - { role: azure-cli  , become: yes }
+  - { role: azure-cli  , become: yes, when: cloud_service_provider == "azure" }
+  - { role: oci-cli  , become: yes, when: cloud_service_provider == "oci" }
 
 

ansible/roles/analytics-bootstrap-spark/tasks/main.yml

@@ -4,8 +4,8 @@
   become: yes
   become_user: "{{ analytics_user }}"
   lineinfile:
-    path: '{{ analytics_user_home }}/.bashrc'
-    line: 'export {{item.var}}={{item.value}}'
+    path: "{{ analytics_user_home }}/.bashrc"
+    line: "export {{item.var}}={{item.value}}"
     regexp: "export {{ item.var }}.*"
   with_items:
     - {var: 'azure_storage_key', value: '{{ cloud_private_storage_accountname }}'}
@@ -14,8 +14,8 @@
 - name: Adding ENV Vars to spark servers environment.
   become: yes
   lineinfile:
-    path: '/etc/environment'
-    line: '{{item.var}}={{item.value}}'
+    path: "/etc/environment"
+    line: "{{item.var}}={{item.value}}"
     regexp: "{{ item.var }}.*"
   with_items:
     - {var: 'azure_storage_key', value: '{{ cloud_private_storage_accountname }}'}