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

Merge pull request #9229 from hashicorp/d-azure_arm-custom_managed_image_resource_update 

docs/builder/azure-arm: Fix a small typo for the custom_managed_image_* config options
This commit is contained in:
Megan Marsh 2020-05-14 11:54:33 -07:00 committed by GitHub
parent 533fbc1381 f31f5bc61b
commit 2661f7e0f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/azure/arm/config.go
View File

@ -183,19 +183,20 @@ type Config struct {
// CLI example // CLI example
// `az vm image list --location westus --publisher Canonical --offer UbuntuServer --sku 16.04.0-LTS --all` // `az vm image list --location westus --publisher Canonical --offer UbuntuServer --sku 16.04.0-LTS --all`
ImageVersion string `mapstructure:"image_version" required:"false"` ImageVersion string `mapstructure:"image_version" required:"false"`
// URL to a custom VHD to use for your base image. If this value is set, do // URL to a custom VHD to use for your base image. If this value is set,
// not set image_publisher, image_offer, image_sku, or image_version. // image_publisher, image_offer, image_sku, or image_version should not be set.
ImageUrl string `mapstructure:"image_url" required:"true"` ImageUrl string `mapstructure:"image_url" required:"true"`
// Name of a custom managed image to use for your base image. If this value is set, do // Name of a custom managed image to use for your base image. If this value is set, do
// not set image_publisher, image_offer, image_sku, or image_version. // not set image_publisher, image_offer, image_sku, or image_version.
// If this value is set, the value // If this value is set, the option
// `custom_managed_image_resource_group_name` must also be set. See // `custom_managed_image_resource_group_name` must also be set. See
// [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images) // [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
// to learn more about managed images. // to learn more about managed images.
CustomManagedImageName string `mapstructure:"custom_managed_image_name" required:"true"` CustomManagedImageName string `mapstructure:"custom_managed_image_name" required:"true"`
// Name of a custom managed image's resource group to use for your base image. If this // Name of a custom managed image's resource group to use for your base image. If this
// value is set, image_publisher, image_offer, image_sku, or image_version. // value is set, image_publisher, image_offer, image_sku, or image_version should not be set.
// If this value is set, the option
// `custom_managed_image_name` must also be set. See // `custom_managed_image_name` must also be set. See
// [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images) // [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
// to learn more about managed images. // to learn more about managed images.

9
website/pages/partials/builder/azure/arm/Config-required.mdx
View File

@ -20,18 +20,19 @@
CLI example CLI example
`az vm image list-skus --location westus --publisher Canonical --offer UbuntuServer` `az vm image list-skus --location westus --publisher Canonical --offer UbuntuServer`
- `image_url` (string) - URL to a custom VHD to use for your base image. If this value is set, do - `image_url` (string) - URL to a custom VHD to use for your base image. If this value is set,
not set image_publisher, image_offer, image_sku, or image_version. image_publisher, image_offer, image_sku, or image_version should not be set.
- `custom_managed_image_name` (string) - Name of a custom managed image to use for your base image. If this value is set, do - `custom_managed_image_name` (string) - Name of a custom managed image to use for your base image. If this value is set, do
not set image_publisher, image_offer, image_sku, or image_version. not set image_publisher, image_offer, image_sku, or image_version.
If this value is set, the value If this value is set, the option
`custom_managed_image_resource_group_name` must also be set. See `custom_managed_image_resource_group_name` must also be set. See
[documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images) [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
to learn more about managed images. to learn more about managed images.
- `custom_managed_image_resource_group_name` (string) - Name of a custom managed image's resource group to use for your base image. If this - `custom_managed_image_resource_group_name` (string) - Name of a custom managed image's resource group to use for your base image. If this
value is set, image_publisher, image_offer, image_sku, or image_version. value is set, image_publisher, image_offer, image_sku, or image_version should not be set.
If this value is set, the option
`custom_managed_image_name` must also be set. See `custom_managed_image_name` must also be set. See
[documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images) [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
to learn more about managed images. to learn more about managed images.