diff --git a/opt/vagrant/bootstrap-centos-extra.sh b/opt/vagrant/bootstrap-centos-extra.sh index 692adca..9cad0d8 100755 --- a/opt/vagrant/bootstrap-centos-extra.sh +++ b/opt/vagrant/bootstrap-centos-extra.sh @@ -4,3 +4,4 @@ sudo /opt/vagrant/restore-yum-cache.sh sudo /opt/vagrant/install-ml-centos.sh $2 sudo /opt/vagrant/setup-ml-extra.sh $@ sudo /opt/vagrant/backup-yum-cache.sh +sudo /opt/vagrant/set-env-vars.sh diff --git a/opt/vagrant/bootstrap-centos-master.sh b/opt/vagrant/bootstrap-centos-master.sh index e724a8d..cdc81c7 100755 --- a/opt/vagrant/bootstrap-centos-master.sh +++ b/opt/vagrant/bootstrap-centos-master.sh @@ -9,3 +9,4 @@ sudo /opt/vagrant/install-user.sh $4 sudo /opt/vagrant/setup-git.sh $4 sudo /opt/vagrant/setup-tomcat.sh sudo /opt/vagrant/backup-yum-cache.sh +sudo /opt/vagrant/set-env-vars.sh diff --git a/opt/vagrant/install-mlcp.sh b/opt/vagrant/install-mlcp.sh index 6a4b336..ca918ac 100755 --- a/opt/vagrant/install-mlcp.sh +++ b/opt/vagrant/install-mlcp.sh @@ -2,7 +2,7 @@ echo "running $0 $@" yum -y install zip unzip -yum -y install java +yum -y install java-1.8.0-openjdk-devel if [ "$1" -eq "8" ]; then echo "Installing MLCP 1.3-1..." @@ -20,4 +20,4 @@ else if [ ! -h /usr/local/mlcp ]; then cd /usr/local && ln -s /opt/mlcp-Hadoop2-1.2-3 mlcp fi -fi \ No newline at end of file +fi diff --git a/opt/vagrant/set-env-vars.sh b/opt/vagrant/set-env-vars.sh new file mode 100755 index 0000000..8a9a78b --- /dev/null +++ b/opt/vagrant/set-env-vars.sh @@ -0,0 +1,6 @@ +#! /bin/sh +echo "running $0 $@" + +# Vagrant Environment Variables +echo "Setting environment variables..." +echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.75.x86_64" >> /home/vagrant/.bashrc