Merge pull request 'replace extension version with variable #25248' (!2) from feature/25248 into master

Reviewed-on: #2

defaults/main.yml

@@ -39,4 +39,5 @@ geoserver_geopackage_extension: false
 geoserver_wps_extension_url: "https://downloads.sourceforge.net/project/geoserver/GeoServer/{{ geoserver_version }}/extensions/geoserver-{{ geoserver_version }}-wps-plugin.zip?ts=gAAAAABkC1uIJnitncxRQD3elbw9wx1nPnrT15OLpG75Hh6D3i3RO1AL66hBcCS9IxNdS_wHnzheIszsYYOyUU6YMiQibCFgBw%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fgeoserver%2Ffiles%2FGeoServer%2F{{ geoserver_version }}%2Fextensions%2Fgeoserver-{{ geoserver_version }}-wps-plugin.zip%2Fdownload"
 
 geoserver_crosslayer_extension: false
-geoserver_querylayer_extension_url: "https://sourceforge.net/projects/geoserver/files/GeoServer/2.10.5/extensions/geoserver-{{ geoserver_version }}-querylayer-plugin.zip/download"
+geoserver_crosslayer_version: '{{ geoserver_version }}'
+geoserver_querylayer_extension_url: "https://sourceforge.net/projects/geoserver/files/GeoServer/{{ geoserver_crosslayer_version }}/extensions/geoserver-{{ geoserver_crosslayer_version }}-querylayer-plugin.zip/download"

tasks/cross-layer-filtering.yml

@@ -6,7 +6,7 @@
     when: ansible_distribution_release == "trusty"
 
   - name: Download and unpack the Geoserver crossfilter extension
-    unarchive: copy=no src={{ geoserver_querylayer_extension_url }} dest={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/ creates={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-2.10.5.jar owner={{ item.user }} group={{ item.user }}
+    unarchive: copy=no src={{ geoserver_querylayer_extension_url }} dest={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/ creates={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-{{ geoserver_crosslayer_version }}.jar owner={{ item.user }} group={{ item.user }}
     with_items: '{{ tomcat_m_instances }}'
     notify: tomcat multiple-instances restart
 
@@ -18,7 +18,7 @@
   tags: [ 'geoserver', 'geoserver_crosslayer' ]
 - block:
     - name: Remove the crossfilter extension if not needed
-      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-2.10.5.jar state=absent
+      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-{{ geoserver_crosslayer_version }}.jar state=absent
       with_items: '{{ tomcat_m_instances }}'
 
   when: not geoserver_crosslayer_extension