From 3a6bd22cbbab1fb5d63fb428a80c881dbc32092f Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 20 Sep 2019 15:10:32 +0200 Subject: [PATCH] make generate --- .../ecs/_AlicloudAccessConfig-not-required.html.md | 2 +- .../amazon/common/_AMIConfig-not-required.html.md | 13 ++++++------- .../amazon/common/_AMIConfig-required.html.md | 6 +++--- .../amazon/common/_RunConfig-not-required.html.md | 8 +++----- .../builder/cloudstack/_Config-not-required.html.md | 11 +++++++++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/website/source/partials/builder/alicloud/ecs/_AlicloudAccessConfig-not-required.html.md b/website/source/partials/builder/alicloud/ecs/_AlicloudAccessConfig-not-required.html.md index a2d18cb7e..3ed83f123 100644 --- a/website/source/partials/builder/alicloud/ecs/_AlicloudAccessConfig-not-required.html.md +++ b/website/source/partials/builder/alicloud/ecs/_AlicloudAccessConfig-not-required.html.md @@ -4,5 +4,5 @@ value is false. - `security_token` (string) - STS access token, can be set through template or by exporting as - environment variable such as export SECURITY_TOKEN=value. + environment variable such as `export SECURITY_TOKEN=value`. \ No newline at end of file diff --git a/website/source/partials/builder/amazon/common/_AMIConfig-not-required.html.md b/website/source/partials/builder/amazon/common/_AMIConfig-not-required.html.md index 7c2d51114..0b6827c20 100644 --- a/website/source/partials/builder/amazon/common/_AMIConfig-not-required.html.md +++ b/website/source/partials/builder/amazon/common/_AMIConfig-not-required.html.md @@ -33,13 +33,12 @@ [template engine](/docs/templates/engine.html), see [Build template data](#build-template-data) for more information. -- `ena_support` (config.Trilean) - Enable enhanced networking (ENA but not - SriovNetSupport) on HVM-compatible AMIs. If set, add - ec2:ModifyInstanceAttribute to your AWS IAM policy. If false, this will - disable enhanced networking in the final AMI as opposed to passing the - setting through unchanged from the source. Note: you must make sure - enhanced networking is enabled on your instance. [Amazon's - documentation on enabling enhanced +- `ena_support` (config.Trilean) - Enable enhanced networking (ENA but not SriovNetSupport) on + HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your + AWS IAM policy. + + Note: you must make sure enhanced 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). - `sriov_support` (bool) - Enable enhanced networking (SriovNetSupport but not ENA) on diff --git a/website/source/partials/builder/amazon/common/_AMIConfig-required.html.md b/website/source/partials/builder/amazon/common/_AMIConfig-required.html.md index f7d6bea02..5c29e397f 100644 --- a/website/source/partials/builder/amazon/common/_AMIConfig-required.html.md +++ b/website/source/partials/builder/amazon/common/_AMIConfig-required.html.md @@ -1,7 +1,7 @@ -- `ami_name` (string) - The name of the resulting AMI that will appear when - managing AMIs in the AWS console or via APIs. This must be unique. To help - make this unique, use a function like timestamp (see [template +- `ami_name` (string) - The name of the resulting AMI that will appear when managing AMIs in the + AWS console or via APIs. This must be unique. To help make this unique, + use a function like timestamp (see [template engine](../templates/engine.html) for more info). \ No newline at end of file diff --git a/website/source/partials/builder/amazon/common/_RunConfig-not-required.html.md b/website/source/partials/builder/amazon/common/_RunConfig-not-required.html.md index 7dae423a5..fc9df4b9e 100644 --- a/website/source/partials/builder/amazon/common/_RunConfig-not-required.html.md +++ b/website/source/partials/builder/amazon/common/_RunConfig-not-required.html.md @@ -89,11 +89,9 @@ `security_group_ids` take precedence over this. -- `run_tags` (map[string]string) - Tags to apply to the instance that is *launched* to create the AMI. - These tags are *not* applied to the resulting AMI unless they're - duplicated in `tags`. This is a [template - engine](/docs/templates/engine.html), see [Build template - data](#build-template-data) for more information. +- `run_tags` (map[string]string) - Tags to apply to the instance that is that is *launched* to create the + EBS volumes. This is a [template engine](/docs/templates/engine.html), + see [Build template data](#build-template-data) for more information. - `security_group_id` (string) - The ID (not the name) of the security group to assign to the instance. By default this is not set and Packer will diff --git a/website/source/partials/builder/cloudstack/_Config-not-required.html.md b/website/source/partials/builder/cloudstack/_Config-not-required.html.md index 0a12dcc17..b0aaa2894 100644 --- a/website/source/partials/builder/cloudstack/_Config-not-required.html.md +++ b/website/source/partials/builder/cloudstack/_Config-not-required.html.md @@ -27,8 +27,15 @@ - `disk_size` (int64) - The size (in GB) of the root disk of the new instance. This option is only available when using source_template. -- `eject_iso` (bool) - -- `eject_iso_delay` (time.Duration) - +- `eject_iso` (bool) - If `true` make a call to the CloudStack API, after loading image to + cache, requesting to check and detach ISO file (if any) currently + attached to a virtual machine. Defaults to `false`. This option is only + available when using `source_iso`. + +- `eject_iso_delay` (time.Duration) - Configure the duration time to wait, making sure virtual machine is able + to finish installing OS before it ejects safely. Requires `eject_iso` + set to `true` and this option is only available when using `source_iso`. + - `expunge` (bool) - Set to true to expunge the instance when it is destroyed. Defaults to false.