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 #30033 from rallytime/bp-29876

Browse source 
Back-port #29876 to 2015.8
This commit is contained in:
Mike Place 2015-12-28 13:20:42 -07:00
commit 4d4dfd692a
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
doc/topics/cloud/misc.rst
View file

@ -91,6 +91,19 @@ profile or map:
interface: 0.0.0.0
SSH Port
========
By default ssh port is set to port 22. If you want to use a custom port in
provider, profile, or map blocks use ssh_port option.
.. versionadded:: 2015.5.0
.. code-block:: yaml
ssh_port: 2222
Delete SSH Keys
===============
When Salt Cloud deploys an instance, the SSH pub key for the instance is added
@ -177,7 +190,7 @@ ssh_connect_timeout
~~~~~~~~~~~~~~~~~~~
The amount of time Salt Cloud should wait for a successful SSH connection to
the VM.
the VM.
Default: varies by cloud provider (between 5 and 15 minutes)
@ -185,7 +198,7 @@ wait_for_passwd_timeout
~~~~~~~~~~~~~~~~~~~~~~~
The amount of time until an ssh connection can be established via password or
ssh key.
ssh key.
Default: varies by cloud provider (mostly 15 seconds)
@ -201,7 +214,7 @@ wait_for_fun_timeout
Some cloud drivers check for an available IP or a successful SSH connection
using a function, namely, SoftLayer, and SoftLayer-HW. So, the amount of time
Salt Cloud should retry such functions before failing.
Salt Cloud should retry such functions before failing.
Default: 15 minutes.