svn commit: r1338520 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp hmc/puppet/modules/hdp-ganglia/manifests/params.pp hmc/puppet/modules/hdp-ganglia/manifests/server.pp

[vg...@apache.org]

Author: vgogate
Date: Tue May 15 03:11:21 2012
New Revision: 1338520

URL: http://svn.apache.org/viewvc?rev=1338520&view=rev
Log:
AMBARI-235. Ordering problem when using hdp-ganglia::monitor_and_server by Richard Pelavin

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1338520&r1=1338519&r2=1338520&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue May 15 03:11:21 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-235. Ordering problem when using hdp-ganglia::monitor_and_server (Richard Pelavin by vgogate)
+
   AMBARI-234. Typo in javascript (vikran Dixit via vgogate)
 
   AMBARI-233. Add Oozie link to HMC dashboard (vgogate)

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp?rev=1338520&r1=1338519&r2=1338520&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/monitor.pp Tue May 15 03:11:21 2012
@@ -8,15 +8,17 @@ class hdp-ganglia::monitor(
   if ($service_state == 'no_op') {
   } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
     if ($monitor_and_server_single_node == false) {
-      include hdp-ganglia #note: includes the common package ganglia-monitor
+      #note: includes the common package ganglia-monitor
+      include hdp-ganglia 
       class { 'hdp-ganglia::config': 
         ganglia_server_host => $ganglia_server_host,
         require             => Class['hdp-ganglia'],
         before              => Class['hdp-ganglia::monitor::config-gen']
       }
     }
-
-    class { 'hdp-ganglia::monitor::config-gen': }
+    anchor {'hdp-ganglia::monitor::begin' : } ->
+    class { 'hdp-ganglia::monitor::config-gen': } ->
+    anchor {'hdp-ganglia::monitor::end' : } 
 
     if ($monitor_and_server_single_node == false) {
       Class['hdp-ganglia'] -> Class['hdp-ganglia::monitor::config-gen']
@@ -41,7 +43,7 @@ class hdp-ganglia::monitor::config-gen()
   if ($hdp-ganglia::params::omit_namenode != true) {
     hdp-ganglia::config::generate_monitor { 'HDPNameNode':}
   }
-  if ($hdp-ganglia::params::omit_job_tracker != true) {
+  if ($hdp-ganglia::params::omit_jobtracker != true) {
     hdp-ganglia::config::generate_monitor { 'HDPJobTracker':}
   }
   if ($hdp-ganglia::params::omit_hbase_master != true) {

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp?rev=1338520&r1=1338519&r2=1338520&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/params.pp Tue May 15 03:11:21 2012
@@ -13,7 +13,7 @@ class hdp-ganglia::params() inherits hdp
 
 
   $omit_hbase_master = hdp_default("omit_hbase_master",hdp_is_empty($hdp::params::hbase_master_host))
-  $omit_job_tracker = hdp_default("omit_job_tracker",hdp_is_empty($hdp::params::jtnode_host))
+  $omit_jobtracker = hdp_default("omit_jobtracker",hdp_is_empty($hdp::params::jtnode_host))
   $omit_namenode = hdp_default("omit_namenode",hdp_is_empty($hdp::params::namenode_host))
   $omit_slaves = hdp_default("omit_slaves",hdp_is_empty($hdp::params::slave_hosts))
 }
\ No newline at end of file

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1338520&r1=1338519&r2=1338520&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp Tue May 15 03:11:21 2012
@@ -24,7 +24,7 @@ class hdp-ganglia::server(
         ganglia_service => 'gmond'
       }
     }
-    if ($hdp-ganglia::params::omit_job_tracker != true) {
+    if ($hdp-ganglia::params::omit_jobtracker != true) {
       hdp-ganglia::config::generate_server { 'HDPJobTracker':
         ganglia_service => 'gmond'
       }
@@ -56,9 +56,9 @@ class hdp-ganglia::server(
       Class['hdp-ganglia'] -> Class['hdp-ganglia::server::packages']
     }
 
-    Class['hdp-ganglia::server::packages'] -> Class['hdp-ganglia::config'] -> 
-      Hdp-ganglia::Config::Generate_server<||> -> Class['hdp-ganglia::server::services']
-  } else {
+    anchor{'hdp-ganglia::server::begin':} -> Class['hdp-ganglia::server::packages'] -> Class['hdp-ganglia::config'] -> 
+      Hdp-ganglia::Config::Generate_server<||> -> Class['hdp-ganglia::server::services'] -> anchor{'hdp-ganglia::server::end':}
+   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }
 }