Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
f76a09fc
Commit
f76a09fc
authored
Aug 23, 2013
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
builder/amazon/instance: remove check for AMI tools [GH-330]
parent
5151d99f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
20 deletions
+3
-20
CHANGELOG.md
CHANGELOG.md
+2
-0
builder/amazon/instance/step_bundle_volume.go
builder/amazon/instance/step_bundle_volume.go
+1
-20
No files found.
CHANGELOG.md
View file @
f76a09fc
...
...
@@ -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
...
...
builder/amazon/instance/step_bundle_volume.go
View file @
f76a09fc
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment