diff --git a/smartgears/is_exporter_se_plugin/defaults/main.yml b/smartgears/is_exporter_se_plugin/defaults/main.yml index 11ef964..c252db1 100644 --- a/smartgears/is_exporter_se_plugin/defaults/main.yml +++ b/smartgears/is_exporter_se_plugin/defaults/main.yml @@ -1,5 +1,10 @@ --- is_exporter_se_plugin_install: False -is_exporter_se_plugin_ver: 1.0.0-4.5.0-XXXXX -is_exporter_se_plugin_name: 'is-exporter-se-plugin-{{ is_exporter_se_plugin_ver }}-jar-with-dependencies.jar' -is_exporter_se_plugin_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/information-system/is-exporter-se-plugin/{{ is_exporter_se_plugin_ver }}/{{ is_exporter_se_plugin_name }}' +is_exporter_se_plugin_upgrade: False +is_exporter_se_plugin_ver: LATEST + +is_exporter_se_plugin_group_id: 'org.gcube.information-system' +is_exporter_se_plugin_name: 'is-exporter-se-plugin' +is_exporter_se_plugin_extension: 'jar' +is_exporter_se_plugin_classifier: 'jar-with-dependencies' +is_exporter_se_plugin_file: '{{ is_exporter_se_plugin_name }}-{{ is_exporter_se_plugin_version }}-jar-with-dependencies.{{ is_exporter_se_plugin_extension }}' diff --git a/smartgears/is_exporter_se_plugin/handlers/main.yml b/smartgears/is_exporter_se_plugin/handlers/main.yml deleted file mode 100644 index a9b4ffd..0000000 --- a/smartgears/is_exporter_se_plugin/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Restart smartgears - service: name='tomcat-instance-{{ smartgears_http_port }}' state=restarted diff --git a/smartgears/is_exporter_se_plugin/tasks/main.yml b/smartgears/is_exporter_se_plugin/tasks/main.yml index 2719c05..d8b8a99 100644 --- a/smartgears/is_exporter_se_plugin/tasks/main.yml +++ b/smartgears/is_exporter_se_plugin/tasks/main.yml @@ -1,15 +1,14 @@ --- -- name: Remove the old is-exporter plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/is-exporter-se-plugin-*-jar-with-dependencies.jar - when: is_exporter_se_plugin_upgrade - tags: [ 'smartgears', 'is_exporter_se', 'tomcat' ] - - -- name: Get the is-exporter se plugin and install it inside the smart executor +- block: + - name: Remove the old is-exporter plugin + shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/is-exporter-se-plugin-*-jar-with-dependencies.jar + when: is_exporter_se_plugin_upgrade + + - name: Install the is-exporter plugin inside the smart executor lib directory + maven_artifact: artifact_id={{ is_exporter_se_plugin_name }} version={{ is_exporter_se_plugin_version | default(omit) }} group_id={{ is_exporter_se_plugin_group_id }} extension={{ is_exporter_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ is_exporter_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ is_exporter_se_plugin_file }} + notify: Restart smartgears + become: True become_user: '{{ smartgears_user }}' - get_url: url={{ is_exporter_se_plugin_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib when: is_exporter_se_plugin_install - notify: Restart smartgears - tags: [ 'smartgears', 'is_exporter_se', 'tomcat' ] - + tags: [ 'smartgears', 'is_exporter_se', 'tomcat' ] \ No newline at end of file diff --git a/smartgears/is_sweeper_se_plugin/defaults/main.yml b/smartgears/is_sweeper_se_plugin/defaults/main.yml index ea27f6c..147ffc3 100644 --- a/smartgears/is_sweeper_se_plugin/defaults/main.yml +++ b/smartgears/is_sweeper_se_plugin/defaults/main.yml @@ -1,5 +1,10 @@ --- is_sweeper_se_plugin_install: False -is_sweeper_se_plugin_ver: 1.0.0-4.0.0-128833 -is_sweeper_se_plugin_name: 'is-sweeper-se-plugin-{{ is_sweeper_se_plugin_ver }}-jar-with-dependencies.jar' -is_sweeper_se_plugin_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/information-system/is-sweeper-se-plugin/{{ is_sweeper_se_plugin_ver }}/{{ is_sweeper_se_plugin_name }}' +is_sweeper_se_plugin_upgrade: False +is_sweeper_se_plugin_ver: LATEST + +is_sweeper_se_plugin_group_id: 'org.gcube.information-system' +is_sweeper_se_plugin_name: 'is-sweeper-se-plugin' +is_sweeper_se_plugin_extension: 'jar' +is_sweeper_se_plugin_classifier: 'jar-with-dependencies' +is_sweeper_se_plugin_file: '{{ is_sweeper_se_plugin_name }}-{{ is_sweeper_se_plugin_version }}-jar-with-dependencies.{{ is_sweeper_se_plugin_extension }}' diff --git a/smartgears/is_sweeper_se_plugin/handlers/main.yml b/smartgears/is_sweeper_se_plugin/handlers/main.yml deleted file mode 100644 index a9b4ffd..0000000 --- a/smartgears/is_sweeper_se_plugin/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Restart smartgears - service: name='tomcat-instance-{{ smartgears_http_port }}' state=restarted diff --git a/smartgears/is_sweeper_se_plugin/tasks/main.yml b/smartgears/is_sweeper_se_plugin/tasks/main.yml index e06ef09..91ef6ac 100644 --- a/smartgears/is_sweeper_se_plugin/tasks/main.yml +++ b/smartgears/is_sweeper_se_plugin/tasks/main.yml @@ -1,15 +1,15 @@ --- -- name: Remove the old is-sweeper plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/is-sweeper-se-plugin-*-jar-with-dependencies.jar - when: is_sweeper_se_plugin_upgrade - tags: [ 'smartgears', 'is_sweeper_se', 'tomcat' ] - - -- name: Get the is-sweeper se plugin and install it inside the smart executor +- block: + - name: Remove the old is-sweeper plugin + shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/is-sweeper-se-plugin-*-jar-with-dependencies.jar + when: is_sweeper_se_plugin_upgrade + + - name: Install the is-sweeper plugin inside the smart executor lib directory + maven_artifact: artifact_id={{ is_sweeper_se_plugin_name }} version={{ is_sweeper_se_plugin_version | default(omit) }} group_id={{ is_sweeper_se_plugin_group_id }} extension={{ is_sweeper_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ is_sweeper_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ is_sweeper_se_plugin_file }} + notify: Restart smartgears + become: True become_user: '{{ smartgears_user }}' - get_url: url={{ is_sweeper_se_plugin_url }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib when: is_sweeper_se_plugin_install - notify: Restart smartgears tags: [ 'smartgears', 'is_sweeper_se', 'tomcat' ]