iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2475 from tylert/gh-2474-fix-docs-uint-int-integer-and-wrap-long-lines 

Fixes #2474:  Replace use of 'int' and 'uint' in website docs with 'integer' and wrap long lines
This commit is contained in:
Chris Bednarski 2015-07-19 21:48:22 -07:00
parent ee2e039671 3139d3d2c5
commit 2010a0c966
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/builders/qemu.html.markdown
View File

@ -239,7 +239,7 @@ qemu-system-x86 command. The arguments are all printed for review.
If it doesn't shut down in this time, it is an error. By default, the timeout
is "5m", or five minutes.
* `ssh_host_port_min` and `ssh_host_port_max` (uint) - The minimum and
* `ssh_host_port_min` and `ssh_host_port_max` (integer) - The minimum and
maximum port to use for the SSH port on the host machine which is forwarded
to the SSH port on the guest machine. Because Packer often runs in parallel,
Packer will choose a randomly available port in this range to use as the

26
website/source/docs/templates/communicator.html.md vendored
View File

@ -57,7 +57,7 @@ The SSH communicator has the following options:
* `ssh_host` (string) - The address to SSH to. This usually is automatically
configured by the builder.
* `ssh_port` (int) - The port to connect to SSH. This defaults to 22.
* `ssh_port` (integer) - The port to connect to SSH. This defaults to 22.
* `ssh_username` (string) - The username to connect to SSH with.
@ -67,24 +67,27 @@ The SSH communicator has the following options:
* `ssh_private_key_file` (string) - Path to a PEM encoded private key
file to use to authentiate with SSH.
* `ssh_pty` (boolean) - If true, a PTY will be requested for the SSH connection.
This defaults to false.
* `ssh_pty` (boolean) - If true, a PTY will be requested for the SSH
connection. This defaults to false.
* `ssh_timeout` (string) - The time to wait for SSH to become available.
Packer uses this to determine when the machine has booted so this is usually
quite long. Example value: "10m"
Packer uses this to determine when the machine has booted so this is
usually quite long. Example value: "10m"
* `ssh_handshake_attempts` (int) - The number of handshakes to attempt with
SSH once it can connect. This defaults to 10.
* `ssh_handshake_attempts` (integer) - The number of handshakes to attempt
with SSH once it can connect. This defaults to 10.
* `ssh_disable_agent` (boolean) - If true, SSH agent forwarding will be disabled.
* `ssh_disable_agent` (boolean) - If true, SSH agent forwarding will be
disabled.
* `ssh_bastion_host` (string) - A bastion host to use for the actual
SSH connection.
* `ssh_bastion_port` (int) - The port of the bastion host. Defaults to 22.
* `ssh_bastion_port` (integer) - The port of the bastion host. Defaults to
22.
* `ssh_bastion_username` (string) - The username to connect to the bastion host.
* `ssh_bastion_username` (string) - The username to connect to the bastion
host.
* `ssh_bastion_password` (string) - The password to use to authenticate
with the bastion host.
@ -98,7 +101,8 @@ The WinRM communicator has the following options.
* `winrm_host` (string) - The address for WinRM to connect to.
* `winrm_port` (int) - The WinRM port to connect to. This defaults to 5985.
* `winrm_port` (integer) - The WinRM port to connect to. This defaults to
5985.
* `winrm_username` (string) - The username to use to connect to WinRM.