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 #24379 from Starblade42/2015.5

Browse source 
Fixes an issue where Pagerduty states/modules couldn't find their profile in the Pillar
This commit is contained in:
Nicole Thomas 2015-06-04 06:41:13 -06:00
commit 52587a4fc1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/pagerduty.py
View file

@ -39,7 +39,7 @@ def query(method='GET', profile=None, url=None, path='api/v1',
opts = {}
if profile is not None:
creds = opts.get(profile, {})
creds = opts.get(profile, {}) or opts.get('pillar').get(profile, {})
else:
creds = {}