saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2015.8' into '2016.3'

Browse source 
Conflicts:
  - salt/renderers/gpg.py
  - tests/unit/renderers/gpg_test.py
This commit is contained in:
rallytime 2016-06-24 14:45:37 -06:00
commit ae8ad9329c
5 changed files with 26 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/modules/win_system.py
View file

@ -787,17 +787,17 @@ def set_system_date_time(years=None,
return False
# Check for passed values. If not passed, use current values
if not years:
if years is None:
years = date_time[0]
if not months:
if months is None:
months = date_time[1]
if not days:
if days is None:
days = date_time[3]
if not hours:
if hours is None:
hours = date_time[4]
if not minutes:
if minutes is None:
minutes = date_time[5]
if not seconds:
if seconds is None:
seconds = date_time[6]
# Create the time tuple to be passed to SetLocalTime, including day_of_week

2
salt/renderers/gpg.py
View file

@ -248,7 +248,7 @@ def _get_key_dir():
gpg_keydir = __salt__['config.get']('gpg_keydir')
else:
gpg_keydir = __opts__.get('gpg_keydir')
return gpg_keydir or os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
return gpg_keydir or os.path.join(__opts__['config_dir'], 'gpgkeys')
def _decrypt_ciphertext(cipher, translate_newlines=False):

1
salt/states/file.py
View file

@ -2409,7 +2409,6 @@ def recurse(name,
ret['changes'][path] = _ret['changes']
def manage_file(path, source):
source = salt.utils.url.escape(source)
if clean and os.path.exists(path) and os.path.isdir(path):
_ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''}
if __opts__['test']:

39
salt/states/ipset.py
View file

@ -182,9 +182,8 @@ def present(name, entry=None, family='ipv4', **kwargs):
'''
ret = {'name': name,
'changes': {},
'result': None,
'result': True,
'comment': ''}
test_flag = False
if not entry:
ret['result'] = False
@ -198,25 +197,24 @@ def present(name, entry=None, family='ipv4', **kwargs):
entries.append(entry)
for entry in entries:
_entry = '{0}'.format(entry)
if 'timeout' in kwargs:
if 'comment' in _entry:
_entry = '{0} timeout {1} {2} {3}'.format(entry.split()[0], kwargs['timeout'], entry.split()[1], entry.split()[2])
else:
_entry = '{0} timeout {1}'.format(entry.split()[0], kwargs['timeout'])
entry_opts = ''
if ' ' in entry:
entry, entry_opts = entry.split(' ', 1)
if 'timeout' in kwargs and 'timeout' not in entry_opts:
entry_opts = 'timeout {0} {1}'.format(kwargs['timeout'], entry_opts)
if 'comment' in kwargs and 'comment' not in entry_opts:
entry_opts = '{0} comment "{1}"'.format(entry_opts, kwargs['comment'])
_entry = ' '.join([entry, entry_opts]).strip()
if __salt__['ipset.check'](kwargs['set_name'],
_entry,
family) is True:
if test_flag is False:
ret['result'] = True
ret['comment'] += 'entry for {0} already in set ({1}) for {2}\n'.format(
entry,
kwargs['set_name'],
family)
else:
if __opts__['test']:
test_flag = True
ret['result'] = None
ret['comment'] += 'entry {0} needs to be added to set {1} for family {2}\n'.format(
entry,
@ -226,7 +224,6 @@ def present(name, entry=None, family='ipv4', **kwargs):
command = __salt__['ipset.add'](kwargs['set_name'], entry, family, **kwargs)
if 'Error' not in command:
ret['changes'] = {'locale': name}
ret['result'] = True
ret['comment'] += 'entry {0} added to set {1} for family {2}\n'.format(
_entry,
kwargs['set_name'],
@ -255,7 +252,7 @@ def absent(name, entry=None, entries=None, family='ipv4', **kwargs):
'''
ret = {'name': name,
'changes': {},
'result': None,
'result': True,
'comment': ''}
if not entry:
@ -270,23 +267,26 @@ def absent(name, entry=None, entries=None, family='ipv4', **kwargs):
entries.append(entry)
for entry in entries:
_entry = '{0}'.format(entry)
if 'comment' in kwargs:
_entry = '{0} comment "{1}"'.format(entry, kwargs['comment'])
entry_opts = ''
if ' ' in entry:
entry, entry_opts = entry.split(' ', 1)
if 'timeout' in kwargs and 'timeout' not in entry_opts:
entry_opts = 'timeout {0} {1}'.format(kwargs['timeout'], entry_opts)
if 'comment' in kwargs and 'comment' not in entry_opts:
entry_opts = '{0} comment "{1}"'.format(entry_opts, kwargs['comment'])
_entry = ' '.join([entry, entry_opts]).strip()
log.debug('_entry {0}'.format(_entry))
if not __salt__['ipset.check'](kwargs['set_name'],
_entry,
family) is True:
ret['result'] = True
ret['comment'] += 'ipset entry for {0} not present in set ({1}) for {2}\n'.format(
_entry,
kwargs['set_name'],
family)
else:
if __opts__['test']:
ret['result'] = None
ret['comment'] += 'ipset entry {0} needs to removed from set {1} for family {2}\n'.format(
entry,
kwargs['set_name'],
@ -295,7 +295,6 @@ def absent(name, entry=None, entries=None, family='ipv4', **kwargs):
command = __salt__['ipset.delete'](kwargs['set_name'], entry, family, **kwargs)
if 'Error' not in command:
ret['changes'] = {'locale': name}
ret['result'] = True
ret['comment'] += 'ipset entry {1} for set {0} removed for family {2}\n'.format(
kwargs['set_name'],
_entry,

12
tests/unit/renderers/gpg_test.py
View file

@ -39,18 +39,6 @@ class GPGTestCase(TestCase):
with patch('salt.utils.which', MagicMock(return_value=False)):
self.assertRaises(SaltRenderError, gpg._get_gpg_exec)
def test__get_key_dir(self):
'''
test _get_key_dir
'''
cfg_dir = '/gpg/cfg/dir'
with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=cfg_dir)}):
self.assertEqual(gpg._get_key_dir(), cfg_dir)
def_dir = '/etc/salt/gpgkeys'
with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=False)}):
self.assertEqual(gpg._get_key_dir(), def_dir)
@patch('salt.utils.which', MagicMock())
def test__decrypt_ciphertext(self):
'''