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

Added * as an include all wildcard in extra_minion_data_in_pillar external pillar (+ test)

Browse source
This commit is contained in:
Alexandru Bleotu 2017-09-28 11:16:14 -04:00
parent 998c4a95fa
commit 8c5b021519
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/pillar/extra_minion_data_in_pillar.py
View file

@ -15,13 +15,18 @@ Complete example in etc/salt/master
ext_pillar:
- extra_minion_data_in_pillar:
include: <all>
include: *
ext_pillar:
- extra_minion_data_in_pillar:
include:
- key1
- key2:subkey2
ext_pillar:
- extra_minion_data_in_pillar:
include: <all>
'''
@ -78,7 +83,7 @@ def ext_pillar(minion_id, pillar, include, extra_minion_data=None):
if not extra_minion_data:
return {}
if include == '<all>':
if include in ['*', '<all>']:
return extra_minion_data
data = {}
for key in include:

7
tests/unit/pillar/test_extra_minion_data_in_pillar.py
View file

@ -40,9 +40,10 @@ class ExtraMinionDataInPillarTestCase(TestCase, LoaderModuleMockMixin):
self.assertEqual(ret, {})
def test_include_all(self):
ret = extra_minion_data_in_pillar.ext_pillar(
'fake_id', self.pillar, '<all>', self.extra_minion_data)
self.assertEqual(ret, self.extra_minion_data)
for include_all in ['*', '<all>']:
ret = extra_minion_data_in_pillar.ext_pillar(
'fake_id', self.pillar, include_all, self.extra_minion_data)
self.assertEqual(ret, self.extra_minion_data)
def test_include_specific_keys(self):
# Tests partially existing key, key with and without subkey,