You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 03:08:33 UTC
svn commit: r1347248 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/puppet/modules/hdp-hadoop/manifests/init.pp
hmc/puppet/modules/hdp-hbase/manifests/master.pp
hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp
Author: vikram
Date: Thu Jun 7 01:08:33 2012
New Revision: 1347248
URL: http://svn.apache.org/viewvc?rev=1347248&view=rev
Log:
AMBARI-442. Duplicate definition: Class[Hdp-hbase::Regionserver::Enable-ganglia] (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/master.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347248&r1=1347247&r2=1347248&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 01:08:33 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-442 Duplicate definition: Class[Hdp-hbase::Regionserver::Enable-ganglia] (Ramya via Vikram)
+
AMBARI-441. Add ganglia monitor to all the hosts including collector. (Mahadev via Vikram)
AMBARI-440. Keep the touch file for NN format in /var/run rather than /etc/conf. (Mahadev via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1347248&r1=1347247&r2=1347248&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/init.pp Thu Jun 7 01:08:33 2012
@@ -24,11 +24,6 @@ class hdp-hadoop(
$mapred_user = $hdp-hadoop::params::mapred_user
$hdfs_user = $hdp-hadoop::params::hdfs_user
-
- if ($hdp::params::ganglia_enabled == true) {
- include hdp-hadoop::enable-ganglia
- }
-
$hdp::params::component_exists['hdp-hadoop'] = true
anchor{'hdp-hadoop::begin':}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/master.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/master.pp?rev=1347248&r1=1347247&r2=1347248&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/master.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/master.pp Thu Jun 7 01:08:33 2012
@@ -7,9 +7,6 @@ class hdp-hbase::master(
if ($service_state == 'no_op') {
} elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
$hdp::params::service_exists['hdp-hbase::master'] = true
- if ($hdp::params::ganglia_enabled == true) {
- include hdp-hbase::master::enable-ganglia
- }
$hdfs_root_dir = $hdp-hbase::params::hbase_hdfs_root_dir
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp?rev=1347248&r1=1347247&r2=1347248&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hbase/manifests/regionserver.pp Thu Jun 7 01:08:33 2012
@@ -7,9 +7,6 @@ class hdp-hbase::regionserver(
if ($service_state == 'no_op') {
} elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
$hdp::params::service_exists['hdp-hbase::regionserver'] = true
- if ($hdp::params::ganglia_enabled == true) {
- include hdp-hbase::regionserver::enable-ganglia
- }
if ($hdp::params::service_exists['hdp-hbase::master'] != true) {
#adds package, users, directories, and common configs