Correct default values for tomcat_deploy_from_url

Author: vjrj

ansible/roles/geonetwork/tasks/main.yml

@@ -32,7 +32,7 @@
     - geonetwork
   when: webserver_nginx
 
-- include: ../../tomcat_deploy/tasks/main.yml war_url='{{ geonetwork_war_url }}' context_path='{{ geonetwork_context_path }}' hostname='{{ geonetwork_hostname }}'
+- include: ../../tomcat_deploy/tasks/main.yml war_url='{{ geonetwork_war_url }}' context_path='{{ geonetwork_context_path }}' hostname='{{ geonetwork_hostname }}' tomcat_deploy_from_url=true
   notify:
     - restart tomcat
   tags:

ansible/roles/geonetwork/vars/main.yml

@@ -4,4 +4,3 @@ artifactId: ""
 packaging: ""
 classifier: ""
 geonetwork_war_url: "https://github.com/geonetwork/core-geonetwork/releases/download/3.4.4/geonetwork.war"
-tomcat_deploy_from_url: true

ansible/roles/tomcat_deploy/tasks/main.yml

@@ -60,7 +60,11 @@
 
 - name: download from url {{ war_url }}
   get_url: url={{ war_url }} dest="{{ tomcat_deploy_dir }}/{{ war_filename }}.war" checksum="{{ war_checksum | default('') }}" force=true timeout=60
-  when: war_local_build is not defined and tomcat_deploy_from_url | default(false)
+  when:
+    - war_local_build is not defined
+    - tomcat_deploy_from_url | default(false)
+  notify:
+    - restart tomcat
 
 - name: download from maven repo {{ war_url }}
   maven_artifact:
@@ -76,7 +80,9 @@
     owner: "{{ tomcat_user }}"
     group: "{{ tomcat_user }}"
     verify_checksum: always
-  when: war_local_build is not defined and not tomcat_deploy_from_url | default(false)
+  when:
+    - war_local_build is not defined
+    - not tomcat_deploy_from_url | default(false)
   notify:
     - restart tomcat