myriad-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smare...@apache.org
Subject [1/2] incubator-myriad git commit: fixed networking so web interfaces forward correctly
Date Fri, 13 Nov 2015 00:35:53 GMT
Repository: incubator-myriad
Updated Branches:
  refs/heads/master fed956b86 -> fb93291e9


fixed networking so web interfaces forward correctly

This closes: #44
Review: https://github.com/apache/incubator-myriad/pull/44


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/68562ae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/68562ae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/68562ae7

Branch: refs/heads/master
Commit: 68562ae74a1358b043be804d84f358926d31adc4
Parents: fed956b
Author: klucar <klucar@gmail.com>
Authored: Thu Nov 12 16:34:52 2015 -0800
Committer: smarella <smarella@maprtech.com>
Committed: Thu Nov 12 16:34:52 2015 -0800

----------------------------------------------------------------------
 Vagrantfile                   | 36 +++++++++++++++++-------------------
 vagrant/install_mesos.sh      |  7 +------
 vagrant/start_mesos_master.sh |  6 +++---
 vagrant/start_mesos_slave.sh  |  2 +-
 4 files changed, 22 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/68562ae7/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index 7102fb9..9eb7d2b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,23 +22,21 @@
 
 VAGRANTFILE_API_VERSION = "2"
 
-MESOS_VERSION="0.21.1"
 HADOOP_VERSION="2.7.0"
-#PRIVATE_IP="10.141.141.20"
+PRIVATE_IP="10.141.141.20"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "ubuntu/trusty64"
   config.vm.box_url = "https://vagrantcloud.com/ubuntu/boxes/trusty64"
-  #config.vm.hostname = "master"
-  #config.vm.network :private_network, ip: "#{PRIVATE_IP}"
+  config.vm.network :private_network, ip: "#{PRIVATE_IP}"
 
   # Configure VM resources
   config.vm.provider :virtualbox do |vb|
     vb.name = "myriad-dev"
     vb.customize ["modifyvm", :id, "--memory", "4096"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
-    #vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    #vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
   end
 
   if Vagrant.has_plugin?("vagrant-cachier")
@@ -47,26 +45,26 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Forward mesos master and slave ports
-  #config.vm.network "forwarded_port", guest: 5005, host: 5005
-  #config.vm.network "forwarded_port", guest: 5050, host: 5050
-  #config.vm.network "forwarded_port", guest: 5051, host: 5051
+  config.vm.network "forwarded_port", guest: 5005, host: 5005
+  config.vm.network "forwarded_port", guest: 5050, host: 5050
+  config.vm.network "forwarded_port", guest: 5051, host: 5051
 
   # Forward myriad web and admin ports
-  #config.vm.network "forwarded_port", guest: 8080, host: 8080
-  #config.vm.network "forwarded_port", guest: 8081, host: 8081
+  config.vm.network "forwarded_port", guest: 8080, host: 8080
+  config.vm.network "forwarded_port", guest: 8081, host: 8081
 
   # Forward YARN/Hadoop ports
-  #config.vm.network "forwarded_port", guest: 50070, host: 50070
-  #config.vm.network "forwarded_port", guest: 50075, host: 50075
-  #config.vm.network "forwarded_port", guest: 8088, host: 8088
-  #config.vm.network "forwarded_port", guest: 8042, host: 8042
-  #config.vm.network "forwarded_port", guest: 19888, host: 19888
-  #config.vm.network "forwarded_port", guest: 8192, host: 8192
-  #config.vm.network "forwarded_port", guest: 2181, host: 2181
+  config.vm.network "forwarded_port", guest: 50070, host: 50070
+  config.vm.network "forwarded_port", guest: 50075, host: 50075
+  config.vm.network "forwarded_port", guest: 8088, host: 8088
+  config.vm.network "forwarded_port", guest: 8042, host: 8042
+  config.vm.network "forwarded_port", guest: 19888, host: 19888
+  config.vm.network "forwarded_port", guest: 8192, host: 8192
+  config.vm.network "forwarded_port", guest: 2181, host: 2181
 
   # install software
   config.vm.provision "shell", path: "vagrant/install_default_jdk.sh"
-  config.vm.provision "shell", path: "vagrant/install_mesos.sh", args: ["#{MESOS_VERSION}"]
+  config.vm.provision "shell", path: "vagrant/install_mesos.sh"
   config.vm.provision "shell", path: "vagrant/install_docker.sh"
   config.vm.provision "shell", path: "vagrant/install_hadoop.sh", args: ["#{HADOOP_VERSION}"]
 

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/68562ae7/vagrant/install_mesos.sh
----------------------------------------------------------------------
diff --git a/vagrant/install_mesos.sh b/vagrant/install_mesos.sh
index 28292bf..d3521f5 100644
--- a/vagrant/install_mesos.sh
+++ b/vagrant/install_mesos.sh
@@ -18,8 +18,6 @@
 # under the License.
 #
 
-# $1 = mesos version number to install (e.g. 0.21.1)
-
 PREFIX="Mesos Provisioner: "
 set -e
 
@@ -37,7 +35,4 @@ apt-get -y install aria2
 apt-get -y install ssh
 apt-get -y install rsync
 
-
-export MESOS_VERSION=$1
-echo "${PREFIX}Installing mesos version: ${MESOS_VERSION}..."
-apt-get -y install mesos
+apt-get -y install mesos=0.24.1-0.2.35.ubuntu1404

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/68562ae7/vagrant/start_mesos_master.sh
----------------------------------------------------------------------
diff --git a/vagrant/start_mesos_master.sh b/vagrant/start_mesos_master.sh
index ebe9e66..4ff48db 100644
--- a/vagrant/start_mesos_master.sh
+++ b/vagrant/start_mesos_master.sh
@@ -20,9 +20,9 @@
 
 echo "zk://127.0.0.1:2181/mesos" > /etc/mesos/zk
 #echo "$@ master" >> /etc/hosts
-#echo "192.168.50.102 slave" >> /etc/hosts
-echo 127.0.0.1 | sudo tee /etc/mesos-master/ip
-echo localhost | sudo tee /etc/mesos-master/hostname
+echo "10.141.141.20 master" >> /etc/hosts
+echo 10.141.141.20 | sudo tee /etc/mesos-master/ip
+echo master | sudo tee /etc/mesos-master/hostname
 
 echo "export HADOOP_HOME=/usr/local/hadoop" >> /root/.bashrc
 echo "export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64" >> /root/.bashrc

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/68562ae7/vagrant/start_mesos_slave.sh
----------------------------------------------------------------------
diff --git a/vagrant/start_mesos_slave.sh b/vagrant/start_mesos_slave.sh
index eeca9e1..2abbec9 100644
--- a/vagrant/start_mesos_slave.sh
+++ b/vagrant/start_mesos_slave.sh
@@ -20,7 +20,7 @@
 
 set -e
 
-echo "127.0.0.1" > /etc/mesos-slave/ip
+echo "10.141.141.20" > /etc/mesos-slave/ip
 echo "cgroups/cpu,cgroups/mem" > /etc/mesos-slave/isolation
 echo "mesos" > /etc/mesos-slave/containerizers
 echo "/usr/local/hadoop" > /etc/mesos-slave/hadoop_home


Mime
View raw message