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

Merge pull request #23439 from techhat/maxtries

Browse Source 
Add wait_for_passwd_maxtries variable
This commit is contained in:
Justin Findlay 2015-05-07 01:28:56 -06:00
commit 7a8ce1a954
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/utils/cloud.py
View File

@ -356,6 +356,9 @@ def bootstrap(vm_, opts):
'file_map': salt.config.get_cloud_config_value(
'file_map', vm_, opts, default=None
),
'maxtries': salt.config.get_cloud_config_value(
'wait_for_passwd_maxtries', vm_, opts, default=15
),
}
# forward any info about possible ssh gateway to deploy script
# as some providers need also a 'gateway' configuration
@ -919,6 +922,7 @@ def deploy_script(host,
script_args=None,
script_env=None,
ssh_timeout=15,
maxtries=15,
make_syndic=False,
make_minion=True,
display_ssh_output=True,
@ -963,7 +967,8 @@ def deploy_script(host,
password=password, key_filename=key_filename,
ssh_timeout=ssh_timeout,
display_ssh_output=display_ssh_output,
gateway=gateway, known_hosts_file=known_hosts_file):
gateway=gateway, known_hosts_file=known_hosts_file,
maxtries=maxtries):
log.debug(
'Logging into {0}:{1} as {2}'.format(