From ec900482c3db820e1f24ba380040d466c35f705f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 20 Aug 2013 22:12:40 -0400
Subject: [PATCH] Disable salt master and minions globally

Change-Id: I9ec8a411c8862f1033dbeae21a78d05b0b4fa986
---
 modules/salt/manifests/init.pp   | 4 ++--
 modules/salt/manifests/master.pp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/salt/manifests/init.pp b/modules/salt/manifests/init.pp
index 8bd180e313..ea3311e57d 100644
--- a/modules/salt/manifests/init.pp
+++ b/modules/salt/manifests/init.pp
@@ -38,8 +38,8 @@ class salt (
   }
 
   service { 'salt-minion':
-    ensure    => running,
-    enable    => true,
+    ensure    => stopped,
+    enable    => false,
     require   => File['/etc/salt/minion'],
     subscribe => [
       Package['salt-minion'],
diff --git a/modules/salt/manifests/master.pp b/modules/salt/manifests/master.pp
index 3a4c6b7af2..d634caa792 100644
--- a/modules/salt/manifests/master.pp
+++ b/modules/salt/manifests/master.pp
@@ -85,8 +85,8 @@ class salt::master {
   }
 
   service { 'salt-master':
-    ensure    => running,
-    enable    => true,
+    ensure    => stopped,
+    enable    => false,
     require   => [
       User['salt'],
       File['/etc/salt/master'],