Merge tag 'release-6.0.0' into release-7.0.1

ansible/roles/log-es6/tasks/plugins/repository-oci.yml

@@ -4,33 +4,33 @@
   shell: echo "{{ cloud_management_storage_accountname }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.access_key
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default oci account key for backups
   become: yes
   shell: echo "{{ cloud_management_storage_secret }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.secret_key
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 
 - name: Add default oci endpoint for backups
   become: yes
   shell: echo "{{ cloud_management_storage_endpoint }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.endpoint
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default oci region for backups
   become: yes
   shell: echo "{{ cloud_management_storage_region }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.region
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default path-style access for backups
   become: yes
   shell: echo "{{ cloud_management_storage_path_style_access }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.path_style_access
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"   
+    ES_PATH_CONF: "{{ es_conf_dir }}"   

ansible/roles/mongodb-cluster/templates/mongod.conf.j2

@@ -106,7 +106,7 @@ operationProfiling:
   {% endfor %}
   {% endif %}
 
-{% if mongodb_major_version is version("4.0", ">=") -%}
+{# {% if mongodb_major_version is version("4.0", ">=") -%}
 cloud:
   monitoring:
     free:
@@ -116,7 +116,7 @@ cloud:
   {{ item }}
   {% endfor %}
   {% endif %}
-{% endif %}
+{% endif %} #}
 
 {% if mongodb_set_parameters -%}
 setParameter:

deploy/jenkins/jenkins-server-setup.sh

@@ -72,6 +72,14 @@ echo -e "\n\e[0;32m${bold}Installating Ansible${normal}"
 pip uninstall -y ansible
 pip3 install ansible==2.8.19
 
+echo -e "\n\e[0;32m${bold}Installing oci cli ${normal}"
+oci_cli_setup_zip="https://github.com/oracle/oci-cli/releases/download/v3.22.0/oci-cli-3.22.0-Ubuntu-18.04-Offline.zip"
+wget $oci_cli_setup_zip -O /tmp/ocicli.zip
+unzip /tmp/ocicli.zip -d /tmp
+cd /tmp
+./oci-cli-installation/install.sh --install-dir /var/lib/jenkins --exec-dir /var/lib/jenkins --script-dir /var/lib/jenkins --accept-all-defaults
+mv /var/lib/jenkins/oci /usr/bin
+
 echo -e "\n\e[0;32m${bold}Installating azure cli${normal}"
 apt-get install ca-certificates curl apt-transport-https lsb-release gnupg
 curl -sL https://packages.microsoft.com/keys/microsoft.asc |
@@ -107,6 +115,10 @@ echo -e "\n\e[0;32m${bold}Creating bashrc for jenkins user ${normal}"
 cp /etc/skel/.bashrc /var/lib/jenkins
 chown jenkins:jenkins /var/lib/jenkins/.bashrc
 
+echo -e "\n\e[0;32m${bold}Creating profile for jenkins user ${normal}"
+echo "export OCI_CLI_AUTH=instance_principal" > /var/lib/jenkins/.profile
+chown jenkins:jenkins /var/lib/jenkins/.profile
+
 echo -e "\n\e[0;32m${bold}Setting timezone to IST ${normal}"
 timedatectl set-timezone Asia/Kolkata
 

deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Lern/jobs/LernFlinkJobs/config.xml

@@ -106,7 +106,8 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
 'assessment-aggregator',
 'enrolment-reconciliation',
 'notification-job',
-'program-user-info']</script>
+'program-user-info',
+'legacy-certificate-migrator']</script>
               <sandbox>true</sandbox>
             </secureScript>
             <secureFallbackScript plugin="[email protected]">