From 1f6f6574d5d2edf9b4a040b030d8e141abe9c4e5 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 12 Sep 2013 16:22:33 +0000 Subject: [PATCH] Revert "Disable salt master and minions globally" This reverts commit ec900482c3db820e1f24ba380040d466c35f705f. The original reason for disabling salt globally was a slow memory/process leak with the message queue in versions prior to 0.16. Ensuring salt packages are upgraded everywhere should mitigate the issue. Change-Id: Ie5cb4df7367d82551b79decf2ba71349df1966d7 --- 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 ea3311e57d..8bd180e313 100644 --- a/modules/salt/manifests/init.pp +++ b/modules/salt/manifests/init.pp @@ -38,8 +38,8 @@ class salt ( } service { 'salt-minion': - ensure => stopped, - enable => false, + ensure => running, + enable => true, require => File['/etc/salt/minion'], subscribe => [ Package['salt-minion'], diff --git a/modules/salt/manifests/master.pp b/modules/salt/manifests/master.pp index d634caa792..3a4c6b7af2 100644 --- a/modules/salt/manifests/master.pp +++ b/modules/salt/manifests/master.pp @@ -85,8 +85,8 @@ class salt::master { } service { 'salt-master': - ensure => stopped, - enable => false, + ensure => running, + enable => true, require => [ User['salt'], File['/etc/salt/master'],