Author: swagle
Date: Sat Apr 13 00:52:54 2013
New Revision: 1467533
URL: http://svn.apache.org/r1467533
Log:
AMBARI-1924. Allow for users to customize Ganglia gmetad + gmond user accounts.
(Sumit Mohanty via swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467533&r1=1467532&r2=1467533&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Apr 13 00:52:54 2013
@@ -12,6 +12,9 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-1924. Allow for users to customize Ganglia gmetad + gmond user
+ accounts. (Sumit Mohanty via swagle)
+
AMBARI-1923. Allow for users to customize Nagios user accounts.
(Sumit Mohanty via swagle)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1467533&r1=1467532&r2=1467533&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
Sat Apr 13 00:52:54 2013
@@ -176,6 +176,18 @@ class hdp-ganglia::server::files(
File[$rrd_py_file_path] -> Hdp::Directory_recursive_create[$rrd_files_dir]
-> File[$rrdcached_default_file_dir] ->
Anchor['hdp-ganglia::server::files::end']
}
+ elsif ($rrd_file_owner != $hdp::params::NOBODY_USER) {
+ #owner of rrdcached_default_file_dir is 'nobody' by default
+ #need to change owner to gmetad_user for proper gmetad service start
+
+ hdp::directory { $rrdcached_default_file_dir:
+ owner => $rrd_file_owner,
+ group => $rrd_file_owner,
+ override_owner => true
+ }
+
+ File[$rrd_py_file_path] -> Hdp::Directory[$rrdcached_default_file_dir] ->
Anchor['hdp-ganglia::server::files::end']
+ }
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1467533&r1=1467532&r2=1467533&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Sat Apr 13 00:52:54 2013
@@ -23,6 +23,7 @@ class hdp::params()
##Constants##
$NOTHING='NOTHING'
+ $NOBODY_USER='nobody'
##### global state defaults ####
$cluster_service_state = hdp_default("cluster_service_state","running")