Skip to content

Commit a17f848

Browse files
author
Fran Tsao
committed
#120 Updated vars; #107 #114 added support to the latest OS major releases
1 parent 896e692 commit a17f848

9 files changed

+52
-17
lines changed

‎vars/CentOS-7.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22

3-
# OpenJDK implementation
4-
java_open_jdk_package: java-11-openjdk-headless
5-
java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-openjdk-{{ java_open_jdk_version }}-1.el7.x86_64
6-
# java-11-openjdk-11.0.3.7-0.el7_6.x86_64
3+
java_open_jdk_package: "java-{{ java_open_jdk_version_major }}-openjdk-headless"
4+
java_open_jdk_home_dir: "jre-{{ java_open_jdk_version_major }}"
75

86
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
9-
__java_open_jdk_version: "11.0.3.7"
10-
7+
__java_open_jdk_version_major: 11
8+
# Supported openjdk major releases: 1.6.0, 1.7.0, 1.8.0, 11
9+
#
1110
__java_required_repositories_openjdk: []
1211
__java_required_libs_openjdk: []

‎vars/CentOS-8.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
java_open_jdk_package: "java-{{ java_open_jdk_version_major }}-openjdk-headless"
4+
java_open_jdk_home_dir: "jre-{{ java_open_jdk_version_major }}"
5+
6+
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
7+
__java_open_jdk_version_major: 11
8+
# Supported openjdk major releases: 1.8.0, 11
9+
10+
__java_required_repositories_openjdk: []
11+
__java_required_libs_openjdk: []

‎vars/Debian-10.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
java_open_jdk_package: "openjdk-{{ java_open_jdk_version_major }}-jdk-headless"
4+
java_open_jdk_home_dir: "java-{{ java_open_jdk_version_major }}-openjdk-amd64"
5+
6+
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
7+
__java_open_jdk_version_major: 11
8+
# Supported openjdk major releases: 11
9+
10+
__java_required_repositories_openjdk: []
11+
__java_required_libs_openjdk: []

‎vars/Debian-8.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
22

3+
java_open_jdk_package: "openjdk-{{ java_open_jdk_version_major }}-jdk-headless"
4+
java_open_jdk_home_dir: "java-{{ java_open_jdk_version_major }}-openjdk-amd64"
5+
36
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
4-
__java_open_jdk_version: "8u171-b11-1~bpo8+1"
7+
__java_open_jdk_version_major: 8
8+
# Supported openjdk major releases: 7, 8 via backports
59

610
__java_required_repositories_openjdk:
711
- deb http://archive.debian.org/debian jessie-backports main
8-
912
__java_required_libs_openjdk:
1013
- ca-certificates-java=20161107~bpo8+1
1114
- libcups2

‎vars/Debian-9.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
22

3-
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
4-
__java_open_jdk_version: "8u222-b10-1~deb9u1"
3+
java_open_jdk_package: "openjdk-{{ java_open_jdk_version_major }}-jdk-headless"
4+
java_open_jdk_home_dir: "java-{{ java_open_jdk_version_major }}-openjdk-amd64"
55

6-
__java_required_repositories_openjdk:
7-
- deb http://ftp.debian.org/debian stretch-backports main
6+
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
7+
__java_open_jdk_version_major: 8
8+
# Supported openjdk major releases: 8 via oldstable
89

10+
__java_required_repositories_openjdk: []
911
__java_required_libs_openjdk: []

‎vars/Ubuntu-16.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22

33
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
4-
__java_open_jdk_version: "9~b114-0ubuntu1"
4+
__java_open_jdk_version_major: 9
5+
# Supported openjdk major releases: 8, 9
56

67
__java_required_repositories_openjdk: []
78
__java_required_libs_openjdk: []

‎vars/Ubuntu-18.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22

33
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
4-
__java_open_jdk_version: "11.0.4+11-1ubuntu2~18.04.3"
4+
__java_open_jdk_version_major: 11
5+
# Supported openjdk major releases: 8, 11
56

67
# Needed because Ubuntu Bionic SRU Exception with OpenJDK
78
__java_required_repositories_openjdk:

‎vars/Ubuntu-20.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
# Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
4+
__java_open_jdk_version_major: 14
5+
# Supported openjdk major releases: 8, 11, 13, 14
6+
7+
# Needed because Ubuntu Bionic SRU Exception with OpenJDK
8+
__java_required_repositories_openjdk:
9+
- "ppa:openjdk-r/ppa"
10+
__java_required_libs_openjdk: []

‎vars/main.yml

-3
This file was deleted.

0 commit comments

Comments
 (0)