svn commit: r1447984 - in /incubator/ambari/trunk: ./ ambari-agent/src/main/puppet/modules/hdp-ganglia/files/ ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/ ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/

[mahadev]

Author: mahadev
Date: Wed Feb 20 01:07:27 2013
New Revision: 1447984

URL: http://svn.apache.org/r1447984
Log:
AMBARI-1439. rrd file location should be read from global config. (Siddharth 
Wagle via mahadev).

Modified:
    incubator/ambari/trunk/CHANGES.txt
    
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
    
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
    
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1447984&r1=1447983&r2=1447984&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 20 01:07:27 2013
@@ -293,6 +293,9 @@ Trunk (unreleased changes):
 
  AMBARI-1448. Enabling stack upgrade via Ambari Server. (mahadev)
 
+ AMBARI-1439. rrd file location should be read from global config. (Siddharth
+ Wagle via mahadev).
+
  BUG FIXES
 
  AMBARI-1445. Redirect to main app page when testMode flag is set True and

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh?rev=1447984&r1=1447983&r2=1447984&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
 Wed Feb 20 01:07:27 2013
@@ -39,7 +39,7 @@ then
     su - ${GMETAD_USER} -c "${RRDCACHED_BIN} -p ${RRDCACHED_PID_FILE} \
              -m 664 -l unix:${RRDCACHED_ALL_ACCESS_UNIX_SOCKET} \
              -m 777 -P FLUSH,STATS,HELP -l 
unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET} \
-             -b /var/lib/ganglia/rrds -B"
+             -b ${RRDCACHED_BASE_DIR} -B"
 
     # Ideally, we'd use ${RRDCACHED_BIN}'s -s ${WEBSERVER_GROUP} option for 
     # this, but it doesn't take sometimes due to a lack of permissions,

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp?rev=1447984&r1=1447983&r2=1447984&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
 Wed Feb 20 01:07:27 2013
@@ -29,4 +29,5 @@ class hdp-ganglia::params() inherits hdp
   $gmond_user = $hdp::params::gmond_user
 
   $webserver_group = hdp_default("hadoop/gangliaEnv/webserver_group","apache")
+  $rrdcached_base_dir = hdp_default("rrdcached_base_dir", 
"/var/lib/ganglia/rrds")
 }

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb?rev=1447984&r1=1447983&r2=1447984&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb
 Wed Feb 20 01:07:27 2013
@@ -22,6 +22,7 @@ cd `dirname ${0}`;
 
 GANGLIA_CONF_DIR=<%=scope.function_hdp_template_var("ganglia_conf_dir")%>;
 
GANGLIA_RUNTIME_DIR=<%=scope.function_hdp_template_var("ganglia_runtime_dir")%>;
+RRDCACHED_BASE_DIR=<%=scope.function_hdp_template_var("rrdcached_base_dir")%>;
 
 # This file contains all the info about each Ganglia Cluster in our Grid.
 GANGLIA_CLUSTERS_CONF_FILE=./gangliaClusters.conf;