ITOPSENG-277 only write synchrony.service.url if it has a value(in the right place this time)

roles/confluence_config/defaults/main.yml

@@ -17,6 +17,7 @@ atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS
 atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
 
 atl_catalina_opts: ""
+atl_synchrony_url: "{% if atl_synchrony_service_url|length %}-Dsynchrony.service.url={{ atl_synchrony_service_url }}{% endif %}"
 atl_catalina_opts_extra: >-
   -Datlassian.event.thread_pool_configuration.queue_size=4096
   -Datlassian.plugins.enable.wait=300
@@ -28,9 +29,9 @@ atl_catalina_opts_extra: >-
   -XX:+PrintGCDetails
   -XX:+PrintTenuringDistribution
   -Dsynchrony.proxy.enabled=false
-  -Dsynchrony.service.url={{ atl_synchrony_service_url }}
   -Dconfluence.cluster.node.name={{ atl_local_ipv4 }}
   -Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60
+  {% if atl_synchrony_service_url|length %}-Dsynchrony.service.url={{ atl_synchrony_service_url }}{% endif %}
 
 atl_tomcat_port: "8080"
 atl_tomcat_mgmt_port: "8005"

roles/synchrony_config/templates/atl.synchrony.j2

@@ -19,9 +19,7 @@ ATL_SYNCHRONY_JVM_PROPERTIES="{{ atl_synchrony_stack_space }} {{ atl_synchrony_m
  -Dsynchrony.cluster.bind={{ atl_local_ipv4 }} \
  -Dcluster.interfaces={{ atl_local_ipv4 }} \
  -Dsynchrony.cluster.base.port=25500 \
- {% if atl_synchrony_service_url|length %}
  -Dsynchrony.service.url={{ atl_synchrony_service_url }} \
- {% endif %}
  -Dsynchrony.context.path=/synchrony \
  -Dsynchrony.port=8091 \
  -Dcluster.name=Synchrony-Cluster \