diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml index ae9dd9d1..73486401 100644 --- a/smartgears/dm_pool_manager/defaults/main.yml +++ b/smartgears/dm_pool_manager/defaults/main.yml @@ -8,3 +8,9 @@ dm_pool_manager_group_id: org.gcube.dataAnalysis dm_pool_manager_extension: war 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_dev_ghost_instance: 'DEV_STAGING_HOST: dataminer1-devnext.d4science.org' +dm_pool_manager_pkgs: + - subversion + + diff --git a/smartgears/dm_pool_manager/tasks/main.yml b/smartgears/dm_pool_manager/tasks/main.yml index c31a8709..e3860ebf 100644 --- a/smartgears/dm_pool_manager/tasks/main.yml +++ b/smartgears/dm_pool_manager/tasks/main.yml @@ -13,18 +13,23 @@ - name: Unarchive the dm_pool_manager war unarchive: copy=no src={{ smartgears_user_home }}/{{ 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 + + - name: Ensures conf dir exists + file: path={{ item.user_home }}/dataminer-pool-manager/dpmConfig state=directory recurse=true + with_items: '{{ tomcat_m_instances }}' + + - name: Install the additional service default file + template: src=service.properties.j2 dest={{ item.user_home }}/dataminer-pool-manager/dpmConfig/service.properties mode=0444 + with_items: '{{ tomcat_m_instances }}' notify: Restart smartgears + - name: Install the packages required to dm-pool-manager-service + become_user: root + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 + with_items: '{{ dm_pool_manager_pkgs }}' + + become: True become_user: '{{ d4science_user }}' when: dm_pool_manager_install tags: [ 'smartgears', 'dm_pool_manager', 'tomcat' ] - -- block: - - name: Remove the old sdi files - file: path={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} state=absent - - become: True - become_user: '{{ d4science_user }}' - when: not dm_pool_manager_install - tags: [ 'smartgears', 'dm_pool_manager', 'tomcat' ]