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 #42884 from Giandom/2017.7.1-fix-slack-engine-pillar-args

Browse source 
Convert to dict type the pillar string value passed from slack
This commit is contained in:
garethgreenaway 2017-08-16 15:30:43 -07:00 • committed by GitHub
commit 82be9dceb6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/engines/slack.py
View file

@ -61,6 +61,7 @@ import logging
import time
import re
import yaml
import ast
try:
import slackclient
@ -245,6 +246,10 @@ def start(token,
tgt_type = kwargs['tgt_type']
del kwargs['tgt_type']
# Check for pillar string representation of dict and convert it to dict
if 'pillar' in kwargs:
kwargs.update(pillar=ast.literal_eval(kwargs['pillar']))
ret = {}
if cmd in runner_functions: