[ED-2793] Fix installation issues

ansible/artifacts-download.yml

@@ -40,3 +40,16 @@
         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_path: "{{ artifact }}"
+      when: cloud_service_provider == "oci" 

ansible/artifacts-upload.yml

@@ -41,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/artifacts/sunbird/login/messages/messages_en.properties

@@ -56,7 +56,7 @@ noAccount=Don''t have an account?
 username=Username or Mobile number
 goBack=<<Go Back
 mergeAccountMessage=Enter Mobile number / Email Address OR use Login with Google to identify the account from which you want to merge usage details
-migrateAccountMessage=Confirm the password for the DIKSHA account you want to merge of click Login with Google to sign in using your Gmail account
+migrateAccountMessage=Confirm the password for the SUNBIRD account you want to merge of click Login with Google to sign in using your Gmail account
 inCorrectPasswordError=The password entered is incorrect. Enter the password again.
 emailOrPhone=Email Address / Mobile Number
 placeholderForEmailOrPhone=Enter Email Address / Mobile Number

ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

@@ -2477,17 +2477,14 @@ if (typeof module != 'undefined') {
 
 let pdataId = "";
 let tenantSlug;
-if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
-  pdataId = "prod.diksha.portal";
-} else if (window.location.origin.indexOf("staging.ntp.net.in") >= 0) {
-  pdataId = "staging.diksha.portal";
-} else if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
+if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
   pdataId = "staging.diksha.portal";
 } else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
   pdataId = "dev.sunbird.portal";
   tenantSlug = "sunbird";
 } else {
-  pdataId = "preprod.diksha.portal";
+  tenantSlug = "sunbird";
+  pdataId = "dev.sunbird.portal";
 }
 
 let curUrlObj = window.location;
@@ -2506,7 +2503,7 @@ if(client_id.toLowerCase() === 'android'){
     "telemetry": {
       "pdata": {
         "id": pdataId,
-        "ver": "5.2.0",
+        "ver": "6.0.0",
         "pid": "sunbird-portal"
       }
     }
@@ -2533,7 +2530,7 @@ if(client_id.toLowerCase() === 'android'){
         request: {
           filters: {
             isTenant: true,
-            slug: id || 'ntp'
+            slug: id || 'sunbird'
           }
         }
       }),

ansible/assets-upload.yml

@@ -75,3 +75,31 @@
       vars:
         local_file_or_folder_path: "{{ assets }}/*"
     when: cloud_service_provider == "gcloud"
+
+##### OCI
+  - name: this block consists of tasks related to oci oss
+    block:
+    - name: set common oci variables
+      set_fact:
+        oss_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        oss_path: ""
+        oss_namespace: "{{oci_namespace}}"
+
+    - name: delete files and folders from oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: delete-folder.yml
+
+    - name: upload batch of files to oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: upload-folder.yml
+      vars:
+        local_file_or_folder_path: "{{ assets }}"
+    when: cloud_service_provider == "oci"  

ansible/deploy-plugins.yml

@@ -62,7 +62,6 @@
               local_file_or_folder_path: "{{ source_file_name }}"
           tags:
             - preview
-
         - block:
           - name: delete and re-upload plugins
             include_role:
@@ -222,3 +221,81 @@
           tags:
             - plugins
       when: cloud_service_provider == "aws"
