Repository: aurora Updated Branches: refs/heads/master 0aeac9590 -> 317aa4d7c
Vagrant change to reserve part of the dev cluster's resources to 'aurora-role'. Bugs closed: AURORA-1109 Reviewed at https://reviews.apache.org/r/42177/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/317aa4d7 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/317aa4d7 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/317aa4d7 Branch: refs/heads/master Commit: 317aa4d7c5c645e129a2d301481e760d5fcbee55 Parents: 0aeac95 Author: Zhitao Li <[email protected]> Authored: Tue Jan 19 13:24:19 2016 -0800 Committer: Bill Farner <[email protected]> Committed: Tue Jan 19 13:24:19 2016 -0800 ---------------------------------------------------------------------- examples/vagrant/upstart/aurora-scheduler.conf | 1 + examples/vagrant/upstart/mesos-master.conf | 1 + examples/vagrant/upstart/mesos-slave.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/317aa4d7/examples/vagrant/upstart/aurora-scheduler.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf index 8120ff7..69025dd 100644 --- a/examples/vagrant/upstart/aurora-scheduler.conf +++ b/examples/vagrant/upstart/aurora-scheduler.conf @@ -47,4 +47,5 @@ exec bin/aurora-scheduler \ -shiro_ini_path=etc/shiro.example.ini \ -enable_h2_console=true \ -tier_config=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/tiers-example.json \ + -mesos_role=aurora-role \ -receive_revocable_resources=true http://git-wip-us.apache.org/repos/asf/aurora/blob/317aa4d7/examples/vagrant/upstart/mesos-master.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/mesos-master.conf b/examples/vagrant/upstart/mesos-master.conf index 9d7491c..a2ed953 100644 --- a/examples/vagrant/upstart/mesos-master.conf +++ b/examples/vagrant/upstart/mesos-master.conf @@ -23,4 +23,5 @@ exec /usr/sbin/mesos-master \ --zk=zk://$ZK_HOST:2181/mesos/master \ --ip=$MY_HOST \ --work_dir=/usr/local/aurora/master/db \ + --roles=aurora-role \ --quorum=1 http://git-wip-us.apache.org/repos/asf/aurora/blob/317aa4d7/examples/vagrant/upstart/mesos-slave.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/mesos-slave.conf b/examples/vagrant/upstart/mesos-slave.conf index 1ef059b..d97fa1f 100644 --- a/examples/vagrant/upstart/mesos-slave.conf +++ b/examples/vagrant/upstart/mesos-slave.conf @@ -26,7 +26,7 @@ env ZK_HOST=192.168.33.7 exec /usr/sbin/mesos-slave --master=zk://$ZK_HOST:2181/mesos/master \ --ip=$MY_HOST \ --hostname=$MY_HOST \ - --resources="cpus:4;mem:1024;disk:20000" \ + --resources="cpus(aurora-role):0.5;cpus(*):3.5;mem(aurora-role):1024;disk:20000" \ --work_dir="/var/lib/mesos" \ --containerizers=docker,mesos \ --resource_estimator="org_apache_mesos_FixedResourceEstimator" \
