BIGTOP-1770. Let the user specify which JDK package to be installed in vagrantconfig.yaml

6 files changed, 11 insertions, 5 deletions

diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
index 26618611..d6e95bf0 100755
--- a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
@@ -33,6 +33,7 @@ create() {
     hadoop_head_node=(`echo "hostname -f" |vagrant ssh ${nodes[0]} |tail -n 1`)
     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)
 
@@ -40,7 +41,7 @@ create() {
     for node in ${nodes[*]}; do
         (
         echo "/bigtop-home/bigtop-deploy/vm/utils/setup-env-$distro.sh $enable_local_repo" |vagrant ssh $node
-        echo "/vagrant/provision.sh $hadoop_head_node $repo \"$components\"" |vagrant ssh $node
+        echo "/vagrant/provision.sh $hadoop_head_node $repo \"$components\" $jdk" |vagrant ssh $node
         ) &
     done
     wait
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
index 9dbaa56d..48cb968c 100755
--- a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
@@ -26,10 +26,8 @@ ln -s /vagrant/hosts /etc/hosts
 # Prepare puppet configuration file
 if [ -f /etc/debian_version ] ; then
     apt-get -y install puppet-module-puppetlabs-stdlib
-    jdk="openjdk-7-jdk"
 else
     cd /etc/puppet/modules && puppet module install puppetlabs/stdlib
-    jdk="java-1.7.0-openjdk-devel.x86_64"
 fi
 
 mkdir -p /etc/puppet/hieradata
@@ -39,6 +37,6 @@ cat > /etc/puppet/hieradata/site.yaml << EOF
 bigtop::hadoop_head_node: $1
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: $2
-bigtop::jdk_package_name: $jdk
 hadoop_cluster_node::cluster_components: $3
+bigtop::jdk_package_name: $4
 EOF
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
index 312bb969..fa556710 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
@@ -13,3 +13,4 @@ namenode_ui_port: "50070"
 yarn_ui_port: "8088"
 hbase_ui_port: "60010"
 enable_local_repo: false
+jdk: "java-1.7.0-openjdk-devel.x86_64"
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
index 10a17408..008c15ca 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
@@ -13,3 +13,4 @@ namenode_ui_port: "50070"
 yarn_ui_port: "8088"
 hbase_ui_port: "60010"
 enable_local_repo: false
+jdk: "openjdk-7-jdk"
diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
index 2f5413c2..9cf04769 100755
--- a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
@@ -42,6 +42,10 @@ run_smoke_tests = CONF['run_smoke_tests']
 # Force success - not worried if this step fails, since we generally only use it for development.
 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"
 
@@ -58,8 +62,8 @@ cat > /etc/puppet/hieradata/site.yaml << EOF
 bigtop::hadoop_head_node: #{bigtop_master}
 hadoop::hadoop_storage_dirs: [/data/1, /data/2]
 bigtop::bigtop_repo_uri: #{repo}
-bigtop::jdk_package_name: java-1.7.0-openjdk-devel.x86_64
 hadoop_cluster_node::cluster_components: #{components}
+bigtop::jdk_package_name: #{jdk}
 EOF
 SCRIPT
 
diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
index 7554d120..33ef53b7 100644
--- a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
@@ -7,3 +7,4 @@ components: [hadoop, yarn]
 enable_local_repo: false
 run_smoke_tests: false
 distro: centos
+jdk: "java-1.7.0-openjdk-devel.x86_64"