From 65dbfd8beef316314fcf9e14be633fbb341da84d Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 2 May 2019 11:23:37 +0200 Subject: [PATCH] set_jdk_home: add the 'smartgears_conf' task, fix the block that checks for Oracle JDK. See https://support.d4science.org/issues/16607 --- smartgears/smartgears/tasks/set_jdk_home.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/smartgears/smartgears/tasks/set_jdk_home.yml b/smartgears/smartgears/tasks/set_jdk_home.yml index 698cfd8..a4c98f1 100644 --- a/smartgears/smartgears/tasks/set_jdk_home.yml +++ b/smartgears/smartgears/tasks/set_jdk_home.yml @@ -16,7 +16,7 @@ when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] + tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - block: - name: Are we using the Zulu OpenJDK? @@ -35,14 +35,13 @@ when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] + tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - block: - name: Are we using the Oracle JDK? stat: path: /usr/lib/jvm/java-{{ jdk_default }}-oracle register: jdk_java_home_path - when: openjdk_default is not defined - debug: msg: 'The jdk java home is {{ jdk_java_home_path.stat.path }}' @@ -54,10 +53,10 @@ when: jdk_java_home_path.stat.isdir is defined and jdk_java_home_path.stat.isdir when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] + tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ] - name: Fail if we are not able to set the jdk_java_home variable fail: msg: 'No valid JDK installation found, failing!' when: jdk_java_home is not defined - tags: [ 'smartgears', 'smartgears_distribution', 'tomcat' ] + tags: [ 'smartgears', 'smartgears_distribution', 'smartgears_conf', 'tomcat' ]