From 9527f6088447410ca9b2c139b307c8450c82da02 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 23 Aug 2013 15:53:54 -0700 Subject: [PATCH] builder/amazon/instance: remove check for AMI tools [GH-330] --- CHANGELOG.md | 2 ++ builder/amazon/instance/step_bundle_volume.go | 21 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53bc4d2c5..b38dbaa88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ IMPROVEMENTS: BUG FIXES: * 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 '-only' or '-except', it is now an error. [GH-326] * post-processor/vagrant: Setting OutputPath with a timestamp now diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index 015d759db..4e690bf88 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -27,25 +27,6 @@ func (s *StepBundleVolume) Run(state map[string]interface{}) multistep.StepActio x509RemoteCertPath := state["x509RemoteCertPath"].(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 var err error 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...") - cmd = new(packer.RemoteCmd) + cmd := new(packer.RemoteCmd) cmd.Command = config.BundleVolCommand if err := cmd.StartWithUi(comm, ui); err != nil { state["error"] = fmt.Errorf("Error bundling volume: %s", err)