From 11de076716cd6b82e72efc9b151e18b14013b42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 28 Jul 2011 17:41:12 +0300
Subject: [PATCH] Removed rails packages from puppet server if storeconfigs are
 not used.

---
 puppet/manifests/init.pp | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index c650292..a08ed23 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -196,23 +196,34 @@ class puppet::server::mongrel inherits puppet::client {
     include ::mongrel
     include ldap::client::ruby
 
-    case $operatingsystem {
-        debian,ubuntu: {
-            package { [ "rails",
-                        regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'),
-                        regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'), ]:
-                ensure => installed,
-            }
-        }
-        default: {
-            package { [ "rubygem-rails",
-                        "rubygem-sqlite3-ruby",
-                        "ruby-RRDtool", ]:
-                ensure => installed,
+    if $puppet_storeconfigs != "none" {
+        case $operatingsystem {
+            "debian","ubuntu": {
+                package { [ "rails",
+                            regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'), ]:
+                    ensure => installed,
+                    before => Service["puppetmaster"],
+                }
+            }
+            default: {
+                package { [ "rubygem-rails",
+                            "rubygem-sqlite3-ruby", ]:
+                    ensure => installed,
+                    before => Service["puppetmaster"],
+                }
             }
         }
     }
 
+    package { "ruby-rrd":
+        name   => $operatingsystem ? {
+            debian  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
+            ubuntu  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
+            default => "ruby-RRDtool",
+        },
+        ensure => installed,
+    }
+
     if $puppet_datadir {
         file { "${puppet_datadir}":
             ensure => directory,