[PATCH] Try an autodisablePuppet fix.

[Ricky Zhou]

---
 manifests/nodes/backup1.fedora.phx.redhat.com.pp   |    2 +-
 .../nodes/proxy1.stg.fedora.phx.redhat.com.pp      |    1 +
 .../nodes/sign-bridge1.fedora.phx.redhat.com.pp    |    2 +-
 .../nodes/sign-vault1.fedora.phx.redhat.com.pp     |    2 +-
 modules/puppet/manifests/init.pp                   |   10 ++++++++--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/manifests/nodes/backup1.fedora.phx.redhat.com.pp b/manifests/nodes/backup1.fedora.phx.redhat.com.pp
index 7f1a1d9..0dbf6bc 100644
--- a/manifests/nodes/backup1.fedora.phx.redhat.com.pp
+++ b/manifests/nodes/backup1.fedora.phx.redhat.com.pp
@@ -1,5 +1,5 @@
 node backup1{
-    $autodisablePuppet = 1
+    $autodisablePuppet = true
     include phx
 #    include global
     include openvpn::client
diff --git a/manifests/nodes/proxy1.stg.fedora.phx.redhat.com.pp b/manifests/nodes/proxy1.stg.fedora.phx.redhat.com.pp
index f9a1289..2c303fe 100644
--- a/manifests/nodes/proxy1.stg.fedora.phx.redhat.com.pp
+++ b/manifests/nodes/proxy1.stg.fedora.phx.redhat.com.pp
@@ -1,4 +1,5 @@
 node 'proxy1.stg.fedora.phx.redhat.com' {
+    $autodisablePuppet = true
     $puppetEnvironment='staging'
     include phx
     include proxy
diff --git a/manifests/nodes/sign-bridge1.fedora.phx.redhat.com.pp b/manifests/nodes/sign-bridge1.fedora.phx.redhat.com.pp
index d710016..4147862 100644
--- a/manifests/nodes/sign-bridge1.fedora.phx.redhat.com.pp
+++ b/manifests/nodes/sign-bridge1.fedora.phx.redhat.com.pp
@@ -1,5 +1,5 @@
 node "sign-bridge1.fedora.phx.redhat.com" {
-    $autodisablePuppet = 1
+    $autodisablePuppet = true
     $fas_groups = [ 'sysadmin-main', 'sysadmin-releng' ]
     include phx
     include fas::client
diff --git a/manifests/nodes/sign-vault1.fedora.phx.redhat.com.pp b/manifests/nodes/sign-vault1.fedora.phx.redhat.com.pp
index 1b5641d..a1e0ab0 100644
--- a/manifests/nodes/sign-vault1.fedora.phx.redhat.com.pp
+++ b/manifests/nodes/sign-vault1.fedora.phx.redhat.com.pp
@@ -1,5 +1,5 @@
 node "sign-vault1" {
-    $autodisablePuppet = 1
+    $autodisablePuppet = true
     $fas_groups = [ 'sysadmin-main', 'sysadmin-releng' ]
     include phx
     include fas::client
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp
index 54ca3e3..686de0a 100644
--- a/modules/puppet/manifests/init.pp
+++ b/modules/puppet/manifests/init.pp
@@ -18,8 +18,14 @@ class puppet::client {
     }
 
     service { "puppet": 
-        ensure  => running,
-        enable  => true,
+        ensure  => $autodisablePuppet ? {
+            true    => undef,
+            default => running,
+        },
+        enable  => $autodisablePuppet ? {
+            true    => false,
+            default => true,
+        },
         require => Package["puppet"],
     }
 
-- 
1.5.5.6