BIGTOP-2828. Since BIGTOP-2775 JDK version has been specified by Bigtop Puppet

5 files changed, 0 insertions, 22 deletions

diff --git a/docker/pseudo-cluster/config/hieradata/site.yaml b/docker/pseudo-cluster/config/hieradata/site.yaml
index 3e9ebc4d..eb338406 100644
--- a/docker/pseudo-cluster/config/hieradata/site.yaml
+++ b/docker/pseudo-cluster/config/hieradata/site.yaml
@@ -7,5 +7,4 @@ hadoop_cluster_node::cluster_components:
   - yarn
   - mapreduce
 bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64
-bigtop::jdk_package_name: openjdk-8-jdk
 
diff --git a/docker/sandbox/build.sh b/docker/sandbox/build.sh
index 58a76e70..8910f93f 100755
--- a/docker/sandbox/build.sh
+++ b/docker/sandbox/build.sh
@@ -41,7 +41,6 @@ bigtop::hadoop_head_node: ${HEAD_NODE:-"head.node.fqdn"}
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: ${REPO}
 hadoop_cluster_node::cluster_components: [${COMPONENTS}]
-bigtop::jdk_package_name: ${JDK}
 EOF
 }
 
@@ -64,15 +63,6 @@ generate_tag() {
     fi
 }
 
-detect_jdk() {
-    for RPM in ${RPMS[*]}; do
-        [[ $OS == $RPM ]] && JDK=$RPM_JDK
-    done
-    for DEB in ${DEBS[*]}; do
-        [[ $OS == $DEB ]] && JDK=$DEB_JDK
-    done
-}
-
 detect_repo() {
     OS_SEP_BY_SLASH=${OS/-//}
     REPO=${REPO:-"http://bigtop-repos.s3.amazonaws.com/releases/${BIGTOP_VERSION}/${OS_SEP_BY_SLASH}/x86_64"}
@@ -103,10 +93,6 @@ deploy_config_validator() {
         echo "repository unset!"
         invalid=0
     fi
-    if [ -z "$JDK" ]; then
-        echo "jdk unset!"
-        invalid=0
-    fi
     if [ -z "$COMPONENTS" ]; then
         echo "components unset!"
         invalid=0
@@ -131,7 +117,6 @@ show_deploy_configs() {
     echo "DEPLOY CONFIGS:"
     echo "REPOSITORY $REPO"
     echo "COMPONENTS $COMPONENTS"
-    echo "JDK        $JDK"
     echo "-------------------------------------------------"
 }
 
@@ -202,7 +187,6 @@ image_config_validator
 show_image_configs
 
 if [ -z "$FILE" ]; then
-    detect_jdk
     detect_repo
     deploy_config_validator
     generate_config
diff --git a/docker/sandbox/sandbox-env.sh b/docker/sandbox/sandbox-env.sh
index 7e367e11..e1599d52 100644
--- a/docker/sandbox/sandbox-env.sh
+++ b/docker/sandbox/sandbox-env.sh
@@ -24,10 +24,7 @@ RPMS=( \
     fedora-25 \
     opensuse-42.1 \
 )
-RPM_JDK=java-1.8.0-openjdk-devel.x86_64
-
 DEBS=( \
     debian-8 \
     ubuntu-16.04 \
 )
-DEB_JDK=openjdk-8-jdk
diff --git a/docker/sandbox/site.yaml.template.centos-6_hadoop b/docker/sandbox/site.yaml.template.centos-6_hadoop
index 51fd6828..db49e484 100644
--- a/docker/sandbox/site.yaml.template.centos-6_hadoop
+++ b/docker/sandbox/site.yaml.template.centos-6_hadoop
@@ -17,4 +17,3 @@ bigtop::hadoop_head_node: "head.node.fqdn"
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/6/x86_64
 hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
-bigtop::jdk_package_name: java-1.8.0-openjdk-devel.x86_64
diff --git a/docker/sandbox/site.yaml.template.debian-8_hadoop b/docker/sandbox/site.yaml.template.debian-8_hadoop
index 21c5d9d0..1bbae6c6 100644
--- a/docker/sandbox/site.yaml.template.debian-8_hadoop
+++ b/docker/sandbox/site.yaml.template.debian-8_hadoop
@@ -17,4 +17,3 @@ bigtop::hadoop_head_node: "head.node.fqdn"
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/debian/8/x86_64
 hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
-bigtop::jdk_package_name: openjdk-8-jdk