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

Fix white-space related issues, and anomalous backslash.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-12-10 12:59:00 +00:00
parent 426a7a8870
commit a54ed65b79
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

@ -314,6 +314,7 @@ def wait_for_port(host, port=22, timeout=900):
)
)
def validate_windows_cred(host, port=445, username='Administrator',
password=None):
'''
@ -324,6 +325,7 @@ def validate_windows_cred(host, port=445, username='Administrator',
))
return retcode == 0
def wait_for_passwd(host, port=22, ssh_timeout=15, username='root',
password=None, key_filename=None, maxtries=15,
trysleep=1, display_ssh_output=True):
@ -458,7 +460,7 @@ def deploy_windows(host, port=445, timeout=900, username='Administrator',
# that must be in the minion config file
windows_minion_conf = {
'ipc_mode': 'tcp',
'root_dir': 'c:\salt',
'root_dir': 'c:\\salt',
'pki_dir': '/conf/pki/minion',
'multiprocessing': False,
}