AZURE-210 Deploy Crowd DC to Azure

roles/crowd_config/tasks/main.yml

@@ -51,7 +51,7 @@
   lineinfile:
     path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh"
     insertafter: "EOF"
-    line: 'export JAVA_HOME=/usr/lib/jvm/jre-{{ java_version }}-openjdk'
+    line: "export JAVA_HOME={{ java_home | default('/usr/lib/jvm/jre-{{ java_version }}-openjdk')}}"
 
 - name: Create application directories
   file:
@@ -105,7 +105,7 @@
 - name: Assert baseurl to same as atl_proxy_name
   postgresql_query:
     login_host: "{{ atl_db_host }}"
-    login_user: "{{ atl_jdbc_user }}"
+    login_user: "{{ atl_jdbc_user_login }}"
     login_password: "{{ atl_jdbc_password }}"
     db: "{{ atl_jdbc_db_name }}"
     query: >

roles/crowd_config/templates/catalina_opts.j2

@@ -2,4 +2,4 @@
 CATALINA_OPTS="${CATALINA_OPTS} -{{ item }}"
 {% endfor %}
 
-CATALINA_OPTS="${CATALINA_OPTS} -Dcluster.node.name={{ ansible_ec2_instance_id }}-{{ ansible_ec2_local_ipv4 }}"
+CATALINA_OPTS="${CATALINA_OPTS} -Dcluster.node.name={{ atl_cluster_node_id }}"

roles/crowd_config/templates/server.xml.j2

@@ -1,39 +1,40 @@
 <?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 }}" 
+<!-- Add the SSL properties when the load balancer is configured
+                   secure="{{ atl_tomcat_secure }}"
+                scheme="{{ atl_tomcat_scheme }}"
+ -->
+        <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"
+                   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">
                        <Manager pathname="">
                        </Manager>
@@ -44,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>