From a66d1ecfeca6acf77e6aff18abb33f5b70c3f7c6 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 7 May 2019 17:04:58 +0200 Subject: [PATCH] removed tags smartgears and tomcat from service tasks --- smartgears/catalogue_ws/tasks/main.yml | 4 ++-- smartgears/dataminer_app/tasks/dataminer-app.yml | 12 ++++++------ smartgears/dm_pool_manager/tasks/main.yml | 6 +++--- smartgears/gcat/tasks/main.yml | 4 ++-- smartgears/grsf_publisher_ws/tasks/main.yml | 4 ++-- smartgears/perform_service/tasks/main.yml | 4 ++-- smartgears/r_connector/tasks/main.yml | 12 ++++++------ smartgears/sdi_service/tasks/main.yml | 4 ++-- smartgears/sdmx_datasource_service/tasks/main.yml | 4 ++-- .../social-networking-library-ws/tasks/main.yml | 6 +++--- smartgears/spd_service/tasks/main.yml | 4 ++-- smartgears/storage_hub/tasks/main.yml | 4 ++-- smartgears/tabular_data/tasks/main.yml | 4 ++-- smartgears/uri_resolver/tasks/main.yml | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/smartgears/catalogue_ws/tasks/main.yml b/smartgears/catalogue_ws/tasks/main.yml index bb595121..fcc81484 100644 --- a/smartgears/catalogue_ws/tasks/main.yml +++ b/smartgears/catalogue_ws/tasks/main.yml @@ -10,7 +10,7 @@ become: True become_user: '{{ d4science_user }}' when: not catalogue_ws_install - tags: [ 'smartgears', 'catalogue_ws', 'tomcat' ] + tags: [ 'catalogue_ws' ] - block: - name: Get the catalogue-ws @@ -28,5 +28,5 @@ become: True become_user: '{{ d4science_user }}' when: catalogue_ws_install - tags: [ 'smartgears', 'catalogue_ws', 'tomcat' ] + tags: [ 'catalogue_ws' ] diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index 08239849..f74fb650 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -19,30 +19,30 @@ - name: Install the dataminer web.xml template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/WEB-INF/web.xml notify: Restart smartgears - tags: [ 'tomcat', 'dataminer', 'wps', 'wps_webxml' ] + tags: [ 'dataminer', 'wps', 'wps_webxml' ] - name: Install the old properties files copy: src={{ item }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_wps_name }}/ecocfg/{{ item }} force=yes with_items: '{{ dataminer_properties_files }}' - tags: [ 'tomcat', 'dataminer', 'wps', 'wps_properties' ] + tags: [ 'dataminer', 'wps', 'wps_properties' ] - name: Install the script that fixes the WPS configuration become_user: "{{ d4science_ansible_become_user | default('root') }}" template: src=wps-config-fixer.j2 dest=/usr/local/bin/wps-config-fixer owner=root group=root mode=0555 with_items: '{{ tomcat_m_instances }}' - tags: [ 'tomcat', 'dataminer', 'wps', 'wps_config' ] + tags: [ 'dataminer', 'wps', 'wps_config' ] - name: Fix the WPS config file shell: /usr/local/bin/wps-config-fixer notify: Restart smartgears when: dataminer_updated is changed - tags: [ 'tomcat', 'dataminer', 'wps', 'wps_config' ] + tags: [ 'dataminer', 'wps', 'wps_config' ] - name: Force the fix of the WPS config file shell: /usr/local/bin/wps-config-fixer notify: Restart smartgears when: dataminer_force_reconfiguration is defined and dataminer_force_reconfiguration - tags: [ 'tomcat', 'dataminer', 'wps', 'wps_config' ] + tags: [ 'dataminer', 'wps', 'wps_config' ] - name: Remove the file that lists the installed algorithms, after an upgrade file: dest={{ smartgears_user_home }}/wps_algorithms_install_log/already_installed_algorithms.txt state=absent @@ -57,7 +57,7 @@ become: True become_user: '{{ smartgears_user }}' - tags: [ 'tomcat', 'dataminer', 'wps' ] + tags: [ 'dataminer', 'wps' ] - block: - name: Verify if R is installed diff --git a/smartgears/dm_pool_manager/tasks/main.yml b/smartgears/dm_pool_manager/tasks/main.yml index 69f7ab82..d359b047 100644 --- a/smartgears/dm_pool_manager/tasks/main.yml +++ b/smartgears/dm_pool_manager/tasks/main.yml @@ -10,7 +10,7 @@ become: True become_user: '{{ d4science_user }}' when: not dm_pool_manager_install - tags: [ 'smartgears', 'dm_pool_manager', 'tomcat' ] + tags: [ 'dm_pool_manager' ] - block: - name: Get the dm_pool_manager @@ -61,9 +61,9 @@ - name: First checkout from subversion subversion: repo={{ dm_pool_svn_url }} dest={{ smartgears_user_home }}/checkout checkout=yes force=yes update=yes username="{{ svn_user }}" password="{{ svn_pass }}" when: not dm_pool_manager_upgrade - tags: [ 'tomcat', 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] + tags: [ 'dataminer', 'wps', 'dataminer_algorithms', 'dataminer_algorithms_svn' ] become: True become_user: '{{ d4science_user }}' when: dm_pool_manager_install - tags: [ 'smartgears', 'dm_pool_manager', 'tomcat' ] + tags: [ 'dm_pool_manager' ] diff --git a/smartgears/gcat/tasks/main.yml b/smartgears/gcat/tasks/main.yml index d25b3462..bfbb8359 100644 --- a/smartgears/gcat/tasks/main.yml +++ b/smartgears/gcat/tasks/main.yml @@ -10,7 +10,7 @@ become: True become_user: '{{ d4science_user }}' when: not gcat_install - tags: [ 'smartgears', 'gcat', 'tomcat' ] + tags: [ 'gcat' ] - block: - name: Get the gcat war @@ -39,5 +39,5 @@ become: True become_user: '{{ d4science_user }}' when: gcat_install - tags: [ 'smartgears', 'gcat', 'tomcat' ] + tags: [ 'gcat' ] diff --git a/smartgears/grsf_publisher_ws/tasks/main.yml b/smartgears/grsf_publisher_ws/tasks/main.yml index 9b63b6fb..e85cf617 100644 --- a/smartgears/grsf_publisher_ws/tasks/main.yml +++ b/smartgears/grsf_publisher_ws/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_publisher_ws', 'tomcat' ] + tags: [ 'grsf_publisher_ws' ] when: not grsf_publisher_ws_install - block: @@ -28,5 +28,5 @@ become: True become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'grsf_publisher_ws', 'tomcat' ] + tags: [ 'grsf_publisher_ws' ] when: grsf_publisher_ws_install diff --git a/smartgears/perform_service/tasks/main.yml b/smartgears/perform_service/tasks/main.yml index edb05c81..f2077763 100644 --- a/smartgears/perform_service/tasks/main.yml +++ b/smartgears/perform_service/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' when: not perform_service_install - tags: [ 'smartgears', 'perform_service', 'tomcat' ] + tags: [ 'perform_service' ] - block: - name: Get the perform-service @@ -27,5 +27,5 @@ become: True become_user: '{{ d4science_user }}' when: perform_service_install - tags: [ 'smartgears', 'perform_service', 'tomcat' ] + tags: [ 'perform_service' ] diff --git a/smartgears/r_connector/tasks/main.yml b/smartgears/r_connector/tasks/main.yml index 8745864b..6ed05185 100644 --- a/smartgears/r_connector/tasks/main.yml +++ b/smartgears/r_connector/tasks/main.yml @@ -28,7 +28,7 @@ become: True become_user: '{{ smartgears_user }}' when: not r_connector_install - tags: [ 'smartgears', 'r_connector', 'tomcat' ] + tags: [ 'r_connector' ] - block: - name: Get the R Connector war @@ -69,17 +69,17 @@ - name: Install the script that unmounts the remote workspace become_user: root template: src=rconnector_unmount dest={{ r_connector_workspace_unmount }} owner=root group=root mode=0555 - tags: [ 'smartgears', 'r_connector', 'r_connector_conf', 'tomcat' ] + tags: [ 'r_connector', 'r_connector_conf' ] - name: Install the script that checks for stale workspace mounts become_user: root template: src=rconnector_check_stale_sessions dest={{ r_connector_check_stale_sessions }} owner=root group=root mode=0555 - tags: [ 'smartgears', 'r_connector', 'r_connector_conf', 'tomcat' ] + tags: [ 'r_connector', 'r_connector_conf' ] - name: Install the cron job that regulary wipes out the stale workspace mounts become_user: root cron: name="Unmount the stale workspace sessions" special_time=hourly job="{{ r_connector_check_stale_sessions }} >/dev/null 2>&1" user=root - tags: [ 'smartgears', 'r_connector', 'r_connector_conf', 'tomcat' ] + tags: [ 'r_connector', 'r_connector_conf' ] - name: Crete the directory that will host the RConfiguration stuff become_user: root @@ -95,7 +95,7 @@ - name: Install /etc/R/Rprofile.site as a symlink to the svn repository become_user: root file: src={{ r_connector_rprofile_path }}/.Rprofile dest=/etc/R/Rprofile.site state=link force=yes - tags: [ 'smartgears', 'r_connector', 'r_connector_conf', 'tomcat' ] + tags: [ 'r_connector', 'r_connector_conf' ] - name: Install the cron job that regulary updates the Rprofile cron: name="Update the RStudioConfiguration repo" special_time=daily job="cd {{ r_connector_rprofile_path }} ; svn update >/dev/null 2>&1" @@ -103,7 +103,7 @@ become: True become_user: '{{ smartgears_user }}' when: r_connector_install - tags: [ 'smartgears', 'r_connector', 'tomcat' ] + tags: [ 'r_connector' ] - block: # Additional fuse packages diff --git a/smartgears/sdi_service/tasks/main.yml b/smartgears/sdi_service/tasks/main.yml index 52033bdd..13c0c6e3 100644 --- a/smartgears/sdi_service/tasks/main.yml +++ b/smartgears/sdi_service/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' when: not sdi_service_install - tags: [ 'smartgears', 'sdi_service', 'tomcat' ] + tags: [ 'sdi_service' ] - block: - name: Get the sdi-service @@ -27,5 +27,5 @@ become: True become_user: '{{ d4science_user }}' when: sdi_service_install - tags: [ 'smartgears', 'sdi_service', 'tomcat' ] + tags: [ 'sdi_service' ] diff --git a/smartgears/sdmx_datasource_service/tasks/main.yml b/smartgears/sdmx_datasource_service/tasks/main.yml index 4886310f..21656935 100644 --- a/smartgears/sdmx_datasource_service/tasks/main.yml +++ b/smartgears/sdmx_datasource_service/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' when: not sdmx_datasource_service_install - tags: [ 'smartgears', 'sdmx_datasource_service', 'tomcat' ] + tags: [ 'sdmx_datasource_service' ] - block: - name: Get the sdmx_datasource-service @@ -27,5 +27,5 @@ become: True become_user: '{{ d4science_user }}' when: sdmx_datasource_service_install - tags: [ 'smartgears', 'sdmx_datasource_service', 'tomcat' ] + tags: [ 'sdmx_datasource_service' ] diff --git a/smartgears/social-networking-library-ws/tasks/main.yml b/smartgears/social-networking-library-ws/tasks/main.yml index 137fd769..4775e6a0 100644 --- a/smartgears/social-networking-library-ws/tasks/main.yml +++ b/smartgears/social-networking-library-ws/tasks/main.yml @@ -10,7 +10,7 @@ become: True become_user: '{{ d4science_user }}' when: not social_networking_library_ws_install - tags: [ 'smartgears', 'social_networking_library_ws', 'tomcat' ] + tags: [ 'social_networking_library_ws' ] - block: - name: Get the social-networking-library-ws war @@ -39,9 +39,9 @@ - name: Install the socialnetworking web.xml template: src=web.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ social_networking_library_ws_name }}/WEB-INF/web.xml notify: Restart smartgears - tags: [ 'social_networking_library_ws', 'socialnetworking_webxml', 'tomcat' ] + tags: [ 'social_networking_library_ws', 'socialnetworking_webxml' ] become: True become_user: '{{ d4science_user }}' when: social_networking_library_ws_install - tags: [ 'smartgears', 'social_networking_library_ws', 'tomcat' ] + tags: [ 'social_networking_library_ws' ] diff --git a/smartgears/spd_service/tasks/main.yml b/smartgears/spd_service/tasks/main.yml index 62064f67..1140daf6 100644 --- a/smartgears/spd_service/tasks/main.yml +++ b/smartgears/spd_service/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' when: not spd_service_install - tags: [ 'smartgears', 'spd_service', 'tomcat' ] + tags: [ 'spd_service' ] - block: - name: Get the spd-service @@ -27,5 +27,5 @@ become: True become_user: '{{ d4science_user }}' when: spd_service_install - tags: [ 'smartgears', 'spd_service', 'tomcat' ] + tags: [ 'spd_service' ] diff --git a/smartgears/storage_hub/tasks/main.yml b/smartgears/storage_hub/tasks/main.yml index 3d5024d5..b8b95589 100644 --- a/smartgears/storage_hub/tasks/main.yml +++ b/smartgears/storage_hub/tasks/main.yml @@ -12,7 +12,7 @@ become: True become_user: '{{ smartgears_user }}' when: not storage_hub_install - tags: [ 'smartgears', 'storage_hub', 'tomcat' ] + tags: [ 'storage_hub' ] - block: - maven_artifact: artifact_id={{ storage_hub_name }} version={{ storage_hub_version | default(omit) }} group_id={{ storage_hub_group_id }} extension={{ storage_hub_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ storage_hub_file }} verify_checksum=always @@ -66,5 +66,5 @@ become: True become_user: '{{ smartgears_user }}' when: storage_hub_install - tags: [ 'smartgears', 'storage_hub', 'tomcat' ] + tags: [ 'storage_hub' ] diff --git a/smartgears/tabular_data/tasks/main.yml b/smartgears/tabular_data/tasks/main.yml index eaead13a..078cb1f4 100644 --- a/smartgears/tabular_data/tasks/main.yml +++ b/smartgears/tabular_data/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' when: not tabular_data_install - tags: [ 'smartgears', 'tabular_data', 'tomcat' ] + tags: [ 'tabular_data' ] - block: - name: Get the tabular-data-service @@ -27,5 +27,5 @@ become: True become_user: '{{ d4science_user }}' when: tabular_data_install - tags: [ 'smartgears', 'tabular_data', 'tomcat' ] + tags: [ 'tabular_data' ] diff --git a/smartgears/uri_resolver/tasks/main.yml b/smartgears/uri_resolver/tasks/main.yml index 82421235..ebf7ac53 100644 --- a/smartgears/uri_resolver/tasks/main.yml +++ b/smartgears/uri_resolver/tasks/main.yml @@ -9,7 +9,7 @@ become: True become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'uri_resolver', 'tomcat' ] + tags: [ 'uri_resolver' ] when: not smartgears_uri_resolver_install - block: @@ -42,5 +42,5 @@ become: True become_user: '{{ d4science_user }}' - tags: [ 'smartgears', 'uri_resolver', 'tomcat' ] + tags: [ 'uri_resolver' ] when: smartgears_uri_resolver_install