From 8e536a431fb8dfc863fcf80abd687f3becb4061d Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 24 Nov 2017 13:24:24 +0100 Subject: [PATCH] accounting_rstudio_se_plugin: Use 'latest' as package version and fix some wrong variables names. --- smartgears/accounting_rstudio_se_plugin/defaults/main.yml | 2 +- smartgears/accounting_rstudio_se_plugin/tasks/main.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/smartgears/accounting_rstudio_se_plugin/defaults/main.yml b/smartgears/accounting_rstudio_se_plugin/defaults/main.yml index ec556e55..70fd4ab8 100644 --- a/smartgears/accounting_rstudio_se_plugin/defaults/main.yml +++ b/smartgears/accounting_rstudio_se_plugin/defaults/main.yml @@ -2,7 +2,7 @@ accounting_insert_rstudio_se_plugin_install: False accounting_insert_rstudio_se_plugin_name: accounting-insert-rstudio-se-plugin -accounting_insert_rstudio_se_plugin_version: '1.0.0-4.4.0-142716' +accounting_insert_rstudio_se_plugin_version: 'latest' accounting_insert_rstudio_se_plugin_group_id: 'org.gcube.accounting' accounting_insert_rstudio_se_plugin_artifact_id: accounting-insert-rstudio-se-plugin accounting_insert_rstudio_se_plugin_extension: jar diff --git a/smartgears/accounting_rstudio_se_plugin/tasks/main.yml b/smartgears/accounting_rstudio_se_plugin/tasks/main.yml index c6d73fa9..8817e633 100644 --- a/smartgears/accounting_rstudio_se_plugin/tasks/main.yml +++ b/smartgears/accounting_rstudio_se_plugin/tasks/main.yml @@ -1,7 +1,7 @@ --- - block: - name: Remove the old accounting insert storage plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_maven_artifact_id }}-*-jar-with-dependencies.jar + shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_artifact_id }}-*-{{ accounting_insert_rstudio_se_plugin_classifier }}.{{ accounting_insert_rstudio_se_plugin_extension }} notify: Restart smartgears - name: Disable the cron job that calculates the home used space @@ -18,7 +18,7 @@ register: accounting_insert_rstudio_download - name: Remove the old accounting insert storage plugin - shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_maven_artifact_id }}-*-jar-with-dependencies.jar + shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ accounting_insert_rstudio_se_plugin_artifact_id }}-*-{{ accounting_insert_rstudio_se_plugin_classifier }}.{{ accounting_insert_rstudio_se_plugin_extension }} when: (accounting_insert_rstudio_download | changed) - name: Copy the accounting aggregator plugin to its final destination @@ -30,6 +30,7 @@ template: src=calculate_home_space.j2 dest=/usr/local/bin/calculate_home_space mode=0755 owner=root group=root - name: Install a cron job that calculates the home used space + become_user: root cron: name="Calculate the home used space" special_time=hourly user=root job="/usr/local/bin/calculate_home_space >/dev/null 2>&1" become: True