You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/12/19 01:16:38 UTC
svn commit: r1220566 - in
/incubator/ambari/trunk/agent/src/main/resources/puppet: manifests/site.pp
modules/hadoop/manifests/init.pp
Author: vgogate
Date: Mon Dec 19 00:16:38 2011
New Revision: 1220566
URL: http://svn.apache.org/viewvc?rev=1220566&view=rev
Log:
AMBARI-161. Add puppet module for Hadoop to agent resources
Modified:
incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp
incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/manifests/init.pp
Modified: incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp?rev=1220566&r1=1220565&r2=1220566&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp (original)
+++ incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp Mon Dec 19 00:16:38 2011
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
stage {"pre": before => Stage["main"]}
yumrepo { "Bigtop":
@@ -30,28 +29,57 @@ package { "jdk":
node default {
notice($fqdn)
+ /* Assign defaults */
if !$ambari_stack_install_dir {
$ambari_stack_install_dir = "/var/ambari/"
}
notice ($ambari_stack_install_dir)
- /* ensure new directories in the path are present */
+ /* Create group and users */
+ group {$ambari_admin_group:
+ ensure => present
+ }
+
+ /*
+ * Create user for HDFS component
+ * TODO: currently uid is auto selected which may cause different uids on each node..
+ * No home directory specified. Need it?
+ * Is user specified per role or per component?
+ */
+ user {$ambari_hdfs_user:
+ ensure => present,
+ gid => $ambari_admin_group
+ }
+
+ /*
+ * Ensure cluster directory path is present
+ * Owned by root up to cluster directory
+ */
$stack_path = "${ambari_stack_install_dir}/${ambari_cluster_name}"
$stack_path_intermediate_dirs = dirs_between ($stack_path)
file {$stack_path_intermediate_dirs:
- ensure => directory
+ ensure => directory,
+ owner => root,
+ group => $ambari_admin_group,
+ mode => 755
}
if ($fqdn in $role_to_nodes[namenode]) {
hadoop::namenode {"namenode":
+ ambari_role_name => "namenode",
ambari_role_prefix => "${stack_path}/namenode",
+ user => $ambari_hdfs_user,
+ group => $ambari_admin_group
}
}
/* hadoop.security.authentication make global variable */
if ($fqdn in $role_to_nodes[datanode]) {
hadoop::datanode {"datanode":
+ ambari_role_name => "datanode",
ambari_role_prefix => "${stack_path}/datanode",
+ user => $ambari_hdfs_user,
+ group => $ambari_admin_group,
auth_type => "simple"
}
}
Modified: incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/manifests/init.pp?rev=1220566&r1=1220565&r2=1220566&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/manifests/init.pp Mon Dec 19 00:16:38 2011
@@ -29,14 +29,20 @@ class hadoop {
}
}
- define datanode ($ambari_role_prefix, $auth_type = "simple") {
+ define datanode ($ambari_role_name = "datanode",
+ $ambari_role_prefix, $user = "hdfs", $group = "hdfs", $auth_type = "simple") {
include common
- $ambari_role_name = "datanode"
+ /*
+ * Create conf directory for datanode
+ */
$hadoop_conf_dir = "${ambari_role_prefix}/etc/hadoop"
file {["${ambari_role_prefix}", "${ambari_role_prefix}/etc", "${ambari_role_prefix}/etc/hadoop"]:
- ensure => directory
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => 755
}
notice ($ambari_role_prefix)
notice ($ambari_role_name)
@@ -46,7 +52,10 @@ class hadoop {
/* Create config files for each category */
create_config_file {$files:
conf_map => $::hadoop_stack_conf[$title],
- require => [Package["hadoop"]]
+ require => [Package["hadoop"]],
+ owner => $user,
+ group => $group,
+ mode => 644
}
package { "hadoop-datanode":
@@ -62,14 +71,17 @@ class hadoop {
}
}
- define namenode ($ambari_role_prefix) {
+ define namenode ($ambari_role_name = "namenode",
+ $ambari_role_prefix, $user = "hdfs", $group = "hdfs") {
include common
- $ambari_role_name = "namenode"
$hadoop_conf_dir = "${ambari_role_prefix}/etc/hadoop"
file {["${ambari_role_prefix}", "${ambari_role_prefix}/etc", "${ambari_role_prefix}/etc/hadoop"]:
- ensure => directory
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => 755
}
notice ($ambari_role_prefix)
notice ($ambari_role_name)
@@ -79,7 +91,10 @@ class hadoop {
/* Create config files for each category */
create_config_file {$files:
conf_map => $::hadoop_stack_conf[$title],
- require => [Package["hadoop"]]
+ require => [Package["hadoop"]],
+ owner => $user,
+ group => $group,
+ mode => 644
}
package { "hadoop-namenode":
@@ -88,14 +103,17 @@ class hadoop {
}
}
- define client ($ambari_role_prefix) {
+ define client ($ambari_role_name = "client", $ambari_role_prefix,
+ $user = "hadoop", $group = "hadoop") {
include common
- $ambari_role_name = "client"
$hadoop_conf_dir = "${ambari_role_prefix}/etc/conf"
file {["${ambari_role_prefix}", "${ambari_role_prefix}/etc", "${ambari_role_prefix}/etc/conf"]:
- ensure => directory
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => 755
}
notice ($ambari_role_prefix)
$files = get_files ($hadoop_conf_dir, $::hadoop_stack_conf, $ambari_role_name)
@@ -104,7 +122,10 @@ class hadoop {
/* Create config files for each category */
create_config_file {$files:
conf_map => $::hadoop_stack_conf[$title],
- require => [Package["hadoop"]]
+ require => [Package["hadoop"]],
+ owner => $user,
+ group => $group,
+ mode => 644
}
package { ["hadoop-doc", "hadoop-source", "hadoop-debuginfo",
@@ -114,18 +135,24 @@ class hadoop {
}
}
- define create_config_file ($conf_map) {
+ define create_config_file ($conf_map, $owner, $group, $mode) {
$category = get_category_name ($title)
$conf_category_map = $conf_map[$category]
if $category == 'hadoop-env.sh' {
file {"$title":
ensure => present,
content => template('hadoop/config_env.erb'),
+ owner => $owner,
+ group => $group,
+ mode => 755
}
} else {
file {"$title":
ensure => present,
content => template('hadoop/config_properties.erb'),
+ owner => $owner,
+ group => $group,
+ mode => $mode
}
}
}