valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42657 from nhavens/2017.7

Browse Source 
back-port #42612 to 2017.7
This commit is contained in:
Nicole Thomas 2017-08-14 15:42:25 -04:00 committed by GitHub
commit 4fcdab3ae9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/selinux.py
View File

@ -171,8 +171,14 @@ def boolean(name, value, persist=False):
name, rvalue)
return ret
if __salt__['selinux.setsebool'](name, rvalue, persist):
ret['result'] = __salt__['selinux.setsebool'](name, rvalue, persist)
if ret['result']:
ret['comment'] = 'Boolean {0} has been set to {1}'.format(name, rvalue)
ret['changes'].update({'State': {'old': bools[name]['State'],
'new': rvalue}})
if persist and not default:
ret['changes'].update({'Default': {'old': bools[name]['Default'],
'new': rvalue}})
return ret
ret['comment'] = 'Failed to set the boolean {0} to {1}'.format(name, rvalue)
return ret

4
tests/unit/states/test_selinux.py
View File

@ -118,9 +118,11 @@ class SelinuxTestCase(TestCase, LoaderModuleMockMixin):
with patch.dict(selinux.__opts__, {'test': False}):
comt = ('Boolean samba_create_home_dirs has been set to on')
ret.update({'comment': comt, 'result': True})
ret.update({'changes': {'State': {'old': 'off', 'new': 'on'}}})
self.assertDictEqual(selinux.boolean(name, value), ret)
comt = ('Failed to set the boolean '
'samba_create_home_dirs to on')
ret.update({'comment': comt, 'result': True})
ret.update({'comment': comt, 'result': False})
ret.update({'changes': {}})
self.assertDictEqual(selinux.boolean(name, value), ret)