+
+
+################################### OCI tasks #########################
+    - name: this block consists of tasks related to oci oss 
+      block:
+        - name: set common oci variables
+          set_fact:
+            oss_bucket_name: "{{ cloud_storage_content_bucketname }}"
+            oss_namespace: "{{ oci_namespace }}"
+          tags:
+            - always
+
+        - block:
+          - name: delete files and folders from oci oss
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: delete-folder.yml
+          vars:
+              oss_path: "{{ folder_name }}/"
+          tags:
+            - content-editor
+            - collection-editor
+            - generic-editor
+            - preview
+
+        - block:
+          - name: upload folder to oci oss
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload-folder.yml
+            vars:
+              oss_path: "{{ folder_name }}/"
+              local_file_or_folder_path: "{{ source_name }}"
+          tags:
+            - content-editor 
+            - collection-editor
+            - generic-editor
+            - preview
+            - editor
+            - core-plugins 
+
+        - block:
+          - name: upload file to oci oss
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload.yml
+            vars:
+              oss_path: "artefacts/content-player/content-player-{{ player_version_number }}.zip"
+              local_file_or_folder_path: "{{ source_file_name }}"
+          tags:
+            - preview
+
+        - block:
+          - name: delete and re-upload plugins for oci
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: "{{ item[0] }}"
+            vars:
+              object_prefix: "content-plugins/{{ item[1] }}/"
+              local_file_or_folder_path: "{{ source_folder }}/{{ item[1] }}"
+            with_nested:
+              - ['oss-delete-batch-no-poll.yml', 'oss-upload-batch-no-poll.yml']
+              - "{{ lookup('file', plugins_to_delete_and_upload).split('\n') }}"
+          tags:
+            - plugins
+      when: cloud_service_provider == "oci"

ansible/desktop-faq-upload.yml

@@ -211,7 +211,7 @@
             - upload-csv-template
 
         - block:
-          - name: upload folder to aws s3 - discussion-ui
+          - name: upload folder to aws s3 - discusion-ui
             include_role:
               name: aws-cloud-storage
               tasks_from: upload-folder.yml
@@ -222,3 +222,83 @@
           tags:
             - upload-discussion-ui
       when: cloud_service_provider == "aws"
+
+
+##### OCI Tasks ####
+
+    - name: this block consists of tasks related to oci oss
+      block:
+        - name: set common oci variables
+          set_fact:
+            local_file_or_folder_path: "{{ playbook_dir }}/../{{ src_file_path }}"
+          tags:
+            - always
+
+        - block:
+          - name: upload file to oci oss public bucket
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload.yml
+            vars:
+              oss_bucket_name: "{{ cloud_storage_public_bucketname }}"
+          tags:
+            - upload-desktop-faq
+
+        - block:
+          - name: upload file to oci oss private bucket
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload.yml
+            vars:
+              oss_bucket_name: "{{ cloud_storage_label_bucketname }}"
+          tags:
+            - upload-label
+
+        - block:
+          - name: upload folder to oci oss - chatbot
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload-folder.yml
+            vars:
+              oss_path: "{{ destination_path }}/"
+              oss_bucket_name: "{{ cloud_storage_chatbot_bucketname }}"
+          tags:
+            - upload-chatbot-config
+
+        - block:
+          - name: upload folder to oci oss - csv-template
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload-folder.yml
+            vars:
+              oss_path: "{{ destination_path }}/"
+              oss_bucket_name: "{{ cloud_storage_sourcing_bucketname }}"
+          tags:
+            - upload-csv-template
+
+        - block:
+          - name: upload folder to oci oss - discussion-ui
+            include_role:
+              name: oci-cloud-storage
+              apply:
+               environment:
+                OCI_CLI_AUTH: "instance_principal"  
+              tasks_from: upload-folder.yml
+            vars:
+              oss_path: "{{ destination_path }}/"
+              oss_bucket_name: "{{ cloud_storage_discussionui_bucketname }}"
+          tags:
+            - upload-discussion-ui
+      when: cloud_service_provider == "oci"    

ansible/es.yml

@@ -12,6 +12,8 @@
       when: cloud_service_provider == "aws"
     - role: es-gcs-snapshot
       when: cloud_service_provider == "gcloud"
+    - role: es-oci-snapshot
+      when: cloud_service_provider == "oci"
     - role: es5-snapshot-purge
   tags:
     - es_backup
@@ -31,6 +33,8 @@
       when: cloud_service_provider == "aws"
     - role: es-gcs-snapshot
       when: cloud_service_provider == "gcloud"
+    - role: es-oci-snapshot
+      when: cloud_service_provider == "oci"
     - es5-snapshot-purge
   tags:
     - log_es_backup

ansible/inventory/env/group_vars/all.yml

@@ -361,7 +361,7 @@ content_service_blacklisted_resourcetype: ''
 content_service_whitelisted_resourcetype: ''
 content_service_whitelisted_mimetype: ''
 content_service_blacklisted_mimetype: ''
