Merge pull request #6900 from Panthaaaa/patch-1

Order Parameters alphabetically
This commit is contained in:
Adrien Delorme 2018-10-23 17:40:03 +02:00 committed by GitHub
commit e1ea60c906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions

View File

@ -213,17 +213,17 @@ builder.
Unlimited - even for instances that would usually qualify for the Unlimited - even for instances that would usually qualify for the
[AWS Free Tier](https://aws.amazon.com/free/). [AWS Free Tier](https://aws.amazon.com/free/).
- `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 - `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 AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the
process). Packer will always run this operation, even if the base process). Packer will always run this operation, even if the base
AMI has an encrypted boot volume to start with. Default `false`. AMI has an encrypted boot volume to start with. Default `false`.
- `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with
AMIs, which have been deregistered by `force_deregister`. Default `false`.
- `force_deregister` (boolean) - Force Packer to first deregister an existing
AMI if one with the same name already exists. Default `false`.
- `kms_key_id` (string) - ID, alias or ARN of the KMS key to use for boot volume encryption. - `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 This only applies to the main `region`, other regions where the AMI will be copied
will be encrypted by the default EBS KMS key. will be encrypted by the default EBS KMS key.
@ -301,11 +301,6 @@ builder.
`security_group_ids` take precedence over this. `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 - `shutdown_behavior` (string) - Automatically terminate instances on shutdown
in case Packer exits ungracefully. Possible values are "stop" and "terminate", in case Packer exits ungracefully. Possible values are "stop" and "terminate",
default is `stop`. default is `stop`.
@ -466,6 +461,11 @@ builder.
to generate. By default, Packer generates a name that looks like to generate. By default, Packer generates a name that looks like
`packer_<UUID>`, where &lt;UUID&gt; is a 36 character unique identifier. `packer_<UUID>`, where &lt;UUID&gt; 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 - `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 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` probably don't need it. This will also be read from the `AWS_SESSION_TOKEN`