Merge pull request #3733 from envato/no-shutdown-behaviour-instance-backed

No shutdown behaviour instance backed

builder/amazon/common/step_run_source_instance.go

@@ -166,7 +166,6 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 			BlockDeviceMappings:               s.BlockDevices.BuildLaunchDevices(),
 			Placement:                         &ec2.Placement{AvailabilityZone: &s.AvailabilityZone},
 			EbsOptimized:                      &s.EbsOptimized,
-			InstanceInitiatedShutdownBehavior: &s.InstanceInitiatedShutdownBehavior,
 		}
 
 		if s.SubnetId != "" && s.AssociatePublicIpAddress {
@@ -184,6 +183,10 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 			runOpts.SecurityGroupIds = securityGroupIds
 		}
 
+		if s.ExpectedRootDevice == "ebs" {
+			runOpts.InstanceInitiatedShutdownBehavior = &s.InstanceInitiatedShutdownBehavior
+		}
+
 		runResp, err := ec2conn.RunInstances(runOpts)
 		if err != nil {
 			err := fmt.Errorf("Error launching source instance: %s", err)

builder/amazon/instance/builder.go

@@ -218,7 +218,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			AvailabilityZone:         b.config.AvailabilityZone,
 			BlockDevices:             b.config.BlockDevices,
 			Tags:                     b.config.RunTags,
-			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 		},
 		&awscommon.StepGetPassword{
 			Debug:   b.config.PackerDebug,

website/source/docs/builders/amazon-instance.html.md

@@ -244,10 +244,6 @@ builder.
 -   `windows_password_timeout` (string) - The timeout for waiting for a Windows
     password for Windows instances. Defaults to 20 minutes. Example value: "10m"
 
--   `shutdown_behaviour` (string) - Automatically terminate instances on shutdown
-    incase packer exits ungracefully. Possible values are "stop" and "terminate",
-    default is stop.
-
 ## Basic Example
 
 Here is a basic example. It is completely valid except for the access keys: