opendev/system-config
Code Issues Proposed changes

Revert "Disable salt master and minions globally"

Browse Source 
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
This commit is contained in:
Jeremy Stanley 2013-09-12 16:22:33 +00:00
parent a6202f901b
commit 1f6f6574d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/salt/manifests/init.pp
View File

@ -38,8 +38,8 @@ class salt (
} }
service { 'salt-minion': service { 'salt-minion':
ensure => stopped, ensure => running,
enable => false, enable => true,
require => File['/etc/salt/minion'], require => File['/etc/salt/minion'],
subscribe => [ subscribe => [
Package['salt-minion'], Package['salt-minion'],

4
modules/salt/manifests/master.pp
View File

@ -85,8 +85,8 @@ class salt::master {
} }
service { 'salt-master': service { 'salt-master':
ensure => stopped, ensure => running,
enable => false, enable => true,
require => [ require => [
User['salt'], User['salt'],
File['/etc/salt/master'], File['/etc/salt/master'],