tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

../library/roles/smartgears/dm_pool_manager/defaults/main.yml update service version 

../library/roles/smartgears/dm_pool_manager/tasks/main.yml remove web.xml template task
../library/roles/smartgears/dm_pool_manager/templates/service.properties.j2 update template
This commit is contained in:
Roberto Cirillo 2017-10-06 12:36:32 +02:00
parent d8ffa8198b
commit 096b600d98
3 changed files with 23 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smartgears/dm_pool_manager/defaults/main.yml
View File

@ -1,15 +1,15 @@
--- ---
dm_pool_manager_install: False dm_pool_manager_install: False
dm_pool_manager_upgrade: False dm_pool_manager_upgrade: False
dm_pool_manager_version: 2.0.0-4.6.1-152903 dm_pool_manager_version: 2.1.0-4.7.0-154856
dm_pool_manager_name: dataminer-pool-manager dm_pool_manager_name: dataminer-pool-manager
dm_pool_manager_group_id: org.gcube.dataAnalysis dm_pool_manager_group_id: org.gcube.dataAnalysis
dm_pool_manager_extension: war dm_pool_manager_extension: war
dm_pool_manager_file: '{{ dm_pool_manager_name }}-{{ dm_pool_manager_version }}.{{ dm_pool_manager_extension }}' dm_pool_manager_file: '{{ dm_pool_manager_name }}-{{ dm_pool_manager_version }}.{{ dm_pool_manager_extension }}'
dm_pool_prod_ghost_instance: 'PROTO_PROD_STAGING_HOST: dataminer-proto-ghost.d4science.org' dm_pool_prod_ghost_instance: 'dataminer-proto-ghost.d4science.org'
dm_pool_dev_ghost_instance: 'DEV_STAGING_HOST: dataminer1-devnext.d4science.org' dm_pool_dev_ghost_instance: 'dataminer-ghost-d.dev.d4science.org'
dm_pool_manager_pkgs: dm_pool_manager_pkgs:
- subversion - subversion

4
smartgears/dm_pool_manager/tasks/main.yml
View File

@ -28,8 +28,8 @@
unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dm_pool_manager_file }} dest={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} creates={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }}/WEB-INF/lib unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ dm_pool_manager_file }} dest={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} creates={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }}/WEB-INF/lib
notify: Restart smartgears notify: Restart smartgears
- name: Install the dm-pool-manager web.xml template # - name: Install the dm-pool-manager web.xml template
template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/dataminer-pool-manager/WEB-INF/web.xml mode=0440 # template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/dataminer-pool-manager/WEB-INF/web.xml mode=0440
- name: Ensures conf dir exists - name: Ensures conf dir exists
file: path={{ item.user_home }}/dataminer-pool-manager/dpmConfig state=directory recurse=true file: path={{ item.user_home }}/dataminer-pool-manager/dpmConfig state=directory recurse=true

103
smartgears/dm_pool_manager/templates/service.properties.j2
View File

@ -1,93 +1,26 @@
#YML node file #YML node file
{% if prod_instance %} SVN_REPO = https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/
{{ dm_pool_prod_ghost_instance }}
{% else %}
{{ dm_pool_dev_ghost_instance }}
{% endif %}
SVN_REPO: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/RConfiguration/RPackagesManagement/
#HAPROXY_CSV: http://data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0
svn.repository = https://svn.d4science.research-infrastructures.eu/gcube svn.repository = https://svn.d4science.research-infrastructures.eu/gcube
svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms
#STAGE
{% if prod_instance %}
STAGE_GHOST={{ dm_pool_prod_ghost_instance }}
{% else %}
STAGE_GHOST={{ dm_pool_dev_ghost_instance }}
{% endif %}
svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms
svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.stage.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.stage.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.stage.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.stage.deps-java =
svn.stage.deps-knime-workflow =
svn.stage.deps-octave =
svn.stage.deps-python =
svn.stage.deps-windows-compiled =*
svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms #PROD
svn.rproto.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.rproto.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.rproto.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.rproto.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.rproto.deps-java =
svn.rproto.deps-knime-workflow =
svn.rproto.deps-octave =
svn.rproto.deps-python =
svn.rproto.deps-windows-compiled =
svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms
svn.prod.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.prod.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.prod.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.prod.deps-java =
svn.prod.deps-knime-workflow =
svn.prod.deps-octave =
svn.prod.deps-python =
svn.prod.deps-windows-compiled =
svn.dev.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/algorithms
svn.dev.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.dev.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt
svn.dev.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.dev.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt
svn.dev.deps-java =
svn.dev.deps-knime-workflow =
svn.dev.deps-octave =
svn.dev.deps-python =
svn.dev.deps-windows-compiled =