BIGTOP-2775: Make open jdk 8 available on bigtop/puppet:debian-8

7 files changed, 1 insertions, 12 deletions

diff --git a/provisioner/docker/config_centos6.yaml b/provisioner/docker/config_centos6.yaml
index 459f8a2a..7912aca6 100644
--- a/provisioner/docker/config_centos6.yaml
+++ b/provisioner/docker/config_centos6.yaml
@@ -22,4 +22,3 @@ distro: centos
 components: [hdfs, yarn, mapreduce]
 enable_local_repo: false
 smoke_test_components: [hdfs, yarn, mapreduce]
-jdk: "java-1.8.0-openjdk-devel.x86_64"
diff --git a/provisioner/docker/config_centos7.yaml b/provisioner/docker/config_centos7.yaml
index 6e3c28b3..6cdd7cfc 100644
--- a/provisioner/docker/config_centos7.yaml
+++ b/provisioner/docker/config_centos7.yaml
@@ -22,4 +22,3 @@ distro: centos
 components: [hdfs, yarn, mapreduce]
 enable_local_repo: false
 smoke_test_components: [hdfs, yarn, mapreduce]
-jdk: "java-1.8.0-openjdk-devel.x86_64"
diff --git a/provisioner/docker/config_debian8.yaml b/provisioner/docker/config_debian8.yaml
index 10915e50..c1a468a4 100644
--- a/provisioner/docker/config_debian8.yaml
+++ b/provisioner/docker/config_debian8.yaml
@@ -22,4 +22,3 @@ distro: debian
 components: [hdfs, yarn, mapreduce]
 enable_local_repo: false
 smoke_test_components: [hdfs, yarn, mapreduce]
-jdk: "openjdk-8-jdk"
diff --git a/provisioner/docker/config_ubuntu_xenial.yaml b/provisioner/docker/config_ubuntu_xenial.yaml
index 8f8cb878..54c91f77 100644
--- a/provisioner/docker/config_ubuntu_xenial.yaml
+++ b/provisioner/docker/config_ubuntu_xenial.yaml
@@ -22,4 +22,3 @@ distro: debian
 components: [hdfs, yarn, mapreduce]
 enable_local_repo: false
 smoke_test_components: [hdfs, yarn, mapreduce]
-jdk: "openjdk-8-jdk"
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 0a84b076..2783a1fb 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -60,10 +60,9 @@ create() {
     # Fetch configurations form specificed yaml config file
     repo=$(get-yaml-config repo)
     components="[`echo $(get-yaml-config components) | sed 's/ /, /g'`]"
-    jdk=$(get-yaml-config jdk)
     distro=$(get-yaml-config distro)
     enable_local_repo=$(get-yaml-config enable_local_repo)
-    generate-config "$hadoop_head_node" "$repo" "$components" "$jdk"
+    generate-config "$hadoop_head_node" "$repo" "$components"
 
     # Start provisioning
     generate-hosts
@@ -90,7 +89,6 @@ bigtop::hadoop_head_node: $1
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: $2
 hadoop_cluster_node::cluster_components: $3
-bigtop::jdk_package_name: $4
 EOF
 }
 
diff --git a/provisioner/vagrant/Vagrantfile b/provisioner/vagrant/Vagrantfile
index fc6bfc19..ae099631 100755
--- a/provisioner/vagrant/Vagrantfile
+++ b/provisioner/vagrant/Vagrantfile
@@ -59,9 +59,6 @@ smoke_test_components = CONF['smoke_test_components'].join(',')
 enable_local_repo = CONF['enable_local_repo']
 puts "vagrant conf local repo enabled:  #{enable_local_repo}"
 
-# JDK package name
-jdk = CONF['jdk']
-
 # master node hostname
 bigtop_master = "bigtop1.vagrant"
 
@@ -86,7 +83,6 @@ bigtop::hadoop_head_node: #{bigtop_master}
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: #{repo}
 hadoop_cluster_node::cluster_components: #{components}
-bigtop::jdk_package_name: #{jdk}
 hadoop::common_hdfs::testonly_hdfs_sshkeys: "yes"
 EOF
 SCRIPT
diff --git a/provisioner/vagrant/vagrantconfig.yaml b/provisioner/vagrant/vagrantconfig.yaml
index 4fbb4e44..54604b01 100644
--- a/provisioner/vagrant/vagrantconfig.yaml
+++ b/provisioner/vagrant/vagrantconfig.yaml
@@ -23,4 +23,3 @@ components: [hdfs, yarn, mapreduce]
 enable_local_repo: false
 run_smoke_tests: false
 smoke_test_components: [hdfs, yarn, mapreduce]
-jdk: "java-1.8.0-openjdk-devel.x86_64"