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

Merge pull request #3133 from rickard-von-essen/aws_ssh_cleanup 

Amazon: Cleaned up the docs about SSH after implementing Communicator.
This commit is contained in:
Rickard von Essen 2016-02-04 20:28:57 +01:00
parent 2155576fd6 209e877d20
commit e5356dc4c4
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
website/source/docs/builders/amazon-ebs.html.markdown
View File

@ -167,8 +167,9 @@ builder.
- `ssh_keypair_name` (string) - If specified, this is the key that will be - `ssh_keypair_name` (string) - If specified, this is the key that will be
used for SSH with the machine. By default, this is blank, and Packer will used for SSH with the machine. By default, this is blank, and Packer will
generate a temporary keypair. `ssh_private_key_file` must be specified generate a temporary keypair.
with this. [`ssh_private_key_file`](/docs/templates/communicator.html#ssh_private_key_file)
must be specified with this.
- `ssh_private_ip` (boolean) - If true, then SSH will always use the private - `ssh_private_ip` (boolean) - If true, then SSH will always use the private
IP if available. IP if available.

10
website/source/docs/builders/amazon-instance.html.markdown
View File

@ -206,17 +206,13 @@ builder.
- `ssh_keypair_name` (string) - If specified, this is the key that will be - `ssh_keypair_name` (string) - If specified, this is the key that will be
used for SSH with the machine. The key must match a key pair name loaded used for SSH with the machine. The key must match a key pair name loaded
up into Amazon EC2. By default, this is blank, and Packer will up into Amazon EC2. By default, this is blank, and Packer will
generate a temporary keypair. `ssh_private_key_file` must be specified generate a temporary keypair.
when `ssh_keypair_name` is utilized. [`ssh_private_key_file`](/docs/templates/communicator.html#ssh_private_key_file)
must be specified when `ssh_keypair_name` is utilized.
- `ssh_private_ip` (boolean) - If true, then SSH will always use the private - `ssh_private_ip` (boolean) - If true, then SSH will always use the private
IP if available. IP if available.
- `ssh_private_key_file` (string) - Is required if `ssh_keypair_name` is
specified. This is the name of a private SSH key file located on the
same machine running packer so the packer scripts can SSH into the machine
being created (eg. - /home/mitchellh/.ssh/id_rsa).
- `subnet_id` (string) - If using VPC, the ID of the subnet, such as - `subnet_id` (string) - If using VPC, the ID of the subnet, such as
"subnet-12345def", where Packer will launch the EC2 instance. This field is "subnet-12345def", where Packer will launch the EC2 instance. This field is
required if you are using an non-default VPC. required if you are using an non-default VPC.