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 #35856 from vutny/2015.8

Browse source 
[BACKPORT 2015.8] salt-cloud: fix path to Salt Master socket dir
This commit is contained in:
Mike Place 2016-08-30 16:10:02 +09:00 • committed by GitHub
commit 6dd5f68a08
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/cloud.py
View file

@ -1686,12 +1686,14 @@ def run_inline_script(host,
def fire_event(key, msg, tag, args=None, sock_dir=None, transport='zeromq'):
# Fire deploy action
if sock_dir is None:
sock_dir = os.path.join(__opts__['sock_dir'], 'master')
sock_dir = __opts__['sock_dir']
event = salt.utils.event.get_event(
'master',
sock_dir,
transport,
listen=False)
try:
event.fire_event(msg, tag)
except ValueError: