valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update other syspaths.SOCK_DIR references with __opts__['sock_dir'] in develop

Browse Source
This commit is contained in:
rallytime 2016-08-18 15:17:28 -06:00
parent 7b3fc41868
commit b2a89dbe9b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/cloud.py
View File

@ -513,7 +513,7 @@ def bootstrap(vm_, opts):
args={'kwargs': event_kwargs},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)
@ -1157,7 +1157,7 @@ def deploy_windows(host,
args={'name': name},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)
@ -1631,7 +1631,7 @@ def deploy_script(host,
},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)
if file_map_fail or file_map_success:
@ -2881,7 +2881,7 @@ def missing_node_cache(prov_dir, node_list, provider, opts):
args={'missing node': node},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)
@ -2917,7 +2917,7 @@ def diff_node_cache(prov_dir, node, new_data, opts):
args={'new_data': event_data},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)
return
@ -2944,7 +2944,7 @@ def diff_node_cache(prov_dir, node, new_data, opts):
},
sock_dir=opts.get(
'sock_dir',
os.path.join(syspaths.SOCK_DIR, 'master')),
os.path.join(__opts__['sock_dir'], 'master')),
transport=opts.get('transport', 'zeromq')
)