From 99e5351044267971d462bf8bc38dee873c1140c3 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 23 Oct 2018 17:56:15 +0200 Subject: [PATCH] builder/amazon: fix alphabetical order for other docs after #6900 --- .../docs/builders/amazon-chroot.html.md | 9 +++++---- .../docs/builders/amazon-ebssurrogate.html.md | 19 ++++++++++--------- .../docs/builders/amazon-ebsvolume.html.md | 10 +++++----- .../docs/builders/amazon-instance.html.md | 10 +++++----- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/website/source/docs/builders/amazon-chroot.html.md b/website/source/docs/builders/amazon-chroot.html.md index c8279b4d3..d9e557374 100644 --- a/website/source/docs/builders/amazon-chroot.html.md +++ b/website/source/docs/builders/amazon-chroot.html.md @@ -137,16 +137,17 @@ each category, the available configuration keys are alphabetized. networking is enabled on your instance. See [Amazon's documentation on enabling enhanced networking](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html#enabling_enhanced_networking). +- `encrypt_boot` (boolean) - Instruct packer to automatically create a copy of the + AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the + process). Packer will always run this operation, even if the base + AMI has an encrypted boot volume to start with. Default `false`. + - `force_deregister` (boolean) - Force Packer to first deregister an existing AMI if one with the same name already exists. Default `false`. - `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with AMIs, which have been deregistered by `force_deregister`. Default `false`. -- `encrypt_boot` (boolean) - Instruct packer to automatically create a copy of the - AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the - process). Packer will always run this operation, even if the base - AMI has an encrypted boot volume to start with. Default `false`. - `kms_key_id` (string) - ID, alias or ARN of the KMS key to use for boot volume encryption. This only applies to the main `region`, other regions where the AMI will be copied diff --git a/website/source/docs/builders/amazon-ebssurrogate.html.md b/website/source/docs/builders/amazon-ebssurrogate.html.md index f2180428a..720b1962f 100644 --- a/website/source/docs/builders/amazon-ebssurrogate.html.md +++ b/website/source/docs/builders/amazon-ebssurrogate.html.md @@ -206,16 +206,17 @@ builder. Unlimited - even for instances that would usually qualify for the [AWS Free Tier](https://aws.amazon.com/free/). +- `encrypt_boot` (boolean) - Instruct packer to automatically create a copy of the + AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the + process). Packer will always run this operation, even if the base + AMI has an encrypted boot volume to start with. Default `false`. + - `force_deregister` (boolean) - Force Packer to first deregister an existing AMI if one with the same name already exists. Default `false`. - `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with AMIs, which have been deregistered by `force_deregister`. Default `false`. -- `encrypt_boot` (boolean) - Instruct packer to automatically create a copy of the - AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the - process). Packer will always run this operation, even if the base - AMI has an encrypted boot volume to start with. Default `false`. - `kms_key_id` (string) - ID, alias or ARN of the KMS key to use for boot volume encryption. This only applies to the main `region`, other regions where the AMI will be copied @@ -294,11 +295,6 @@ builder. `security_group_ids` take precedence over this. -- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized - access to the instance, when packer is creating a temporary security group. - The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used - when `security_group_id` or `security_group_ids` is not specified. - - `shutdown_behavior` (string) - Automatically terminate instances on shutdown incase packer exits ungracefully. Possible values are "stop" and "terminate", default is `stop`. @@ -459,6 +455,11 @@ builder. - `temporary_key_pair_name` (string) - The name of the temporary keypair to generate. By default, Packer generates a name with a UUID. +- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized + access to the instance, when packer is creating a temporary security group. + The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used + when `security_group_id` or `security_group_ids` is not specified. + - `token` (string) - The access token to use. This is different from the access key and secret key. If you're not sure what this is, then you probably don't need it. This will also be read from the `AWS_SESSION_TOKEN` diff --git a/website/source/docs/builders/amazon-ebsvolume.html.md b/website/source/docs/builders/amazon-ebsvolume.html.md index 239bd2387..d1d771f85 100644 --- a/website/source/docs/builders/amazon-ebsvolume.html.md +++ b/website/source/docs/builders/amazon-ebsvolume.html.md @@ -227,11 +227,6 @@ builder. `security_group_ids` take precedence over this. -- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized - access to the instance, when packer is creating a temporary security group. - The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used - when `security_group_id` or `security_group_ids` is not specified. - - `shutdown_behavior` (string) - Automatically terminate instances on shutdown in case Packer exits ungracefully. Possible values are `stop` and `terminate`. Defaults to `stop`. @@ -373,6 +368,11 @@ builder. to generate. By default, Packer generates a name that looks like `packer_`, where <UUID> is a 36 character unique identifier. +- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized + access to the instance, when packer is creating a temporary security group. + The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used + when `security_group_id` or `security_group_ids` is not specified. + - `token` (string) - The access token to use. This is different from the access key and secret key. If you're not sure what this is, then you probably don't need it. This will also be read from the `AWS_SESSION_TOKEN` diff --git a/website/source/docs/builders/amazon-instance.html.md b/website/source/docs/builders/amazon-instance.html.md index 2e36be58b..c8aa2b752 100644 --- a/website/source/docs/builders/amazon-instance.html.md +++ b/website/source/docs/builders/amazon-instance.html.md @@ -303,11 +303,6 @@ builder. `security_group_ids` take precedence over this. -- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized - access to the instance, when packer is creating a temporary security group. - The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used - when `security_group_id` or `security_group_ids` is not specified. - - `skip_region_validation` (boolean) - Set to true if you want to skip validation of the region configuration option. Defaults to `false`. @@ -461,6 +456,11 @@ builder. to generate. By default, Packer generates a name that looks like `packer_`, where <UUID> is a 36 character unique identifier. +- `temporary_security_group_source_cidr` (string) - An IPv4 CIDR block to be authorized + access to the instance, when packer is creating a temporary security group. + The default is `0.0.0.0/0` (i.e., allow any IPv4 source). This is only used + when `security_group_id` or `security_group_ids` is not specified. + - `user_data` (string) - User data to apply when launching the instance. Note that you need to be careful about escaping characters due to the templates being JSON. It is often more convenient to use `user_data_file`, instead.