fix #167 make java package configurable (#265)
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index d409dd4..93a4be4 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -27,7 +27,7 @@
- collectd
- screen
- patch
- - java-1.8.0-openjdk-devel
+ - "{{ java_package }}"
state: present
- name: "configure node shutdown"
shell: shutdown +{{ shutdown_delay_minutes }} &> {{ user_home }}/.shutdown creates={{ user_home }}/.shutdown
diff --git a/conf/muchos.props.example b/conf/muchos.props.example
index c33a2d4..9296ec6 100644
--- a/conf/muchos.props.example
+++ b/conf/muchos.props.example
@@ -46,6 +46,10 @@
download_software = True
# Install Hub (for GitHub)
install_hub = True
+# The java package to install
+java_package=java-1.8.0-openjdk-devel
+# The package to use for java 11
+# java_package=java-11-openjdk-devel
[ec2]
# AWS machine image to use. The default below is for a CentOS 7 image (in us-east-1).
diff --git a/lib/muchos/config.py b/lib/muchos/config.py
index c8d5440..b0a3fe5 100644
--- a/lib/muchos/config.py
+++ b/lib/muchos/config.py
@@ -358,7 +358,8 @@
'hdfs_root': 'hdfs://{{ groups[\'namenode\'][0] }}:8020',
'install_dir': None,
'install_hub': None,
- 'java_home': '"/usr/lib/jvm/java-1.8.0-openjdk"',
+ 'java_home': '"/usr/lib/jvm/java"',
+ 'java_package': '"java-1.8.0-openjdk-devel"',
'maven_home': '"{{ install_dir }}/apache-maven-{{ maven_version }}"',
'maven_tarball': 'apache-maven-{{ maven_version }}-bin.tar.gz',
'maven_version': '3.6.1',