Merge "Disable salt master and minions globally"

2013-08-26 17:43:04 +00:00 · 2013-08-26 17:43:04 +00:00 · 4dce903118
commit 4dce903118
parent aa7d765629 ec900482c3
2 changed files with 4 additions and 4 deletions
--- 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'],
--- 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'],