You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/04/22 20:36:22 UTC
git commit: Optionally use system-installed thrift in build.gradle,
use this in vagrant devcluster.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 88d25ed94 -> 22ad73672
Optionally use system-installed thrift in build.gradle, use this in vagrant devcluster.
Bugs closed: AURORA-299
Reviewed at https://reviews.apache.org/r/20238/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/22ad7367
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/22ad7367
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/22ad7367
Branch: refs/heads/master
Commit: 22ad73672bbb5cb66456b3b36c018678ae54280a
Parents: 88d25ed
Author: Bill Farner <wf...@apache.org>
Authored: Tue Apr 22 11:00:49 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Tue Apr 22 11:00:49 2014 -0700
----------------------------------------------------------------------
docs/tutorial.md | 4 ++--
examples/vagrant/provision-dev-cluster.sh | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/22ad7367/docs/tutorial.md
----------------------------------------------------------------------
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 64981a7..1e7f34c 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -145,7 +145,7 @@ identical, the job keys identify the same job.
cluster names. For Vagrant, from the top-level of your Aurora repository clone,
do:
- $ vagrant ssh devcluster
+ $ vagrant ssh
Followed by:
@@ -180,7 +180,7 @@ Or for our example:
This returns:
- $ vagrant ssh devcluster
+ $ vagrant ssh
Welcome to Ubuntu 12.04 LTS (GNU/Linux 3.2.0-23-generic x86_64)
* Documentation: https://help.ubuntu.com/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/22ad7367/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index ec95543..2b2ab0d 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -17,14 +17,10 @@
apt-get update
apt-get -y install \
- automake \
curl \
git \
- g++ \
libcurl4-openssl-dev \
libsasl2-dev \
- libtool \
- make \
openjdk-7-jdk \
python-dev \
zookeeper
@@ -43,6 +39,7 @@ function build_all() {
fi
pushd aurora
+ # fetch the mesos egg, needed to build python components
mkdir -p third_party
pushd third_party
wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.17.0_amd64.egg \
@@ -50,6 +47,12 @@ function build_all() {
popd
git pull
+ # install thrift, needed for code generation in the scheduler build
+ # TODO(wfarner): Move deb file out of jfarrell's individual hosting.
+ thrift_deb=thrift-compiler_0.9.1_amd64.deb
+ wget -c http://people.apache.org/~jfarrell/thrift/0.9.1/contrib/deb/ubuntu/12.04/$thrift_deb
+ dpkg --install $thrift_deb
+
# build scheduler
./gradlew installApp
@@ -76,12 +79,12 @@ EOF
sudo chown -R vagrant:vagrant aurora
}
-function install_mesos() {
+function install_mesos {
wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.17.0_amd64.deb
dpkg --install mesos_0.17.0_amd64.deb
}
-function install_aurora() {
+function install_aurora {
# The bulk of the 'install' was done by the build, the result of which we access
# through /home/vagrant.
DIST_DIR=/home/vagrant/aurora/dist
@@ -113,7 +116,7 @@ function install_aurora() {
EOF
}
-function start_services() {
+function start_services {
cp /vagrant/examples/vagrant/upstart/*.conf /etc/init
start zookeeper