Merge remote-tracking branch 'origin/master' into ITPLT-3960-dcd-ansible---cache-jdk-in-sh

roles/bitbucket_dataset_restore/tasks/main.yml

@@ -30,7 +30,7 @@
     body_format: json
     return_content: yes
   register: output
-  until:  output.status == 200 
+  until:  output.status == 200
   retries: 6
   delay: 15
   failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING'
@@ -50,7 +50,7 @@
   delay: 10
 
 - name: create lock file
-  ansible.builtin.file: 
+  ansible.builtin.file:
     path: "{{ atl_product_home_shared }}/data/migration/import/lock.file"
     state: touch
   when: import_status.json.state == 'COMPLETED'

roles/confluence_config/templates/server.xml.j2

@@ -50,7 +50,7 @@
     <Connector port="{{ atl_apptunnel_port }}"
                connectionTimeout="20000"
                maxThreads="200"
-               minSpareThreads="10" 
+               minSpareThreads="10"
                enableLookups="false"
                acceptCount="10"
                URIEncoding="UTF-8"/>

roles/crowd_config/templates/server.xml.j2

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<Server port="{{ atl_tomcat_mgmt_port }}" 
+<Server port="{{ atl_tomcat_mgmt_port }}"
         shutdown="SHUTDOWN">
 
     <Service name="Catalina">
 
-        <Connector acceptCount="{{ atl_tomcat_acceptcount }}" 
-                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}" 
-                   disableUploadTimeout="true" 
-                   enableLookups="{{ atl_tomcat_enablelookups }}" 
-                   maxHttpHeaderSize="8192" 
-                   maxThreads="{{ atl_tomcat_maxthreads }}" 
-                   minSpareThreads="{{ atl_tomcat_minsparethreads }}" 
-                   port="{{ atl_tomcat_port }}" 
-                   redirectPort="{{ atl_tomcat_redirectport }}" 
-                   useBodyEncodingForURI="true" 
-                   URIEncoding="UTF-8" 
-                   compression="on" 
-                   sendReasonPhrase="true" 
-                   compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" 
-                   secure="{{ atl_tomcat_secure }}" 
-                   scheme="{{ atl_tomcat_scheme }}" 
-                   proxyName="{{ atl_proxy_name }}" 
-                   proxyPort="{{ atl_proxy_port }}" 
+        <Connector acceptCount="{{ atl_tomcat_acceptcount }}"
+                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
+                   disableUploadTimeout="true"
+                   enableLookups="{{ atl_tomcat_enablelookups }}"
+                   maxHttpHeaderSize="8192"
+                   maxThreads="{{ atl_tomcat_maxthreads }}"
+                   minSpareThreads="{{ atl_tomcat_minsparethreads }}"
+                   port="{{ atl_tomcat_port }}"
+                   redirectPort="{{ atl_tomcat_redirectport }}"
+                   useBodyEncodingForURI="true"
+                   URIEncoding="UTF-8"
+                   compression="on"
+                   sendReasonPhrase="true"
+                   compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"
+                   secure="{{ atl_tomcat_secure }}"
+                   scheme="{{ atl_tomcat_scheme }}"
+                   proxyName="{{ atl_proxy_name }}"
+                   proxyPort="{{ atl_proxy_port }}"
                    protocol="{{ atl_tomcat_protocol }}">
         </Connector>
 
-        <Engine defaultHost="localhost" 
+        <Engine defaultHost="localhost"
                 name="Catalina">
-            <Host appBase="webapps" 
-                  autoDeploy="true" 
-                  name="localhost" 
+            <Host appBase="webapps"
+                  autoDeploy="true"
+                  name="localhost"
                   unpackWARs="true">
-              <Context path="{{ atl_tomcat_contextpath }}" 
-                       docBase="../../crowd-webapp" 
+              <Context path="{{ atl_tomcat_contextpath }}"
+                       docBase="../../crowd-webapp"
                        debug="0"
                        useHttpOnly="true">
                        <Manager pathname="">
@@ -45,20 +45,20 @@
         <!-- To connect to an external web server (typically Apache) -->
         <!-- Define an AJP 1.3 Connector on port 8009 -->
         <!--
-            <Connector port="8009" 
-                       enableLookups="{{ atl_tomcat_enablelookups }}" 
-                       redirectPort="{{ atl_tomcat_redirectport }}" 
+            <Connector port="8009"
+                       enableLookups="{{ atl_tomcat_enablelookups }}"
+                       redirectPort="{{ atl_tomcat_redirectport }}"
                        protocol=""AJP/1.3"" />
         -->
-        <Connector port="{{ atl_tomcat_redirectport }}" 
-                   protocol="{{ atl_tomcat_protocol }}" 
-                   relaxedPathChars="[]|" 
-                   relaxedQueryChars='[]|{}^\`"&lt;&gt;' 
-                   maxHttpHeaderSize="65536" 
-                   URIEncoding="UTF-8" 
-                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}" 
-                   useBodyEncodingForURI="true" 
-                   compression="on" 
+        <Connector port="{{ atl_tomcat_redirectport }}"
+                   protocol="{{ atl_tomcat_protocol }}"
+                   relaxedPathChars="[]|"
+                   relaxedQueryChars='[]|{}^\`"&lt;&gt;'
+                   maxHttpHeaderSize="65536"
+                   URIEncoding="UTF-8"
+                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
+                   useBodyEncodingForURI="true"
+                   compression="on"
                    compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript">
         </Connector>
     </Service>

roles/jira_config/templates/server.xml.j2

@@ -50,7 +50,7 @@
     <Connector port="{{ atl_apptunnel_port }}"
                connectionTimeout="20000"
                maxThreads="200"
-               minSpareThreads="10" 
+               minSpareThreads="10"
                enableLookups="false"
                acceptCount="10"
                URIEncoding="UTF-8"

roles/product_install/molecule/jira_all/converge.yml

@@ -7,7 +7,7 @@
     atl_product_user: "jira"
     # Version 8.14.0 is chosen deliberately as it is a version where jira and jira-software returns different buildNumber from MPAC
     # See DCD-1216 for context
-    atl_product_version: "8.14.0" 
+    atl_product_version: "8.14.0"
     atl_install_jsd_as_obr: true
     atl_systemd_service_name: "jira.service"
     atl_jdbc_encoding: 'UNICODE'

roles/product_install/tasks/main.yml

@@ -186,13 +186,13 @@
       failed_when: false
       ignore_errors: yes
       no_log: true
-      when: 
+      when:
         - ansible_ec2_placement_region is defined
         - atl_download_secret_name is defined
       tags:
         - runtime_pkg
 
-    # Fetch binary and copy to temp 
+    # Fetch binary and copy to temp
     # optionally use basic_auth creds from secrets_manager
     - name: Fetch binary
       ansible.builtin.get_url:
@@ -202,6 +202,7 @@
         url_username: "{{ download_atlassian_username | default(omit) }}"
         mode: 0755
         force: false
+        http_agent: "ansible-httpget_{{ ansible_play_name }}"
       register: atl_product_completed
 
     # If product installer was fetched make the lock directory