Skip to content

Commit

Permalink
Merge pull request #525 from mesos/gk/set_hostname
Browse files Browse the repository at this point in the history
Set the hostname in the framework information proto
  • Loading branch information
Peter Kolloch committed Aug 18, 2015
2 parents a6e6d93 + 573b17c commit 5b644b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ trait SchedulerConfiguration extends ScallopConf {
descr = "The list of ZooKeeper servers for storing state",
default = Some("localhost:2181"))
lazy val hostname = opt[String]("hostname",
descr = "The advertised hostname stored in ZooKeeper so another standby " +
"host can redirect to this elected leader",
descr = "The advertised hostname of this Chronos instance for network communication. This is used by other" +
"Chronos instances and the Mesos master to communicate with this instance",
default = Some(java.net.InetAddress.getLocalHost.getHostName))
lazy val leaderMaxIdleTimeMs = opt[Int]("leader_max_idle_time",
descr = "The look-ahead time for scheduling tasks in milliseconds",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class SchedulerDriverBuilder {
.setRole(config.mesosRole())
.setFailoverTimeout(config.failoverTimeoutSeconds())
.setUser(config.user())
.setHostname(config.hostname())

// Set the ID, if provided
frameworkId.foreach(frameworkInfoBuilder.setId)
Expand Down

0 comments on commit 5b644b1

Please sign in to comment.