Repository: bigtop Updated Branches: refs/heads/master c7e814b51 -> 2c3c598a6
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c3c598a/bigtop-deploy/puppet/modules/solr/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/solr/manifests/init.pp b/bigtop-deploy/puppet/modules/solr/manifests/init.pp index 22c4d9e..119fbd1 100644 --- a/bigtop-deploy/puppet/modules/solr/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/solr/manifests/init.pp @@ -14,7 +14,7 @@ # limitations under the License. class solr { - define server($port = "1978", $port_admin = "1979", $zk = "localhost:2181", $root_url = "hdfs://localhost:8020/solr", $kerberos_realm = "") { + class server($port = "1978", $port_admin = "1979", $zk = "localhost:2181", $root_url = "hdfs://localhost:8020/solr", $kerberos_realm = "") { package { "solr-server": ensure => latest, } http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c3c598a/bigtop-deploy/puppet/modules/spark/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/spark/manifests/init.pp b/bigtop-deploy/puppet/modules/spark/manifests/init.pp index 1281ff4..d7a9360 100644 --- a/bigtop-deploy/puppet/modules/spark/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/spark/manifests/init.pp @@ -14,7 +14,7 @@ # limitations under the License. class spark { - class common { + class common ($master_host = $fqdn, $master_port = "7077", $master_ui_port = "18080") { package { "spark-core": ensure => latest, } @@ -25,7 +25,7 @@ class spark { } } - define master($master_host = $fqdn, $master_port = "7077", $master_ui_port = "18080") { + class master { include common package { "spark-master": @@ -43,7 +43,7 @@ class spark { } } - define worker($master_host = $fqdn, $master_port = "7077", $master_ui_port = "18080") { + class worker { include common package { "spark-worker": http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c3c598a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp index 55fb34a..e9715ae 100644 --- a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. class tachyon { - class common { + class common ($master_host){ package { "tachyon": ensure => latest, } @@ -29,7 +29,7 @@ class tachyon { } } - define master($master_host) { + class master { include common exec { @@ -38,7 +38,7 @@ class tachyon { require => [ Package["tachyon"]] } - if ( $fqdn == $master_host ) { + if ( $fqdn == $tachyon::common::master_host ) { service { "tachyon-master": ensure => running, require => [ Package["tachyon"] ], @@ -49,10 +49,10 @@ class tachyon { } - define worker($master_host) { + class worker { include common - if ( $fqdn == $master_host ) { + if ( $fqdn == $tachyon::common::master_host ) { notice("tachyon ---> master host") # We want master to run first in all cases Service["tachyon-master"] ~> Service["tachyon-worker"]
