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

Added aws shutdown_behavior to the changelog

This commit is contained in:
Chris Bednarski 2016-06-14 14:34:01 -07:00
parent f361e1d894
commit ab9621ab7d
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ IMPROVEMENTS:
* builder/amazon: Added `disable_stop_instance` option to prevent automatic * builder/amazon: Added `disable_stop_instance` option to prevent automatic
shutdown when the build is complete [GH-3352] shutdown when the build is complete [GH-3352]
* builder/amazon: Added `skip_region_validation` option to allow newer or custom AWS regions [GH-3598] * builder/amazon: Added `skip_region_validation` option to allow newer or custom AWS regions [GH-3598]
* builder/amazon: Added `shutdown_behavior` option to support `stop` or `terminate` at the end of the build [GH-3556]
* builder/azure: Now pre-validates `capture_container_name` and * builder/azure: Now pre-validates `capture_container_name` and
`capture_name_prefix` [GH-3537] `capture_name_prefix` [GH-3537]
* builder/azure: Support for custom images [GH-3575] * builder/azure: Support for custom images [GH-3575]

5
builder/amazon/common/run_config.go
View File

@ -4,14 +4,16 @@ import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"time"
"regexp" "regexp"
"time"
"github.com/mitchellh/packer/common/uuid" "github.com/mitchellh/packer/common/uuid"
"github.com/mitchellh/packer/helper/communicator" "github.com/mitchellh/packer/helper/communicator"
"github.com/mitchellh/packer/template/interpolate" "github.com/mitchellh/packer/template/interpolate"
) )
var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
// RunConfig contains configuration for running an instance from a source // RunConfig contains configuration for running an instance from a source
// AMI and details on how to access that launched image. // AMI and details on how to access that launched image.
type RunConfig struct { type RunConfig struct {
@ -86,7 +88,6 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
} }
} }
var reShutdownBehavior = regexp.MustCompile("(stop|terminate)")
if c.InstanceInitiatedShutdownBehavior == "" { if c.InstanceInitiatedShutdownBehavior == "" {
c.InstanceInitiatedShutdownBehavior = "stop" c.InstanceInitiatedShutdownBehavior = "stop"
} else if !reShutdownBehavior.MatchString(c.InstanceInitiatedShutdownBehavior) { } else if !reShutdownBehavior.MatchString(c.InstanceInitiatedShutdownBehavior) {