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
20d7f74f
Commit
20d7f74f
authored
Feb 21, 2014
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post-processor/vagrant: AWS/DO keep input artifacts [GH-55]
parent
4d623de9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
1 deletion
+23
-1
CHANGELOG.md
CHANGELOG.md
+2
-0
post-processor/vagrant/aws.go
post-processor/vagrant/aws.go
+4
-0
post-processor/vagrant/digitalocean.go
post-processor/vagrant/digitalocean.go
+4
-0
post-processor/vagrant/post-processor.go
post-processor/vagrant/post-processor.go
+1
-1
post-processor/vagrant/provider.go
post-processor/vagrant/provider.go
+4
-0
post-processor/vagrant/virtualbox.go
post-processor/vagrant/virtualbox.go
+4
-0
post-processor/vagrant/vmware.go
post-processor/vagrant/vmware.go
+4
-0
No files found.
CHANGELOG.md
View file @
20d7f74f
...
@@ -29,6 +29,8 @@ BUG FIXES:
...
@@ -29,6 +29,8 @@ BUG FIXES:
*
builder/virtualbox,vmware/qemu: Support for additional scancodes for
*
builder/virtualbox,vmware/qemu: Support for additional scancodes for
`boot_command`
such as
`<up>`
,
`<left>`
,
`<insert>`
, etc. [GH-808]
`boot_command`
such as
`<up>`
,
`<left>`
,
`<insert>`
, etc. [GH-808]
*
communicator/ssh: Send TCP keep-alives on connections. [GH-872]
*
communicator/ssh: Send TCP keep-alives on connections. [GH-872]
*
post-processor/vagrant: AWS/DigitalOcean keep input artifacts by
default. [GH-55]
*
provisioners/ansible-local: Properly upload custom playbooks. [GH-829]
*
provisioners/ansible-local: Properly upload custom playbooks. [GH-829]
## 0.5.1 (01/02/2014)
## 0.5.1 (01/02/2014)
...
...
post-processor/vagrant/aws.go
View file @
20d7f74f
...
@@ -11,6 +11,10 @@ import (
...
@@ -11,6 +11,10 @@ import (
type
AWSProvider
struct
{}
type
AWSProvider
struct
{}
func
(
p
*
AWSProvider
)
KeepInputArtifact
()
bool
{
return
true
}
func
(
p
*
AWSProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
func
(
p
*
AWSProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
// Create the metadata
// Create the metadata
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"aws"
}
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"aws"
}
...
...
post-processor/vagrant/digitalocean.go
View file @
20d7f74f
...
@@ -15,6 +15,10 @@ type digitalOceanVagrantfileTemplate struct {
...
@@ -15,6 +15,10 @@ type digitalOceanVagrantfileTemplate struct {
type
DigitalOceanProvider
struct
{}
type
DigitalOceanProvider
struct
{}
func
(
p
*
DigitalOceanProvider
)
KeepInputArtifact
()
bool
{
return
true
}
func
(
p
*
DigitalOceanProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
func
(
p
*
DigitalOceanProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
// Create the metadata
// Create the metadata
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"digital_ocean"
}
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"digital_ocean"
}
...
...
post-processor/vagrant/post-processor.go
View file @
20d7f74f
...
@@ -152,7 +152,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
...
@@ -152,7 +152,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
return
nil
,
false
,
err
return
nil
,
false
,
err
}
}
return
NewArtifact
(
name
,
outputPath
),
false
,
nil
return
NewArtifact
(
name
,
outputPath
),
provider
.
KeepInputArtifact
()
,
nil
}
}
func
(
p
*
PostProcessor
)
configureSingle
(
config
*
Config
,
raws
...
interface
{})
error
{
func
(
p
*
PostProcessor
)
configureSingle
(
config
*
Config
,
raws
...
interface
{})
error
{
...
...
post-processor/vagrant/provider.go
View file @
20d7f74f
...
@@ -7,6 +7,10 @@ import (
...
@@ -7,6 +7,10 @@ import (
// Provider is the interface that each provider must implement in order
// Provider is the interface that each provider must implement in order
// to package the artifacts into a Vagrant-compatible box.
// to package the artifacts into a Vagrant-compatible box.
type
Provider
interface
{
type
Provider
interface
{
// KeepInputArtifact should return true/false whether this provider
// requires the input artifact to be kept by default.
KeepInputArtifact
()
bool
// Process is called to process an artifact into a Vagrant box. The
// Process is called to process an artifact into a Vagrant box. The
// artifact is given as well as the temporary directory path to
// artifact is given as well as the temporary directory path to
// put things.
// put things.
...
...
post-processor/vagrant/virtualbox.go
View file @
20d7f74f
...
@@ -15,6 +15,10 @@ import (
...
@@ -15,6 +15,10 @@ import (
type
VBoxProvider
struct
{}
type
VBoxProvider
struct
{}
func
(
p
*
VBoxProvider
)
KeepInputArtifact
()
bool
{
return
false
}
func
(
p
*
VBoxProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
func
(
p
*
VBoxProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
// Create the metadata
// Create the metadata
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"virtualbox"
}
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"virtualbox"
}
...
...
post-processor/vagrant/vmware.go
View file @
20d7f74f
...
@@ -8,6 +8,10 @@ import (
...
@@ -8,6 +8,10 @@ import (
type
VMwareProvider
struct
{}
type
VMwareProvider
struct
{}
func
(
p
*
VMwareProvider
)
KeepInputArtifact
()
bool
{
return
false
}
func
(
p
*
VMwareProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
func
(
p
*
VMwareProvider
)
Process
(
ui
packer
.
Ui
,
artifact
packer
.
Artifact
,
dir
string
)
(
vagrantfile
string
,
metadata
map
[
string
]
interface
{},
err
error
)
{
// Create the metadata
// Create the metadata
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"vmware_desktop"
}
metadata
=
map
[
string
]
interface
{}{
"provider"
:
"vmware_desktop"
}
...
...
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