You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/04/01 17:49:19 UTC

[3/3] git commit: AMBARI-5245. gmond.master.conf files are generated by Ganglia Server (dlysnichenko)

AMBARI-5245. gmond.master.conf files are generated by Ganglia Server (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d2e94af
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d2e94af
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d2e94af

Branch: refs/heads/trunk
Commit: 8d2e94af8ee30984828e4cc39f45013a108e0958
Parents: 0efe870
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Apr 1 18:48:08 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Apr 1 18:49:06 2014 +0300

----------------------------------------------------------------------
 .../GANGLIA/package/scripts/ganglia_monitor.py  | 120 +++-
 .../GANGLIA/package/scripts/ganglia_server.py   |  73 +-
 .../services/GANGLIA/package/scripts/params.py  |   1 +
 .../GANGLIA/package/scripts/ganglia_monitor.py  | 141 +++-
 .../GANGLIA/package/scripts/ganglia_server.py   | 109 +--
 .../services/GANGLIA/package/scripts/params.py  |   1 +
 .../1.3.2/GANGLIA/test_ganglia_monitor.py       | 647 ++++++------------
 .../stacks/1.3.2/GANGLIA/test_ganglia_server.py | 446 +++----------
 .../1.3.2/configs/default.non_gmetad_host.json  | 493 ++++++++++++++
 .../2.0.6/GANGLIA/test_ganglia_monitor.py       | 585 ++++++----------
 .../stacks/2.0.6/GANGLIA/test_ganglia_server.py | 399 +++--------
 .../python/stacks/2.0.6/configs/default.json    |   2 +-
 .../2.0.6/configs/default.non_gmetad_host.json  | 660 +++++++++++++++++++
 .../2.1/STORM/test_storm_rest_api_service.py    |   1 -
 .../src/test/python/stacks/utils/RMFTestCase.py |  35 +-
 15 files changed, 1992 insertions(+), 1721 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py
index 8c63b23..2ab3a3c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py
@@ -73,6 +73,33 @@ class GangliaMonitor(Script):
 
     ganglia.config()
 
+    self.generate_slave_configs()
+
+    Directory(path.join(params.ganglia_dir, "conf.d"),
+              owner="root",
+              group=params.user_group
+    )
+
+    File(path.join(params.ganglia_dir, "conf.d/modgstatus.conf"),
+         owner="root",
+         group=params.user_group
+    )
+    File(path.join(params.ganglia_dir, "conf.d/multicpu.conf"),
+         owner="root",
+         group=params.user_group
+    )
+    File(path.join(params.ganglia_dir, "gmond.conf"),
+         owner="root",
+         group=params.user_group
+    )
+
+    if params.is_ganglia_server_host:
+      self.generate_master_configs()
+
+
+  def generate_slave_configs(self):
+    import params
+
     if params.is_namenode_master:
       generate_daemon("gmond",
                       name = "HDPNameNode",
@@ -128,32 +155,79 @@ class GangliaMonitor(Script):
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
- 
-                      
+
     if params.pure_slave:
       generate_daemon("gmond",
-                    name = "HDPSlaves",
-                    role = "monitor",
-                    owner = "root",
-                    group = params.user_group)                  
+                      name = "HDPSlaves",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
 
-    Directory(path.join(params.ganglia_dir, "conf.d"),
-              owner="root",
-              group=params.user_group
-    )
 
-    File(path.join(params.ganglia_dir, "conf.d/modgstatus.conf"),
-         owner="root",
-         group=params.user_group
-    )
-    File(path.join(params.ganglia_dir, "conf.d/multicpu.conf"),
-         owner="root",
-         group=params.user_group
-    )
-    File(path.join(params.ganglia_dir, "gmond.conf"),
-         owner="root",
-         group=params.user_group
-    )
+  def generate_master_configs(self):
+    import params
+
+    if params.has_namenodes:
+      generate_daemon("gmond",
+                      name = "HDPNameNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_jobtracker:
+      generate_daemon("gmond",
+                      name = "HDPJobTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_masters:
+      generate_daemon("gmond",
+                      name = "HDPHBaseMaster",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_historyserver:
+      generate_daemon("gmond",
+                      name = "HDPHistoryServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_slaves:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_rs:
+      generate_daemon("gmond",
+                      name = "HDPHBaseRegionServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    generate_daemon("gmond",
+                    name = "HDPSlaves",
+                    role = "server",
+                    owner = "root",
+                    group = params.user_group)
 
 
   def chkconfigOff(self):
@@ -165,4 +239,4 @@ class GangliaMonitor(Script):
 
 
 if __name__ == "__main__":
-  GangliaMonitor().execute()
\ No newline at end of file
+  GangliaMonitor().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
index 030a627..54541b5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py
@@ -58,75 +58,12 @@ class GangliaServer(Script):
 
     ganglia.groups_and_users()
     ganglia.config()
-
-    if params.has_namenodes:
-      generate_daemon("gmond",
-                      name = "HDPNameNode",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_jobtracker:
-      generate_daemon("gmond",
-                      name = "HDPJobTracker",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_hbase_masters:
-      generate_daemon("gmond",
-                      name = "HDPHBaseMaster",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_historyserver:
-      generate_daemon("gmond",
-                      name = "HDPHistoryServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_slaves:
-      generate_daemon("gmond",
-                      name = "HDPDataNode",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_tasktracker:
-      generate_daemon("gmond",
-                      name = "HDPTaskTracker",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_hbase_rs:
-      generate_daemon("gmond",
-                      name = "HDPHBaseRegionServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_flume:
-      generate_daemon("gmond",
-                      name = "HDPFlumeServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
   
-    if params.ganglia_server_host == params.hostname:
-      generate_daemon("gmetad",
-                      name = "gmetad",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-                      
-      generate_daemon("gmond",
-          name = "HDPSlaves",
-          role = "server",
-          owner = "root",
-          group = params.user_group)
+    generate_daemon("gmetad",
+                    name = "gmetad",
+                    role = "server",
+                    owner = "root",
+                    group = params.user_group)
 
     change_permission()
     server_files()

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index 65d5e66..de9f5be 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -56,6 +56,7 @@ is_slave = hostname in slave_hosts
 is_tasktracker = hostname in tt_hosts
 is_hbase_rs = hostname in hbase_rs_hosts
 is_flume = hostname in flume_hosts
+is_ganglia_server_host = (hostname == ganglia_server_host)
 
 has_namenodes = not len(namenode_host) == 0
 has_jobtracker = not len(jtnode_host) == 0

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py
index f257f83..d3f097f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py
@@ -73,6 +73,33 @@ class GangliaMonitor(Script):
 
     ganglia.config()
 
+    self.generate_slave_configs()
+
+    Directory(path.join(params.ganglia_dir, "conf.d"),
+              owner="root",
+              group=params.user_group
+    )
+
+    File(path.join(params.ganglia_dir, "conf.d/modgstatus.conf"),
+         owner="root",
+         group=params.user_group
+    )
+    File(path.join(params.ganglia_dir, "conf.d/multicpu.conf"),
+         owner="root",
+         group=params.user_group
+    )
+    File(path.join(params.ganglia_dir, "gmond.conf"),
+         owner="root",
+         group=params.user_group
+    )
+
+    if params.is_ganglia_server_host:
+      self.generate_master_configs()
+
+
+  def generate_slave_configs(self):
+    import params
+
     if params.is_namenode_master:
       generate_daemon("gmond",
                       name = "HDPNameNode",
@@ -163,23 +190,105 @@ class GangliaMonitor(Script):
                       group = params.user_group)
 
 
-    Directory(path.join(params.ganglia_dir, "conf.d"),
-              owner="root",
-              group=params.user_group
-    )
+  def generate_master_configs(self):
+    import params
 
-    File(path.join(params.ganglia_dir, "conf.d/modgstatus.conf"),
-         owner="root",
-         group=params.user_group
-    )
-    File(path.join(params.ganglia_dir, "conf.d/multicpu.conf"),
-         owner="root",
-         group=params.user_group
-    )
-    File(path.join(params.ganglia_dir, "gmond.conf"),
-         owner="root",
-         group=params.user_group
-    )
+    if params.has_namenodes:
+      generate_daemon("gmond",
+                      name = "HDPNameNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_jobtracker:
+      generate_daemon("gmond",
+                      name = "HDPJobTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_masters:
+      generate_daemon("gmond",
+                      name = "HDPHBaseMaster",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_resourcemanager:
+      generate_daemon("gmond",
+                      name = "HDPResourceManager",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_nodemanager:
+      generate_daemon("gmond",
+                      name = "HDPNodeManager",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_historyserver:
+      generate_daemon("gmond",
+                      name = "HDPHistoryServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_slaves:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_rs:
+      generate_daemon("gmond",
+                      name = "HDPHBaseRegionServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_nimbus_server:
+      generate_daemon("gmond",
+                      name = "HDPNimbus",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_supervisor_server:
+      generate_daemon("gmond",
+                      name = "HDPSupervisor",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_journalnode:
+      generate_daemon("gmond",
+                      name = "HDPJournalNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    generate_daemon("gmond",
+                    name = "HDPSlaves",
+                    role = "server",
+                    owner = "root",
+                    group = params.user_group)
 
 
   def chkconfigOff(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
index 2cf8e7b..44eb1d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
@@ -59,110 +59,11 @@ class GangliaServer(Script):
     ganglia.groups_and_users()
     ganglia.config()
 
-    if params.has_namenodes:
-      generate_daemon("gmond",
-                      name = "HDPNameNode",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_jobtracker:
-      generate_daemon("gmond",
-                      name = "HDPJobTracker",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_hbase_masters:
-      generate_daemon("gmond",
-                      name = "HDPHBaseMaster",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_resourcemanager:
-      generate_daemon("gmond",
-                      name = "HDPResourceManager",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_nodemanager:
-      generate_daemon("gmond",
-                      name = "HDPNodeManager",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_historyserver:
-      generate_daemon("gmond",
-                      name = "HDPHistoryServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_slaves:
-      generate_daemon("gmond",
-                      name = "HDPDataNode",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_tasktracker:
-      generate_daemon("gmond",
-                      name = "HDPTaskTracker",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_hbase_rs:
-      generate_daemon("gmond",
-                      name = "HDPHBaseRegionServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_nimbus_server:
-      generate_daemon("gmond",
-                      name = "HDPNimbus",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_supervisor_server:
-      generate_daemon("gmond",
-                      name = "HDPSupervisor",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-
-    if params.has_flume:
-      generate_daemon("gmond",
-                      name = "HDPFlumeServer",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-
-    if params.has_journalnode:
-      generate_daemon("gmond",
-                      name = "HDPJournalNode",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-                                
-    if params.ganglia_server_host == params.hostname:
-      generate_daemon("gmetad",
-                      name = "gmetad",
-                      role = "server",
-                      owner = "root",
-                      group = params.user_group)
-                      
-      generate_daemon("gmond",
-          name = "HDPSlaves",
-          role = "server",
-          owner = "root",
-          group = params.user_group)
+    generate_daemon("gmetad",
+                    name = "gmetad",
+                    role = "server",
+                    owner = "root",
+                    group = params.user_group)
 
     change_permission()
     server_files()

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index d7f6e41..cefe7fd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -66,6 +66,7 @@ is_tasktracker = hostname in tt_hosts
 is_nodemanager = hostname in nm_hosts
 is_hbase_rs = hostname in hbase_rs_hosts
 is_flume = hostname in flume_hosts
+is_ganglia_server_host = (hostname == ganglia_server_host)
 is_jn_host = hostname in jn_hosts
 is_nimbus_host = hostname in nimbus_server_hosts
 is_supervisor_host = hostname in supervisor_server_hosts

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
index 85fceca..d969263 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
@@ -29,529 +29,272 @@ class TestGangliaMonitor(RMFTestCase):
                        command="configure",
                        config_file="default.json"
                       )
-    self.assertResourceCalled('Group', 'hadoop',
-                              )
-    self.assertResourceCalled('Group', 'nobody',
-                              )
-    self.assertResourceCalled('Group', 'nobody',
-                              )
-    self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],
-                              )
-    self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],
-                              )
-    self.assertResourceCalled('Directory', '/etc/ganglia/hdp',
-                              owner = 'root',
-                              group = 'hadoop',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-                              content = StaticFile('gmetad.init'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-                              content = StaticFile('gmond.init'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-                              content = StaticFile('checkGmond.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-                              content = StaticFile('checkRrdcached.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-                              content = StaticFile('gmetadLib.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-                              content = StaticFile('gmondLib.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-                              content = StaticFile('rrdcachedLib.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
-                              content = StaticFile('setupGanglia.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
-                              content = StaticFile('startGmetad.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-                              content = StaticFile('startGmond.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
-                              content = StaticFile('startRrdcached.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-                              content = StaticFile('stopGmetad.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-                              content = StaticFile('stopGmond.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-                              content = StaticFile('stopRrdcached.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-                              content = StaticFile('teardownGanglia.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
-                              owner = 'root',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/modgstatus.conf',
-                              owner = 'root',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/multicpu.conf',
-                              owner = 'root',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/ganglia/gmond.conf',
-                              owner = 'root',
-                              group = 'hadoop',
-                              )
+    self.assert_configure_default()
+    self.assert_gmond_master_conf_generated()
     self.assertNoMoreResources()
 
+
+  def test_configure_non_gmetad_node(self):
+    self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
+                       classname="GangliaMonitor",
+                       command="configure",
+                       config_file="default.non_gmetad_host.json",
+    )
+    self.assert_configure_default()
+    self.assertNoMoreResources()
+
+
   def test_start_default(self):
     self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
                        classname="GangliaMonitor",
                        command="start",
-                       config_file="default.json"
+                       config_file="default.json",
+    )
+    self.assert_configure_default()
+    self.assert_gmond_master_conf_generated()
+    self.assertResourceCalled('Execute', 'service hdp-gmond start >> /tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  2>&1',
+        path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
+    )
+    self.assertNoMoreResources()
+
+
+  def test_stop_default(self):
+    self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
+                       classname="GangliaMonitor",
+                       command="stop",
+                       config_file="default.json",
+    )
+    self.assertResourceCalled('Execute', 'service hdp-gmond stop >> /tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  2>&1',
+                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
+                              )
+    self.assertNoMoreResources()
+
+
+  def test_install_default(self):
+    self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
+                       classname="GangliaMonitor",
+                       command="install",
+                       config_file="default.json",
+    )
+    self.assert_configure_default()
+    self.assert_gmond_master_conf_generated()
+    self.assertResourceCalled('Execute', 'chkconfig gmond off',
+                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
+                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
     )
-    self.assertResourceCalled(
-        'Group', 'hadoop',
-        )
-    self.assertResourceCalled(
-        'Group', 'nobody',
-        )
-    self.assertResourceCalled(
-        'Group', 'nobody',
-        )
-    self.assertResourceCalled(
-        'User', 'nobody',
+    self.assertNoMoreResources()
+
+
+  def assert_configure_default(self):
+    self.assertResourceCalled('Group', 'hadoop',
+    )
+    self.assertResourceCalled('Group', 'nobody',
+    )
+    self.assertResourceCalled('Group', 'nobody',
+    )
+    self.assertResourceCalled('User', 'nobody',
         groups = [u'nobody'],
-        )
-    self.assertResourceCalled(
-        'User', 'nobody',
+    )
+    self.assertResourceCalled('User', 'nobody',
         groups = [u'nobody'],
-        )
-    self.assertResourceCalled(
-        'Directory', '/etc/ganglia/hdp',
+    )
+    self.assertResourceCalled('Directory', '/etc/ganglia/hdp',
         owner = 'root',
         group = 'hadoop',
         recursive = True,
-        )
-    self.assertResourceCalled(
-        'Directory', '/usr/libexec/hdp/ganglia',
+    )
+    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
         owner = 'root',
         group = 'root',
         recursive = True,
-        )
-    self.assertResourceCalled(
-        'File', '/etc/init.d/hdp-gmetad',
+    )
+    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
         content = StaticFile('gmetad.init'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/etc/init.d/hdp-gmond',
+    )
+    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
         content = StaticFile('gmond.init'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
         content = StaticFile('checkGmond.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
         content = StaticFile('checkRrdcached.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
         content = StaticFile('gmetadLib.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
         content = StaticFile('gmondLib.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
         content = StaticFile('rrdcachedLib.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
         content = StaticFile('setupGanglia.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
         content = StaticFile('startGmetad.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/startGmond.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
         content = StaticFile('startGmond.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
         content = StaticFile('startRrdcached.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
         content = StaticFile('stopGmetad.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
         content = StaticFile('stopGmond.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
         content = StaticFile('stopRrdcached.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
+    )
+    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
         content = StaticFile('teardownGanglia.sh'),
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
+    )
+    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
         owner = 'root',
         template_tag = None,
         group = 'root',
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
+    )
+    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
         owner = 'root',
         template_tag = None,
         group = 'root',
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
+    )
+    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
         owner = 'root',
         template_tag = None,
         group = 'root',
         mode = 0755,
-        )
-    self.assertResourceCalled(
-        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -o root -g hadoop',
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -o root -g hadoop',
         path = ['/usr/libexec/hdp/ganglia',
-                '/usr/sbin',
-                '/sbin:/usr/local/bin',
-                '/bin',
-                '/usr/bin'],
-        )
-    self.assertResourceCalled(
-        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -o root -g hadoop',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -o root -g hadoop',
         path = ['/usr/libexec/hdp/ganglia',
-                '/usr/sbin',
-                '/sbin:/usr/local/bin',
-                '/bin',
-                '/usr/bin'],
-        )
-    self.assertResourceCalled(
-        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -o root -g hadoop',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -o root -g hadoop',
         path = ['/usr/libexec/hdp/ganglia',
-                '/usr/sbin',
-                '/sbin:/usr/local/bin',
-                '/bin',
-                '/usr/bin'],
-        )
-    self.assertResourceCalled(
-        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -o root -g hadoop',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -o root -g hadoop',
         path = ['/usr/libexec/hdp/ganglia',
-                '/usr/sbin',
-                '/sbin:/usr/local/bin',
-                '/bin',
-                '/usr/bin'],
-        )
-    self.assertResourceCalled(
-        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -o root -g hadoop',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -o root -g hadoop',
         path = ['/usr/libexec/hdp/ganglia',
-                '/usr/sbin',
-                '/sbin:/usr/local/bin',
-                '/bin',
-                '/usr/bin'],
-        )
-    self.assertResourceCalled(
-        'Directory', '/etc/ganglia/conf.d',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
         owner = 'root',
         group = 'hadoop',
-        )
-    self.assertResourceCalled(
-        'File', '/etc/ganglia/conf.d/modgstatus.conf',
+    )
+    self.assertResourceCalled('File', '/etc/ganglia/conf.d/modgstatus.conf',
         owner = 'root',
         group = 'hadoop',
-        )
-    self.assertResourceCalled(
-        'File', '/etc/ganglia/conf.d/multicpu.conf',
+    )
+    self.assertResourceCalled('File', '/etc/ganglia/conf.d/multicpu.conf',
         owner = 'root',
         group = 'hadoop',
-        )
-    self.assertResourceCalled(
-        'File', '/etc/ganglia/gmond.conf',
+    )
+    self.assertResourceCalled('File', '/etc/ganglia/gmond.conf',
         owner = 'root',
         group = 'hadoop',
-        )
-    self.assertResourceCalled(
-        'Execute', 'service hdp-gmond start >> /tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  2>&1',
-        path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-        )
-    self.assertNoMoreResources()
-
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="stop",
-                       config_file="default.json"
     )
-    self.assertResourceCalled('Execute', 'service hdp-gmond stop >> /tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  2>&1',
-                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              )
-    self.assertNoMoreResources()
 
 
-  def test_install_default(self):
-    self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="install",
-                       config_file="default.json"
+  def assert_gmond_master_conf_generated(self):
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPNameNode -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
     )
-    self.assertResourceCalled('Group', 'hadoop',)
-
-    self.assertResourceCalled('Group', 'nobody',)
-
-    self.assertResourceCalled('Group', 'nobody',)
-
-    self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],)
-
-    self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],)
-
-    self.assertResourceCalled('Directory', '/etc/ganglia/hdp',
-                              owner = 'root',
-                              group = 'hadoop',
-                              recursive = True,)
-
-    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,)
-
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-                              content = StaticFile('gmetad.init'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-                              content = StaticFile('gmond.init'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-                              content = StaticFile('checkGmond.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-                              content = StaticFile('checkRrdcached.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-                              content = StaticFile('gmetadLib.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-                              content = StaticFile('gmondLib.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-                              content = StaticFile('rrdcachedLib.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
-                              content = StaticFile('setupGanglia.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
-                              content = StaticFile('startGmetad.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-                              content = StaticFile('startGmond.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
-                              content = StaticFile('startRrdcached.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-                              content = StaticFile('stopGmetad.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-                              content = StaticFile('stopGmond.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-                              content = StaticFile('stopRrdcached.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-                              content = StaticFile('teardownGanglia.sh'),
-                              mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],)
-
-    self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
-                              owner = 'root',
-                              group = 'hadoop',)
-
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/modgstatus.conf',
-                              owner = 'root',
-                              group = 'hadoop',)
-
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/multicpu.conf',
-                              owner = 'root',
-                              group = 'hadoop',)
-
-    self.assertResourceCalled('File', '/etc/ganglia/gmond.conf',
-                              owner = 'root',
-                              group = 'hadoop',)
-
-    self.assertResourceCalled('Execute', 'chkconfig gmond off',
-                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
-
-    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
-                              path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
-    self.assertNoMoreResources()
\ No newline at end of file
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseMaster -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -m -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e94af/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
index db48ceb..bc5170c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
@@ -29,7 +29,7 @@ class TestGangliaServer(RMFTestCase):
     self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
                        classname="GangliaServer",
                        command="configure",
-                       config_file="default.json"
+                       config_file="default.json",
     )
     self.assert_configure_default()
     self.assertNoMoreResources()
@@ -38,7 +38,7 @@ class TestGangliaServer(RMFTestCase):
     self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
                        classname="GangliaServer",
                        command="start",
-                       config_file="default.json"
+                       config_file="default.json",
     )
     self.assert_configure_default()
     self.assertResourceCalled('Execute', 'service hdp-gmetad start >> /tmp/gmetad.log  2>&1 ; /bin/ps auwx | /bin/grep [g]metad  >> /tmp/gmetad.log  2>&1',
@@ -52,7 +52,7 @@ class TestGangliaServer(RMFTestCase):
     self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
                        classname="GangliaServer",
                        command="stop",
-                       config_file="default.json"
+                       config_file="default.json",
     )
     self.assertResourceCalled('Execute', 'service hdp-gmetad stop >> /tmp/gmetad.log  2>&1 ; /bin/ps auwx | /bin/grep [g]metad  >> /tmp/gmetad.log  2>&1',
                               path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
@@ -66,376 +66,132 @@ class TestGangliaServer(RMFTestCase):
     self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
                        classname="GangliaServer",
                        command="install",
-                       config_file="default.json"
+                       config_file="default.json",
     )
-    self.assertResourceCalled('Group', 'hadoop',)
-
-    self.assertResourceCalled('Group', 'nobody',)
-
-    self.assertResourceCalled('Group', 'nobody',)
-
-    self.assertResourceCalled('User', 'nobody',
-                          groups = [u'nobody'],)
-
-    self.assertResourceCalled('User', 'nobody',
-                          groups = [u'nobody'],)
-
-    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-                          owner = 'root',
-                          group = 'root',
-                          recursive = True,)
-
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-                          content = StaticFile('gmetad.init'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-                          content = StaticFile('gmond.init'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-                          content = StaticFile('checkGmond.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-                          content = StaticFile('checkRrdcached.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-                          content = StaticFile('gmetadLib.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-                          content = StaticFile('gmondLib.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-                          content = StaticFile('rrdcachedLib.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
-                          content = StaticFile('setupGanglia.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
-                          content = StaticFile('startGmetad.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-                          content = StaticFile('startGmond.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
-                          content = StaticFile('startRrdcached.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-                          content = StaticFile('stopGmetad.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-                          content = StaticFile('stopGmond.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-                          content = StaticFile('stopRrdcached.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-                          content = StaticFile('teardownGanglia.sh'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-                          owner = 'root',
-                          template_tag = None,
-                          group = 'root',
-                          mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-                          owner = 'root',
-                          template_tag = None,
-                          group = 'root',
-                          mode = 0755,)
-
-    self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
-                          owner = 'root',
-                          template_tag = None,
-                          group = 'root',
-                          mode = 0755,)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPNameNode -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseMaster -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -t -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -m -o root -g hadoop',
-                          path = ['/usr/libexec/hdp/ganglia',
-                                  '/usr/sbin',
-                                  '/sbin:/usr/local/bin',
-                                  '/bin',
-                                  '/usr/bin'],)
-
-    self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
-                          owner = 'nobody',
-                          recursive = True,
-                          mode = 0777,)
-
-    self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
-                          recursive = True,)
-
-    self.assertResourceCalled('File', '/srv/www/cgi-bin/rrd.py',
-                          content = StaticFile('rrd.py'),
-                          mode = 0755,)
-
-    self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds',
-                              action = ['delete'],
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds',
-                              owner = 'nobody',
-                              group = 'nobody',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
-                          owner = 'root',
-                          group = 'hadoop',)
-
-    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
-                          path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
-    self.assertNoMoreResources()
+    self.test_configure_default()
 
   def assert_configure_default(self):
-    self.assertResourceCalled('Group', 'hadoop',
-                              )
-    self.assertResourceCalled('Group', 'nobody',
-                              )
-    self.assertResourceCalled('Group', 'nobody',
-                              )
+    self.assertResourceCalled('Group', 'hadoop')
+    self.assertResourceCalled('Group', 'nobody')
+    self.assertResourceCalled('Group', 'nobody')
     self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],
-                              )
+        groups = [u'nobody'],
+    )
     self.assertResourceCalled('User', 'nobody',
-                              groups = [u'nobody'],
-                              )
+        groups = [u'nobody'],
+    )
     self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
+        owner = 'root',
+        group = 'root',
+        recursive = True,
+    )
     self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-                              content = StaticFile('gmetad.init'),
-                              mode = 0755,
-                              )
+        content = StaticFile('gmetad.init'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-                              content = StaticFile('gmond.init'),
-                              mode = 0755,
-                              )
+        content = StaticFile('gmond.init'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-                              content = StaticFile('checkGmond.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('checkGmond.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-                              content = StaticFile('checkRrdcached.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('checkRrdcached.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-                              content = StaticFile('gmetadLib.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('gmetadLib.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-                              content = StaticFile('gmondLib.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('gmondLib.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-                              content = StaticFile('rrdcachedLib.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('rrdcachedLib.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/setupGanglia.sh',
-                              content = StaticFile('setupGanglia.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('setupGanglia.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmetad.sh',
-                              content = StaticFile('startGmetad.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('startGmetad.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-                              content = StaticFile('startGmond.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('startGmond.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startRrdcached.sh',
-                              content = StaticFile('startRrdcached.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('startRrdcached.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-                              content = StaticFile('stopGmetad.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('stopGmetad.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-                              content = StaticFile('stopGmond.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('stopGmond.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-                              content = StaticFile('stopRrdcached.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('stopRrdcached.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-                              content = StaticFile('teardownGanglia.sh'),
-                              mode = 0755,
-                              )
+        content = StaticFile('teardownGanglia.sh'),
+        mode = 0755,
+    )
     self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
+        owner = 'root',
+        template_tag = None,
+        group = 'root',
+        mode = 0755,
+    )
     self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
+        owner = 'root',
+        template_tag = None,
+        group = 'root',
+        mode = 0755,
+    )
     self.assertResourceCalled('TemplateConfig', '/usr/libexec/hdp/ganglia/gangliaLib.sh',
-                              owner = 'root',
-                              template_tag = None,
-                              group = 'root',
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPNameNode -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseMaster -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
+        owner = 'root',
+        template_tag = None,
+        group = 'root',
+        mode = 0755,
+    )
     self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -t -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
-    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -m -o root -g hadoop',
-                              path = ['/usr/libexec/hdp/ganglia',
-                                      '/usr/sbin',
-                                      '/sbin:/usr/local/bin',
-                                      '/bin',
-                                      '/usr/bin'],
-                              )
+        path = ['/usr/libexec/hdp/ganglia',
+           '/usr/sbin',
+           '/sbin:/usr/local/bin',
+           '/bin',
+           '/usr/bin'],
+    )
     self.assertResourceCalled('Directory', '/var/lib/ganglia/dwoo',
-                              owner = 'nobody',
-                              recursive = True,
-                              mode = 0777,
-                              )
+        owner = 'nobody',
+        recursive = True,
+        mode = 0777,
+    )
     self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
-                              recursive = True,
-                              )
+        recursive = True,
+    )
     self.assertResourceCalled('File', '/srv/www/cgi-bin/rrd.py',
-                              content = StaticFile('rrd.py'),
-                              mode = 0755,
-                              )
+        content = StaticFile('rrd.py'),
+        mode = 0755,
+    )
     self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds',
-                              action = ['delete'],
-                              )
+        action = ['delete'],
+    )
     self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds',
-                              owner = 'nobody',
-                              group = 'nobody',
-                              recursive = True,
-                              mode = 0755,
-                              )
+        owner = 'nobody',
+        group = 'nobody',
+        recursive = True,
+        mode = 0755,
+    )
     self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
-                              owner = 'root',
-                              group = 'hadoop',
-                              )
\ No newline at end of file
+        owner = 'root',
+        group = 'hadoop',
+    )