Author: smohanty
Date: Wed May 1 18:53:51 2013
New Revision: 1478142
URL: http://svn.apache.org/r1478142
Log:
AMBARI-2065. Hadoop group customization does not take affect. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 1 18:53:51 2013
@@ -823,6 +823,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2065. Hadoop group customization does not take affect. (smohanty)
+
AMBARI-2062. Service versions shown during install dont match installed
versions. (smohanty)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
Wed May 1 18:53:51 2013
@@ -226,9 +226,13 @@ class hdp-hadoop(
group => $hdp::params::user_group
}
- hdp::user{ $hdfs_user:}
+ hdp::user{ $hdfs_user:
+ groups => [$hdp::params::user_group, $hdfs_user]
+ }
if ($hdfs_user != $mapred_user) {
- hdp::user { $mapred_user:}
+ hdp::user { $mapred_user:
+ groups => [$hdp::params::user_group, $mapred_user]
+ }
}
$logdirprefix = $hdp-hadoop::params::hdfs_log_dir_prefix
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
Wed May 1 18:53:51 2013
@@ -60,7 +60,7 @@ class hdp-hadoop::namenode(
keytabfile => 'spnego.service.keytab',
owner => $hdp-hadoop::params::hdfs_user,
mode => '0440',
- group => 'hadoop'
+ group => $hdp::params::user_group
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp
Wed May 1 18:53:51 2013
@@ -52,7 +52,7 @@ class hdp-hadoop::snamenode(
keytabfile => 'spnego.service.keytab',
owner => $hdp-hadoop::params::hdfs_user,
mode => '0440',
- group => 'hadoop'
+ group => $hdp::params::user_group
}
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb
Wed May 1 18:53:51 2013
@@ -16,5 +16,5 @@
# * limitations under the License.
# */
mapred.local.dir=<%=scope.function_hdp_template_var("mapred_local_dir")%>
-mapreduce.tasktracker.group=hadoop
+mapreduce.tasktracker.group=<%=scope.function_hdp_default(["mapred-site/mapreduce.tasktracker.group","hadoop"])%>
hadoop.log.dir=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/<%=scope.function_hdp_template_var("mapred_user")%>
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
Wed May 1 18:53:51 2013
@@ -81,7 +81,9 @@ class hdp-hbase(
} else {
hdp::package { 'hbase': }
- hdp::user{ $hbase_user:}
+ hdp::user{ $hbase_user:
+ groups => [$hdp::params::user_group, $hbase_user]
+ }
hdp::directory { $config_dir:
service_state => $service_state,
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
Wed May 1 18:53:51 2013
@@ -45,7 +45,7 @@ class hdp-oozie::server(
keytabdst => "${$keytab_path}/spnego.service.keytab",
keytabfile => 'spnego.service.keytab',
owner => $hdp::params::oozie_user,
- group => 'hadoop',
+ group => $hdp::params::user_group,
mode => '0440'
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp?rev=1478142&r1=1478141&r2=1478142&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
Wed May 1 18:53:51 2013
@@ -49,7 +49,7 @@ class hdp-templeton::server(
keytabdst => "${$keytab_path}/spnego.service.keytab",
keytabfile => 'spnego.service.keytab',
owner => $hdp::params::templeton_user,
- group => 'hadoop',
+ group => $hdp::params::user_group,
mode => '0440'
}
}
