You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2022/07/27 13:35:22 UTC

[airavata] 05/10: AIRAVATA-3609 fix installing Java for Keycloak

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit bb1366355e11903e9b18f1a4316c371b358c4af4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 30 16:10:47 2022 -0400

    AIRAVATA-3609 fix installing Java for Keycloak
---
 dev-tools/ansible/keycloak.yml                     |  1 -
 dev-tools/ansible/roles/java/vars/main.yml         |  2 +-
 dev-tools/ansible/roles/keycloak/defaults/main.yml |  1 +
 dev-tools/ansible/roles/keycloak/tasks/main.yml    | 21 +++++++++++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dev-tools/ansible/keycloak.yml b/dev-tools/ansible/keycloak.yml
index 8cca98b762..440def0488 100644
--- a/dev-tools/ansible/keycloak.yml
+++ b/dev-tools/ansible/keycloak.yml
@@ -23,7 +23,6 @@
   tags: keycloak
   roles:
     - env_setup
-    - java
     - letsencrypt
     - keycloak
 
diff --git a/dev-tools/ansible/roles/java/vars/main.yml b/dev-tools/ansible/roles/java/vars/main.yml
index 107bd61995..cd3e1fda7b 100644
--- a/dev-tools/ansible/roles/java/vars/main.yml
+++ b/dev-tools/ansible/roles/java/vars/main.yml
@@ -22,5 +22,5 @@
 #Variables associated with this role
 
 java_home: "/usr/lib/jvm/java-11"
-openjdk_version: "java-11-openjdk-devel-11.0.11.0.9"
+openjdk_version: "java-11-openjdk-devel"
 ...
diff --git a/dev-tools/ansible/roles/keycloak/defaults/main.yml b/dev-tools/ansible/roles/keycloak/defaults/main.yml
index d94bfe713a..a6d0d6bf82 100644
--- a/dev-tools/ansible/roles/keycloak/defaults/main.yml
+++ b/dev-tools/ansible/roles/keycloak/defaults/main.yml
@@ -30,6 +30,7 @@ mysql_db_connector_download_url: "https://dev.mysql.com/get/Downloads/Connector-
 keycloak_master_account_username: "username"
 keycloak_master_account_password: "password"
 # keycloak_server_port: "443"
+keycloak_java_home: /usr/lib/jvm/java-1.8.0
 
 keycloak_db_host: "localhost"
 keycloak_db_port: "3306"
diff --git a/dev-tools/ansible/roles/keycloak/tasks/main.yml b/dev-tools/ansible/roles/keycloak/tasks/main.yml
index bf79733519..78764959c5 100644
--- a/dev-tools/ansible/roles/keycloak/tasks/main.yml
+++ b/dev-tools/ansible/roles/keycloak/tasks/main.yml
@@ -23,6 +23,27 @@
   yum: name="httpd" state=latest update_cache=yes
   become: yes
 
+- name: Install java
+  yum: name="java-1.8.0-openjdk-devel" state=present update_cache=yes
+  become: yes
+  tags:
+    - always
+
+# NOTE: If you see a file not found error, try running rm /var/lib/alternatives/{{ item.exe }} in the target machine
+- name: set {{ keycloak_java_home }} as default
+  alternatives:
+    name="{{ item.exe }}"
+    link="/usr/bin/{{ item.exe }}"
+    path="{{ item.path }}/{{ item.exe }}"
+  with_items:
+    - { path: "{{ keycloak_java_home }}/bin", exe: 'java' }
+    - { path: "{{ keycloak_java_home }}/bin", exe: 'keytool' }
+    - { path: "{{ keycloak_java_home }}/bin", exe: 'javac' }
+    - { path: "{{ keycloak_java_home }}/bin", exe: 'javadoc' }
+  become: yes
+  tags:
+       - always
+
 - name: set selinux to permissive
   selinux: state=permissive policy=targeted
   become: yes