group_vars/dataminer_prototypes_ghost/dataminer_prototypes_ghost.yml added new scopes

group_vars/dm_pool_manager_proto/dm_pool_manager_proto.yml added new scopes
	   group_vars/smartgears_workspace/smartgears_workspace.yml added appender
	   ../library/roles/ansible_ppa/tasks/ansible-packages.yml added some cache options to ansible package task
	   ../library/roles/smartgears/dm_pool_manager/defaults/main.yml upgrade service version
	   ../library/roles/smartgears/dm_pool_manager/tasks/main.yml commented task for installing service.properties file
	   ../library/roles/smartgears/home_library/defaults/main.yml upgrade version
	   ../library/roles/smartgears/smartgears/defaults/main.yml upgrade version
	   ../library/roles/smartgears/tabular_data/defaults/main.yml upgrade version

Merge branch 'master' of gitorious.research-infrastructures.eu:infrastructure-management/ansible-playbooks
This commit is contained in:
Roberto Cirillo 2017-11-09 18:41:55 +01:00
commit 253de6b3b2
5 changed files with 42 additions and 5 deletions

View File

@ -0,0 +1,17 @@
---
- block:
- name: Install the catalina webapp configurations
template: src=catalina-app-conf.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml
with_items: '{{ catalina_apps_conf }}'
when: ( item.state | default(True) )
- name: Remove the catalina webapp configurations
file: dest={{ smartgears_instance_path }}/conf/Catalina/localhost/{{ item.app_name }}.xml state=absent
with_items: '{{ catalina_apps_conf }}'
when: ( not item.state | default(True) )
become: True
become_user: '{{ smartgears_user }}'
when: catalina_apps_conf is defined
tags: [ 'smartgears', 'tomcat', 'catalina_apps' ]

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context reloadable="true">
<Loader className="org.apache.catalina.loader.VirtualWebappLoader"
virtualClasspath="{{ smartgears_instance_path }}/webapps/{{ item.app_name }}/WEB-INF/lib/plugins/{{ item.plugin_name }}/*.jar"/>
</Context>

View File

@ -9,3 +9,5 @@ sis_geotk_dt_plugin_extension: jar
sis_geotk_dt_plugin_classifier: jar-with-dependencies sis_geotk_dt_plugin_classifier: jar-with-dependencies
sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-jar-with-dependencies.{{ sis_geotk_dt_plugin_extension }}' sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-jar-with-dependencies.{{ sis_geotk_dt_plugin_extension }}'
catalina_apps_conf:
- { app_name: '{{ data_trasfer_service_name }}', plugin_name: '{{ sis_geotk_dt_plugin_name }}' }

View File

@ -0,0 +1,4 @@
---
dependencies:
- role: '../library/roles/smartgears/catalina-app-conf'

View File

@ -1,7 +1,7 @@
--- ---
- block: - block:
- name: Remove the old Sis geotk data transfer plugin - name: Remove the old Sis geotk data transfer plugin
shell: rm -f {{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_name }}-*-jar-with-dependencies.jar file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent
become: True become: True
become_user: '{{ smartgears_user }}' become_user: '{{ smartgears_user }}'
@ -9,18 +9,25 @@
tags: [ 'smartgears', 'sis_geotk', 'tomcat' ] tags: [ 'smartgears', 'sis_geotk', 'tomcat' ]
- block: - block:
- name: Get the Sis geotk data transfer plugin and install it inside the smart executor - name: Create the plugin directory inside data transfer
file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=directory
- name: Get the Sis geotk data transfer plugin
maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version | default(omit) }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version | default(omit) }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }}
register: sis_geotk_download register: sis_geotk_download
- name: Remove the old Sis geotk data transfer plugin - name: Remove the old Sis geotk data transfer plugin
shell: rm -f {{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_name }}-*-jar-with-dependencies.jar file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent
when: (sis_geotk_download | changed) when: (sis_geotk_download | changed)
- name: Copy the Sis geotk data transfer plugin to its final destination - name: Copy the Sis geotk data transfer plugin to its final destination
copy: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/{{ sis_geotk_dt_plugin_file }} remote_src=yes force=yes copy: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/{{ sis_geotk_dt_plugin_file }} remote_src=yes
notify: Restart smartgears notify: Restart smartgears
- name: Unarchive the Sis geotk data transfer plugin to expose its libraries
unarchive: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/ copy=no
when: (sis_geotk_download | changed)
become: True become: True
become_user: '{{ smartgears_user }}' become_user: '{{ smartgears_user }}'
when: sis_geotk_dt_plugin_install when: sis_geotk_dt_plugin_install