From 073c3d1e89e35cad73d4d49fe31a98c7a045ae36 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <jhoblitt@cpan.org>
Date: Thu, 15 Nov 2012 17:45:22 -0700
Subject: [PATCH] stop trying to enforce a ganglia user uid/gid and remove
 ganglia::config

---
 manifests/config.pp | 17 -----------------
 manifests/gmetad.pp |  3 ---
 manifests/params.pp |  4 ----
 3 files changed, 24 deletions(-)
 delete mode 100644 manifests/config.pp

diff --git a/manifests/config.pp b/manifests/config.pp
deleted file mode 100644
index f563b34..0000000
--- a/manifests/config.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class ganglia::config {
-  include ganglia::params
-
-  user {'ganglia':
-#    uid     => $ganglia::params::ganglia_uid,
-    gid     => 'ganglia',
-    comment => 'Ganglia Monitoring System',
-    home    => '/var/lib/ganglia',
-    managehome => false,
-    shell   => '/sbin/nologin',
-    require => Group['ganglia'],
-  }
-
-  group {'ganglia':
-#    gid => $ganglia::params::ganglia_gid,
-  }
-}
diff --git a/manifests/gmetad.pp b/manifests/gmetad.pp
index 346af48..0f8cab6 100644
--- a/manifests/gmetad.pp
+++ b/manifests/gmetad.pp
@@ -5,9 +5,6 @@
   validate_array($clusters)
   validate_string($gridname)
 
-  include ganglia::config
-
-  Class[ 'ganglia::config' ] ->
   class{ 'ganglia::gmetad::config': } ->
   class{ 'ganglia::gmetad::install': } ->
   class{ 'ganglia::gmetad::service': } ->
diff --git a/manifests/params.pp b/manifests/params.pp
index a75d972..55a0da0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -15,8 +15,6 @@
       case $::lsbmajdistrelease {
         # the epel packages change uid/gids + install paths between 5 & 6
         5: {
-          $ganglia_uid = 403
-          $ganglia_gid = 403
           $gmond_service_config = '/etc/gmond.conf'
           $gmond_service_erb    = 'ganglia/gmond.conf.el5.erb'
 
@@ -27,8 +25,6 @@
         # fedora is also part of $::osfamily = redhat so we shouldn't default
         # to failing on el7.x +
         6, default: {
-          $ganglia_uid = 211
-          $ganglia_gid = 211
           $gmond_service_config = '/etc/ganglia/gmond.conf'
           $gmond_service_erb    = 'ganglia/gmond.conf.el6.erb'