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

convert alicloud s.IOOptimized into trilean in code

This commit is contained in:
Megan Marsh 2019-08-22 13:59:38 -07:00
parent ecaec1ac58
commit f7c8321a7e
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/alicloud/ecs/run_config.go
View File

@ -15,7 +15,7 @@ import (
type RunConfig struct {
AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address"`
ZoneId string `mapstructure:"zone_id"`
RawIOOptimized config.Trilean `mapstructure:"io_optimized"`
IOOptimized config.Trilean `mapstructure:"io_optimized"`
InstanceType string `mapstructure:"instance_type"`
Description string `mapstructure:"description"`
AlicloudSourceImage string `mapstructure:"source_image"`
@ -38,7 +38,6 @@ type RunConfig struct {
// Communicator settings
Comm communicator.Config `mapstructure:",squash"`
SSHPrivateIp bool `mapstructure:"ssh_private_ip"`
IOOptimized *bool
}
func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
@ -70,7 +69,5 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
}
}
c.IOOptimized = c.RawIOOptimized.ToBoolPointer()
return errs
}

12
builder/alicloud/ecs/step_create_instance.go
View File

@ -18,7 +18,7 @@ import (
)
type stepCreateAlicloudInstance struct {
IOOptimized *bool
IOOptimized confighelper.Trilean
InstanceType string
UserData string
UserDataFile string
@ -143,12 +143,10 @@ func (s *stepCreateAlicloudInstance) buildCreateInstanceRequest(state multistep.
request.InternetChargeType = s.InternetChargeType
request.InternetMaxBandwidthOut = requests.Integer(convertNumber(s.InternetMaxBandwidthOut))
if s.IOOptimized != nil {
if *s.IOOptimized {
request.IoOptimized = IOOptimizedOptimized
} else {
request.IoOptimized = IOOptimizedNone
}
if s.IOOptimized.True() {
request.IoOptimized = IOOptimizedOptimized
} else if IOOptimized.False() {
request.IoOptimized = IOOptimizedNone
}
config := state.Get("config").(*Config)