From a5d1babc0b863cb4ea87d7f3f70a3c9e39533b57 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 4 Apr 2018 20:21:09 +0200 Subject: [PATCH 1/4] Add a new local repository, with some Trusty backports. --- ubuntu-deb-general/tasks/packages.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml index a0b129da..ef143735 100644 --- a/ubuntu-deb-general/tasks/packages.yml +++ b/ubuntu-deb-general/tasks/packages.yml @@ -79,6 +79,14 @@ ignore_errors: True tags: packages +- name: Setup the infrascience trusty repository + apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/trusty-infrascience {{ ansible_distribution_release }} main' update_cache=yes + when: + - is_trusty + - infrascience_internal_ppa + ignore_errors: True + tags: packages + - name: install common packages apt: pkg={{ item }} state={{ pkg_state }} with_items: '{{ common_packages }}' From 90850eefa67fa8736091f476cc4c926700886bcf Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 4 Apr 2018 20:21:53 +0200 Subject: [PATCH 2/4] Role that add our internal trusty repository and installs newer hdf5 library and tools. --- hdf5/defaults/main.yml | 9 +++++++++ hdf5/tasks/main.yml | 13 +++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 hdf5/defaults/main.yml create mode 100644 hdf5/tasks/main.yml diff --git a/hdf5/defaults/main.yml b/hdf5/defaults/main.yml new file mode 100644 index 00000000..3ed9d9c0 --- /dev/null +++ b/hdf5/defaults/main.yml @@ -0,0 +1,9 @@ +--- +hdf5_install: True +hdf5_pkg_state: latest + +hdf5_pkgs_list: + - hdf5-tools + - hdf5-helpers + - libhdf5-10 + - libhdf5-dev diff --git a/hdf5/tasks/main.yml b/hdf5/tasks/main.yml new file mode 100644 index 00000000..e865c1f8 --- /dev/null +++ b/hdf5/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- block: + - name: apt key for the internal ppa repository + apt_key: url=http://ppa.research-infrastructures.eu/system/keys/system-archive.asc state=present + + - name: Setup the infrascience trusty repository + apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/trusty-infrascience {{ ansible_distribution_release }} main' update_cache=yes + + - name: Install the hdf5 packages + apt: pkg={{ item }} state={{ hdf5_pkg_state }} update_cache=yes cache_valid_time=3600 + with_items: '{{ hdf5_pkgs_list }}' + + tags: [ 'hdf5' ] \ No newline at end of file From d9dfa8ef2312baf5083b19958f5935d88bcfc305 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 4 Apr 2018 20:22:23 +0200 Subject: [PATCH 3/4] dataminer: the dependency roles are now conditional. --- smartgears/dataminer_app/defaults/main.yml | 3 +++ smartgears/dataminer_app/meta/main.yml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index 55fe0040..59985936 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -34,6 +34,9 @@ dataminer_algorithms_updater_hour_frequency: "*" dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc' +dataminer_conda_install: True +dataminer_hdf5: False + # dev, prod, preprod dataminer_infra_reference: dev diff --git a/smartgears/dataminer_app/meta/main.yml b/smartgears/dataminer_app/meta/main.yml index be64f21b..a1e4dc58 100644 --- a/smartgears/dataminer_app/meta/main.yml +++ b/smartgears/dataminer_app/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - - role: '../../library/roles/conda' + - { role: ../../library/roles/conda, when: dataminer_conda_install } + - { role: ../../library/roles/hdf5, when: dataminer_hdf5 } From c319a2ca897c67b5891698726297433e8b449d02 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 5 Apr 2018 14:50:32 +0200 Subject: [PATCH 4/4] Basic role that installs the smaph catalina context. --- smaph/defaults/main.yml | 3 +++ smaph/tasks/main.yml | 6 ++++++ smaph/templates/catalina-smaph.xml.j2 | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 smaph/defaults/main.yml create mode 100644 smaph/tasks/main.yml create mode 100644 smaph/templates/catalina-smaph.xml.j2 diff --git a/smaph/defaults/main.yml b/smaph/defaults/main.yml new file mode 100644 index 00000000..f29a89f5 --- /dev/null +++ b/smaph/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# smaph_service_token: Use a vault file +smaph_db_base_dir: /var/lib/smaph_data diff --git a/smaph/tasks/main.yml b/smaph/tasks/main.yml new file mode 100644 index 00000000..87b963df --- /dev/null +++ b/smaph/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- block: + - name: Install the catalina configuration needed by smaph + template: src=catalina-smaph.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/smaph.xml + + tags: [ 'smaph', 'tomcat' ] \ No newline at end of file diff --git a/smaph/templates/catalina-smaph.xml.j2 b/smaph/templates/catalina-smaph.xml.j2 new file mode 100644 index 00000000..dbec3ad8 --- /dev/null +++ b/smaph/templates/catalina-smaph.xml.j2 @@ -0,0 +1,9 @@ + + + + WEB-INF/web.xml + + + + +