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

Add new configuration for salt-cloud to tweak connections to the VM

Browse Source
This commit is contained in:
Nicolas Delaby 2014-05-07 18:05:06 +02:00
parent f71e043fce
commit 782420ca9a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/topics/cloud/misc.rst
View File

@ -173,6 +173,13 @@ The amount of time until an ssh connection can be established via password or
ssh key. Default 15 seconds.
wait_for_passwd_maxtries
~~~~~~~~~~~~~~~~~~~~~~~~
The number of attempts to connect to the VM until we abandon.
Default 15 attempts
wait_for_fun_timeout
~~~~~~~~~~~~~~~~~~~~

4
salt/cloud/clouds/ec2.py
View File

@ -1669,7 +1669,9 @@ def wait_for_instance(
'wait_for_passwd_timeout', vm_, __opts__, default=1 * 60),
key_filename=vm_['key_filename'],
display_ssh_output=display_ssh_output,
gateway=ssh_gateway_config
gateway=ssh_gateway_config,
maxtries=config.get_cloud_config_value(
'wait_for_passwd_maxtries', vm_, __opts__, default=15),
):
__opts__['ssh_username'] = user
vm_['ssh_username'] = user