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

builder/amazon/instance: remove check for AMI tools [GH-330]

This commit is contained in:
Mitchell Hashimoto 2013-08-23 15:53:54 -07:00
parent 5151d99fc3
commit f76a09fc08
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ IMPROVEMENTS:
BUG FIXES: BUG FIXES:
* core: Fixed a couple cases where a double ctrl-C could panic. * core: Fixed a couple cases where a double ctrl-C could panic.
* builder/amazon/instance: Remove check for ec2-ami-tools because it
didn't allow absolute paths to work properly. [GH-330]
* command/build,command/validate: If a non-existent build is specified to * command/build,command/validate: If a non-existent build is specified to
'-only' or '-except', it is now an error. [GH-326] '-only' or '-except', it is now an error. [GH-326]
* post-processor/vagrant: Setting OutputPath with a timestamp now * post-processor/vagrant: Setting OutputPath with a timestamp now

21
builder/amazon/instance/step_bundle_volume.go
View File

@ -27,25 +27,6 @@ func (s *StepBundleVolume) Run(state map[string]interface{}) multistep.StepActio
x509RemoteCertPath := state["x509RemoteCertPath"].(string) x509RemoteCertPath := state["x509RemoteCertPath"].(string)
x509RemoteKeyPath := state["x509RemoteKeyPath"].(string) x509RemoteKeyPath := state["x509RemoteKeyPath"].(string)
// Verify the AMI tools are available
ui.Say("Checking for EC2 AMI tools...")
cmd := &packer.RemoteCmd{Command: "ec2-ami-tools-version"}
if err := comm.Start(cmd); err != nil {
state["error"] = fmt.Errorf("Error checking for AMI tools: %s", err)
ui.Error(state["error"].(error).Error())
return multistep.ActionHalt
}
cmd.Wait()
if cmd.ExitStatus != 0 {
state["error"] = fmt.Errorf(
"The EC2 AMI tools could not be detected. These must be manually\n" +
"via a provisioner or some other means and are required for Packer\n" +
"to create an instance-store AMI.")
ui.Error(state["error"].(error).Error())
return multistep.ActionHalt
}
// Bundle the volume // Bundle the volume
var err error var err error
config.BundleVolCommand, err = config.tpl.Process(config.BundleVolCommand, bundleCmdData{ config.BundleVolCommand, err = config.tpl.Process(config.BundleVolCommand, bundleCmdData{
@ -65,7 +46,7 @@ func (s *StepBundleVolume) Run(state map[string]interface{}) multistep.StepActio
} }
ui.Say("Bundling the volume...") ui.Say("Bundling the volume...")
cmd = new(packer.RemoteCmd) cmd := new(packer.RemoteCmd)
cmd.Command = config.BundleVolCommand cmd.Command = config.BundleVolCommand
if err := cmd.StartWithUi(comm, ui); err != nil { if err := cmd.StartWithUi(comm, ui); err != nil {
state["error"] = fmt.Errorf("Error bundling volume: %s", err) state["error"] = fmt.Errorf("Error bundling volume: %s", err)