blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-13 16:33:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

DCD-1020: We need a JRE symlink too.

Browse Source
This commit is contained in:
Steve Smith
2020-08-21 13:56:13 +10:00
parent 43996fffcd
commit d22c0222ed
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
group_vars/aws_node_local.yml
View File

@@ -35,9 +35,12 @@ atl_product_installation_current: "{{ atl_product_installation_base }}/current"
atl_installer_temp: "{{ atl_installation_base }}/tmp" atl_installer_temp: "{{ atl_installation_base }}/tmp"
# NOTE: If using the non-installer java we expect to have the full JDK # NOTE: If using the non-installer java we expect to have the full JDK
# installed and linked to `/usr/lib/jvm/java`, usually via `alternatives`. # installed and linked to `/usr/lib/jvm/java` and # `/usr/lib/jvm/jre`.
# See product_common/task/ubuntu.yml for an example of apropriate
# linking using `alternatives`.
atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}" atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
atl_java_binary: "{{ atl_java_home }}/bin/java" atl_jre_home: "{{ '/usr/lib/jvm/jre' if atl_use_system_jdk else atl_java_home }}"
atl_java_binary: "{{ atl_jre_home }}/bin/java"
atl_product_logs_default: &logs_default atl_product_logs_default: &logs_default
- path: "{{ atl_product_installation_current }}/logs/*" - path: "{{ atl_product_installation_current }}/logs/*"

9
roles/product_common/tasks/ubuntu.yml
View File

@@ -8,13 +8,20 @@
name: name:
- openjdk-{{ java_major_version }}-jdk-headless - openjdk-{{ java_major_version }}-jdk-headless
- name: Ensure common symlink exists - name: Ensure common JDK symlink exists
alternatives: alternatives:
link: "/usr/lib/jvm/java" link: "/usr/lib/jvm/java"
name: "java_sdk" name: "java_sdk"
path: "/usr/lib/jvm/java-8-openjdk-amd64" path: "/usr/lib/jvm/java-8-openjdk-amd64"
priority: 99 priority: 99
- name: Ensure common JRE symlink exists
alternatives:
link: "/usr/lib/jvm/jre"
name: "jre"
path: "/usr/lib/jvm/java-8-openjdk-amd64/jre"
priority: 99
when: atl_use_system_jdk when: atl_use_system_jdk
tags: tags:
- runtime_pkg - runtime_pkg