Merge pull request #1 from EvanKrall/master

Pull out IP-picking magic, allow it to be passed in instead.
deric · Feb 22, 2014 · 06a2a53 · 06a2a53
2 parents 5b86f40 + 837eb87
commit 06a2a53
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 42 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -18,19 +18,20 @@
 # Copyright 2013-2014 Tomas Barton
 #
 class mesos(
-  $ensure       = hiera('mesos::version', 'present')
+  $ensure         = hiera('mesos::version', 'present')
 ) {
   # master and slave creates separate logs automatically
   # TODO: currently not used
-  $log_dir      = hiera('mesos::log_dir', '/var/log/mesos')
-  $conf_dir     = hiera('mesos::conf_dir', '/etc/mesos')
+  $log_dir        = hiera('mesos::log_dir', '/var/log/mesos')
+  $conf_dir       = hiera('mesos::conf_dir', '/etc/mesos')
   # e.g. zk://localhost:2181/mesos
-  $zookeeper    = hiera('mesos::zookeeper', '')
+  $zookeeper      = hiera('mesos::zookeeper', '')
   # if "zk" is empty, master value is used
-  $master       = hiera('mesos::master', '127.0.0.1')
-  $master_port  = hiera('mesos::master_port', '5050')
-  $owner        = hiera('mesos::owner', 'root')
-  $group        = hiera('mesos::group', 'root')
+  $master         = hiera('mesos::master', '127.0.0.1')
+  $master_port    = hiera('mesos::master_port', '5050')
+  $owner          = hiera('mesos::owner', 'root')
+  $group          = hiera('mesos::group', 'root')
+  $listen_address = hiera('mesos::listen_address', $::ipaddress)
 
   class {'mesos::install':
     ensure => $ensure,

diff --git a/manifests/master.pp b/manifests/master.pp
@@ -11,15 +11,16 @@
 # class{ 'mesos::master': }
 #
 class mesos::master(
-  $enable      = true,
-  $whitelist   = '*',
-  $cluster     = 'mesos',
-  $conf_dir    = '/etc/mesos-master',
-  $conf_file   = '/etc/default/mesos-master',
-  $master_port = $mesos::master_port,
-  $zookeeper   = $mesos::zookeeper,
-  $owner       = $mesos::owner,
-  $group       = $mesos::group,
+  $enable         = true,
+  $whitelist      = '*',
+  $cluster        = 'mesos',
+  $conf_dir       = '/etc/mesos-master',
+  $conf_file      = '/etc/default/mesos-master',
+  $master_port    = $mesos::master_port,
+  $zookeeper      = $mesos::zookeeper,
+  $owner          = $mesos::owner,
+  $group          = $mesos::group,
+  $listen_address = $mesos::listen_address,
 ) inherits mesos {
 
   file { $conf_dir:

diff --git a/manifests/slave.pp b/manifests/slave.pp
@@ -33,23 +33,24 @@
 #
 
 class mesos::slave (
-  $enable      = true,
-  $port        = 5051,
-  $work_dir    = '/tmp/mesos',
-  $checkpoint  = false,
-  $isolation   = 'process',
-  $conf_dir    = '/etc/mesos-slave',
-  $conf_file   = '/etc/default/mesos-slave',
-  $master      = $mesos::master,
-  $master_port = $mesos::master_port,
-  $zookeeper   = $mesos::zookeeper,
-  $owner       = $mesos::owner,
-  $group       = $mesos::group,
-  $env_var     = {},
-  $cgroups     = {},
-  $options     = {},
-  $resources   = {},
-  $attributes  = {},
+  $enable         = true,
+  $port           = 5051,
+  $work_dir       = '/tmp/mesos',
+  $checkpoint     = false,
+  $isolation      = 'process',
+  $conf_dir       = '/etc/mesos-slave',
+  $conf_file      = '/etc/default/mesos-slave',
+  $master         = $mesos::master,
+  $master_port    = $mesos::master_port,
+  $zookeeper      = $mesos::zookeeper,
+  $owner          = $mesos::owner,
+  $group          = $mesos::group,
+  $listen_address = $mesos::listen_address,
+  $env_var        = {},
+  $cgroups        = {},
+  $options        = {},
+  $resources      = {},
+  $attributes     = {},
 ) inherits mesos {
 
   validate_hash($env_var)

diff --git a/templates/master.erb b/templates/master.erb
@@ -6,10 +6,7 @@ CLUSTER="<%= @cluster %>"
 
 # IP address to listen on (in case that you start master
 # on this node, it will bind to this address)
-<% ipaddress = scope.lookupvar('ipaddress_public') -%>
-<% ipaddress ||= scope.lookupvar('public_ip') -%>
-<% ipaddress ||= scope.lookupvar('ipaddress') -%>
-IP="<%= ipaddress %>"
+IP="<%= @listen_address %>"
 
 # Port to listen on (default: 5050)
 PORT=<%= @master_port %>

diff --git a/templates/slave.erb b/templates/slave.erb
@@ -6,11 +6,8 @@ MASTER="<%= @zookeeper %>"
 MASTER="<%= @master %>:<%= @master_port %>"
 <% end -%>
 
-<% ipaddress = scope.lookupvar('ipaddress_public') -%>
-<% ipaddress ||= scope.lookupvar('public_ip') -%>
-<% ipaddress ||= scope.lookupvar('ipaddress') -%>
 # public slave's ip, must be unique in mesos cluster
-IP="<%= ipaddress %>"
+IP="<%= @listen_address %>"
 
 # Port to listen on (default: 5051)
 PORT=<%= @port %>