diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index 220ec705..099fe433 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -45,6 +45,11 @@ dataminer_ecocfg_parallelproc_svn_repo: 'http://svn.research-infrastructures.eu/ # Retrieve and modify in a template before each installation. dataminer_wps_config: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/wpscfg/wps_config.xml' +dataminer_configuration_jar: 'dataminer-algorithms.jar' +dataminer_configuration_jar_url: 'http://svn.d4science.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_configuration_jar }}' + +dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc' + # Those packages are needed to download and configure the dataminer application dataminer_additional_packages: - subversion diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index 1e996a30..b83d7d5d 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -98,7 +98,7 @@ - name: Install the gebco_08.nc file from thredds. It is big, mostly 2GB become: True become_user: '{{ smartgears_user }}' - get_url: url="http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc" dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/ecocfg/gebco_08.nc + get_url: url={{ dataminer_data_file_from_thredds }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/ecocfg/gebco_08.nc notify: Restart smartgears when: dataminer_app_install tags: [ 'tomcat', 'dataminer', 'wps' ] @@ -111,3 +111,11 @@ when: dataminer_app_install tags: [ 'tomcat', 'dataminer', 'wps' ] +- name: Download the dataminer config jar + become: True + become_user: '{{ smartgears_user }}' + subversion: repo={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/lib/{{ dataminer_configuration_jar }} force=yes + notify: Restart smartgears + when: dataminer_app_install + tags: [ 'tomcat', 'dataminer', 'wps' ] + diff --git a/smartgears/dataminer_app/templates/wps_config.xml.j2 b/smartgears/dataminer_app/templates/wps_config.xml.j2 index 32a743a6..c74258d4 100644 --- a/smartgears/dataminer_app/templates/wps_config.xml.j2 +++ b/smartgears/dataminer_app/templates/wps_config.xml.j2 @@ -137,7 +137,6 @@ org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.BIONYM org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.LWR org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.modellers.HSPEN -org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.CCAMLRGETSPECIES_TEST org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.ICCAT_VPA org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.generators.CMSY org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.modellers.FEED_FORWARD_ANN diff --git a/smartgears/smartgears/tasks/smartgears-app.yml b/smartgears/smartgears/tasks/smartgears-app.yml index 462a770f..c9b6868e 100644 --- a/smartgears/smartgears/tasks/smartgears-app.yml +++ b/smartgears/smartgears/tasks/smartgears-app.yml @@ -50,7 +50,7 @@ - name: Install the smartgears configuration file template: src=container.xml.j2 dest={{ smartgears_install_path }}/container.xml owner={{ item.user }} group={{ item.user }} with_items: '{{ tomcat_m_instances }}' - when: generic_worker_install is not defined + when: ( generic_worker_install is not defined ) or ( not generic_worker_install ) register: containerxml_state notify: Restart smartgears tags: [ 'smartgears', 'smartgears_conf', 'tomcat' ]