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 pull request #28211 from terminalmage/legacy_git_pillar-2015.5

Browse source 
Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
This commit is contained in:
Mike Place 2015-10-26 08:14:02 -06:00
commit 45305ccf29
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/pillar/git_pillar.py
View file

@ -322,4 +322,4 @@ def ext_pillar(minion_id,
pil = Pillar(opts, __grains__, minion_id, branch)
return pil.compile_pillar()
return pil.compile_pillar(ext=False)

14
tests/integration/modules/pillar.py
View file

@ -114,20 +114,6 @@ class PillarModuleTest(integration.ModuleCase):
self.assertEqual(grepo.rp_location, repo.remotes.origin.url)
@skipIf(HAS_GIT_PYTHON is False,
'GitPython must be installed and >= version {0}'.format(GIT_PYTHON))
def test_ext_pillar_env_mapping(self):
import os
from salt.pillar import git_pillar
repo_url = 'https://github.com/saltstack/pillar1.git'
pillar = self.run_function('pillar.data')
for branch, env in [('dev', 'testing')]:
repo = git_pillar.GitPillar(branch, repo_url, self.master_opts)
self.assertIn(repo.working_dir,
pillar['test_ext_pillar_opts']['pillar_roots'][env])
if __name__ == '__main__':
from integration import run_tests