-sunbird_cloud_storage_urls: 'https://s3.ap-south-1.amazonaws.com/ekstep-public-{{ekstep_s3_env}}/,https://ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com/,{{ upstream_url }}/'
+sunbird_cloud_storage_urls: 'https://s3.ap-south-1.amazonaws.com/ekstep-public-{{ekstep_s3_env}}/,https://ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com/,{{ upstream_url }}/,https://files.xyz.in/contentsbucket/,https://obj.xyz.in/contentsbucket/'
 sunbird_email_max_recipients_limit: 100
 sunbird_cassandra_consistency_level: local_quorum
 sunbird_cassandra_replication_strategy: '{"class":"SimpleStrategy","replication_factor":"1"}'
@@ -566,3 +566,7 @@ plugin_upstream_url: "{{ upstream_url }}"
 kp_schema_base_path: "{{ upstream_url }}/schemas/local"
 # SB-31155 - Moved to the installation public container for now (same place where keycloaka and java artifacts are stored)
 h5p_library_path: "https://sunbirdpublic.blob.core.windows.net/installation/h5p-standalone-1.3.4.zip"
+
+
+## Added default values
+cloud_public_storage_proxy: "{{cloud_storage_url}}"

ansible/kp_upload-schema.yml

@@ -40,3 +40,16 @@
         gcp_path: "schemas/local"
         local_file_or_folder_path: "{{ source_name }}"
       when: cloud_service_provider == "gcloud"  
+
+    - name: upload batch of files to oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: upload-folder.yml
+      vars:
+        oss_bucket_name: "{{ cloud_storage_content_bucketname }}"
+        local_file_or_folder_path: "{{ source_name }}"
+        oss_path: "schemas/local/"
+      when: cloud_service_provider == "oci"

ansible/roles/cassandra/defaults/main.yml

@@ -1,5 +1,5 @@
 user_home: "/home/{{ ansible_ssh_user }}/"
-cassandra_repo: 'deb http://www.apache.org/dist/cassandra/debian 311x main'
-cassandra_repo_key: 'https://www.apache.org/dist/cassandra/KEYS'
+cassandra_repo: 'deb https://debian.cassandra.apache.org 311x main'
+cassandra_repo_key: 'https://downloads.apache.org/cassandra/KEYS'
 resource_crunch: "yes" # make this value yes if heap size should be quarter of the Server Memory when you are deploying multiple databases, else make this value no to have 50% of the value as per the best practice of cassandra
 cassandra_home_directory: "/var/lib/cassandra"

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

@@ -68,3 +68,15 @@
     gcp_path: ""
     local_file_or_folder_path: "{{ cert_location }}/cert-templates/certUtilScripts/out"
   when: cloud_service_provider == "gcloud"
+
+- name: upload batch of files to oci oss
+  include_role:
+    name: oci-cloud-storage
+    apply:
+      environment:
+       OCI_CLI_AUTH: "instance_principal"
+    tasks_from: upload-folder.yml
+  vars:
+    oss_bucket_name: "{{ cert_service_container_name }}"
+    local_file_or_folder_path: "{{ cert_location }}/cert-templates/certUtilScripts/out"
+  when: cloud_service_provider == "oci"

ansible/roles/es-oci-snapshot/defaults/main.yml

@@ -0,0 +1,19 @@
+snapshot_create_request_body: {
+    type: s3,
+    settings: {
+      bucket: "{{ cloud_storage_esbackup_bucketname }}",
+      path_style_access: "{{s3_path_style_access}}",
+      endpoint: "{{s3_storage_endpoint}}",
+      region: "{{s3_region}}",
+      base_path: "{{ cloud_storage_esbackup_foldername }}/{{ snapshot_base_path }}_{{ base_path_date }}",
+
+    }
+}
+
+# Override these values
+es_snapshot_host: "localhost"
+snapshot_base_path: "default"
+es_backup_storage: "elasticsearch-snapshots"
+
+cloud_storage_esbackup_bucketname: "{{ cloud_storage_management_bucketname }}"
+cloud_storage_esbackup_foldername: "elasticsearch-snapshots"