You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2015/07/22 21:26:35 UTC
aurora git commit: Use aurora.local as hostname.
Repository: aurora
Updated Branches:
refs/heads/master b64f7b68d -> 6e2bf577f
Use aurora.local as hostname.
Testing Done:
end-to-end test gets past service discovery errors.
Reviewed at https://reviews.apache.org/r/36492/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/6e2bf577
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/6e2bf577
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/6e2bf577
Branch: refs/heads/master
Commit: 6e2bf577f059e33742f927e4ebd7bac99a13430d
Parents: b64f7b6
Author: Kevin Sweeney <ke...@apache.org>
Authored: Wed Jul 22 12:26:16 2015 -0700
Committer: Kevin Sweeney <ke...@apache.org>
Committed: Wed Jul 22 12:26:16 2015 -0700
----------------------------------------------------------------------
examples/vagrant/provision-dev-cluster.sh | 6 +-----
examples/vagrant/upstart/aurora-scheduler-kerberos.conf | 1 +
examples/vagrant/upstart/aurora-scheduler.conf | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/6e2bf577/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index 853ccac..06e32f1 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -34,10 +34,6 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
readonly IP_ADDRESS=192.168.33.7
-# Set the hostname to the IP address. This simplifies things for components
-# that want to advertise the hostname to the user, or other components.
-hostname $IP_ADDRESS
-
readonly MESOS_VERSION=0.22.0
function prepare_extras() {
@@ -91,7 +87,7 @@ EOF
function configure_netrc {
cat > /home/vagrant/.netrc <<EOF
-machine $IP_ADDRESS
+machine $(hostname -f)
login aurora
password secret
EOF
http://git-wip-us.apache.org/repos/asf/aurora/blob/6e2bf577/examples/vagrant/upstart/aurora-scheduler-kerberos.conf
----------------------------------------------------------------------
diff --git a/examples/vagrant/upstart/aurora-scheduler-kerberos.conf b/examples/vagrant/upstart/aurora-scheduler-kerberos.conf
index 85052ac..02c9e6a 100644
--- a/examples/vagrant/upstart/aurora-scheduler-kerberos.conf
+++ b/examples/vagrant/upstart/aurora-scheduler-kerberos.conf
@@ -36,6 +36,7 @@ chdir /home/vagrant/aurora/dist/install/aurora-scheduler
exec bin/aurora-scheduler \
-cluster_name=example \
-http_port=8081 \
+ -hostname=aurora.local \
-native_log_quorum_size=1 \
-zk_endpoints=localhost:2181 \
-mesos_master_address=zk://localhost:2181/mesos/master \
http://git-wip-us.apache.org/repos/asf/aurora/blob/6e2bf577/examples/vagrant/upstart/aurora-scheduler.conf
----------------------------------------------------------------------
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index f261c8d..789a3a0 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -27,6 +27,7 @@ env JAVA_OPTS='-Djava.library.path=/usr/lib -Dlog4j.configuration="file:///etc/z
chdir /home/vagrant/aurora/dist/install/aurora-scheduler
exec bin/aurora-scheduler \
-cluster_name=example \
+ -hostname=aurora.local \
-http_port=8081 \
-native_log_quorum_size=1 \
-zk_endpoints=localhost:2181 \