From aa1dbe8f2199c5f416b9e608a0562013eb44052e Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 11 Oct 2017 18:01:59 +0200 Subject: [PATCH] generic_worker: fix some typos. --- smartgears/generic_worker/defaults/main.yml | 8 +++----- smartgears/generic_worker/tasks/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/smartgears/generic_worker/defaults/main.yml b/smartgears/generic_worker/defaults/main.yml index d4d70eea..8cfe45ab 100644 --- a/smartgears/generic_worker/defaults/main.yml +++ b/smartgears/generic_worker/defaults/main.yml @@ -1,11 +1,9 @@ --- generic_worker_install: False - smart_generic_worker_plugin_name: 'smart-generic-worker' - -smart_generic_worker_plugin_group_id : 'org.gcube.dataanalysis' -smart_generic_worker_plugin_artifact_id : '{{ smart_generic_worker_plugin_name }}' -smart_generic_worker_plugin_version : latest +smart_generic_worker_plugin_group_id: 'org.gcube.dataanalysis' +smart_generic_worker_plugin_artifact_id: '{{ smart_generic_worker_plugin_name }}' +smart_generic_worker_plugin_version: latest smart_generic_worker_plugin_extension: jar smart_generic_worker_plugin_classifier: jar-with-dependencies smart_generic_worker_plugin_file: '{{ smart_generic_worker_plugin_name }}-{{ smart_generic_worker_plugin_version }}-jar-with-dependencies.{{ smart_generic_worker_plugin_extension }}' diff --git a/smartgears/generic_worker/tasks/main.yml b/smartgears/generic_worker/tasks/main.yml index e391cb5f..5e043a85 100644 --- a/smartgears/generic_worker/tasks/main.yml +++ b/smartgears/generic_worker/tasks/main.yml @@ -12,11 +12,11 @@ - block: - name: Get the smart generic worker plugin and install it inside the smart executor maven_artifact: artifact_id={{ smart_generic_worker_plugin_name }} version={{ smart_generic_worker_plugin_version | default('latest') }} group_id={{ smart_generic_worker_plugin_group_id }} extension={{ smart_generic_worker_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ smart_generic_worker_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ smart_generic_worker_plugin_file }} - register: smart_executor_download + register: generic_worker_download - name: Remove the old accounting aggregator plugin shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ smart_generic_worker_plugin_name }}-*-jar-with-dependencies.jar - when: (smart_executor_download | changed) + when: (generic_worker_download | changed) - name: Copy the accounting aggregator plugin to its final destination copy: src={{ smartgears_downloads_dir }}/{{ smart_generic_worker_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ smart_generic_worker_plugin_file }} remote_src=yes force=yes