From 380147200c2a3e9177bf0e868342f89cef672ffa Mon Sep 17 00:00:00 2001 From: Brian Terry Date: Thu, 25 Jan 2018 10:56:30 -0500 Subject: [PATCH] Added role in amazon-import --- post-processor/amazon-import/post-processor.go | 6 ++++++ website/source/docs/post-processors/amazon-import.html.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index 90e87d6c7..2a5a0c785 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -34,6 +34,7 @@ type Config struct { Users []string `mapstructure:"ami_users"` Groups []string `mapstructure:"ami_groups"` LicenseType string `mapstructure:"license_type"` + RoleName string `mapstructure:"role_name"` ctx interpolate.Context } @@ -63,6 +64,10 @@ func (p *PostProcessor) Configure(raws ...interface{}) error { p.config.S3Key = "packer-import-{{timestamp}}.ova" } + if p.config.RoleName == "" { + p.config.RoleName = "vmimport" + } + errs := new(packer.MultiError) // Check and render s3_key_name @@ -164,6 +169,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac }, }, }, + RoleName: &p.config.RoleName, } if p.config.LicenseType != "" { diff --git a/website/source/docs/post-processors/amazon-import.html.md b/website/source/docs/post-processors/amazon-import.html.md index 85d139093..766bda48b 100644 --- a/website/source/docs/post-processors/amazon-import.html.md +++ b/website/source/docs/post-processors/amazon-import.html.md @@ -70,6 +70,8 @@ Optional: - `mfa_code` (string) - The MFA [TOTP](https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm) code. This should probably be a user variable since it changes all the time. +- `role_name` (string) - The name of the role to use when not using the default role, 'vmimport' + - `s3_key_name` (string) - The name of the key in `s3_bucket_name` where the OVA file will be copied to for import. If not specified, this will default to "packer-import-{{timestamp}}.ova". This key (ie, the uploaded OVA) will