From 76ac755ed98ed28154e38de0b13247e91bdef451 Mon Sep 17 00:00:00 2001 From: John Davies-Colley Date: Wed, 6 Dec 2017 17:13:02 +1300 Subject: [PATCH] =?UTF-8?q?fixing=20wording=20for=20proxy=20usage=20?= =?UTF-8?q?=F0=9F=91=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/source/docs/builders/amazon-ebs.html.md | 5 +++-- website/source/docs/builders/amazon-ebssurrogate.html.md | 5 +++-- website/source/docs/builders/amazon-ebsvolume.html.md | 5 +++-- website/source/docs/builders/amazon-instance.html.md | 7 ++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/website/source/docs/builders/amazon-ebs.html.md b/website/source/docs/builders/amazon-ebs.html.md index 54782d9d4..c050cd070 100644 --- a/website/source/docs/builders/amazon-ebs.html.md +++ b/website/source/docs/builders/amazon-ebs.html.md @@ -338,8 +338,9 @@ builder. otherwise the private IP address will be used. If not in a VPC the public DNS name will be used. - If packer is configured for an outbound proxy. To configure WinRM traffic to bypass the proxy - `ssh_interface` can be set to `private_dns`. + Where Packer is configured for an outbound proxy but WinRM traffic should be direct + `ssh_interface` must be set to `private_dns` and `.compute.internal` included + in the `NO_PROXY` environment variable. - `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 diff --git a/website/source/docs/builders/amazon-ebssurrogate.html.md b/website/source/docs/builders/amazon-ebssurrogate.html.md index 998733e4a..640710230 100644 --- a/website/source/docs/builders/amazon-ebssurrogate.html.md +++ b/website/source/docs/builders/amazon-ebssurrogate.html.md @@ -331,8 +331,9 @@ builder. otherwise the private IP address will be used. If not in a VPC the public DNS name will be used. - If packer is configured for an outbound proxy. To configure WinRM traffic to bypass the proxy - `ssh_interface` can be set to `private_dns`. + Where Packer is configured for an outbound proxy but WinRM traffic should be direct + `ssh_interface` must be set to `private_dns` and `.compute.internal` included + in the `NO_PROXY` environment variable. - `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 diff --git a/website/source/docs/builders/amazon-ebsvolume.html.md b/website/source/docs/builders/amazon-ebsvolume.html.md index a28398746..2b92c6b44 100644 --- a/website/source/docs/builders/amazon-ebsvolume.html.md +++ b/website/source/docs/builders/amazon-ebsvolume.html.md @@ -235,8 +235,9 @@ builder. otherwise the private IP address will be used. If not in a VPC the public DNS name will be used. - If packer is configured for an outbound proxy. To configure WinRM traffic to bypass the proxy - `ssh_interface` can be set to `private_dns`. + Where Packer is configured for an outbound proxy but WinRM traffic should be direct + `ssh_interface` must be set to `private_dns` and `.compute.internal` included + in the `NO_PROXY` environment variable. - `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 diff --git a/website/source/docs/builders/amazon-instance.html.md b/website/source/docs/builders/amazon-instance.html.md index 9afd894c2..198345ba7 100644 --- a/website/source/docs/builders/amazon-instance.html.md +++ b/website/source/docs/builders/amazon-instance.html.md @@ -329,7 +329,7 @@ builder. in AWS with the source instance, set the `ssh_keypair_name` field to the name of the key pair. -- `ssh_private_ip` (boolean) - *Deprecated* use `ssh_interface` instead. If `true`, +- `ssh_private_ip` (boolean) - *Deprecated* use `ssh_interface` instead. If `true`, then SSH will always use the private IP if available. Also works for WinRM. - `ssh_interface` (string) - One of `public_ip`, `private_ip`, @@ -339,8 +339,9 @@ builder. otherwise the private IP address will be used. If not in a VPC the public DNS name will be used. - If packer is configured for an outbound proxy. To configure WinRM traffic to bypass the proxy - `ssh_interface` can be set to `private_dns`. + Where Packer is configured for an outbound proxy but WinRM traffic should be direct + `ssh_interface` must be set to `private_dns` and `.compute.internal` included + in the `NO_PROXY` environment variable. - `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