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
e422a454
Commit
e422a454
authored
Oct 28, 2014
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fmt
parent
81d8cd0d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
16 deletions
+16
-16
builder/amazon/common/state.go
builder/amazon/common/state.go
+1
-1
builder/googlecompute/step_create_instance.go
builder/googlecompute/step_create_instance.go
+5
-5
builder/vmware/common/driver_fusion6.go
builder/vmware/common/driver_fusion6.go
+1
-1
builder/vmware/iso/driver_esx5.go
builder/vmware/iso/driver_esx5.go
+5
-5
packer/rpc/client.go
packer/rpc/client.go
+1
-1
packer/rpc/server.go
packer/rpc/server.go
+1
-1
post-processor/vagrant-cloud/post-processor.go
post-processor/vagrant-cloud/post-processor.go
+1
-1
post-processor/vagrant-cloud/step_release_version.go
post-processor/vagrant-cloud/step_release_version.go
+1
-1
No files found.
builder/amazon/common/state.go
View file @
e422a454
...
@@ -125,7 +125,7 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
...
@@ -125,7 +125,7 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
log
.
Printf
(
"Waiting for state to become: %s"
,
conf
.
Target
)
log
.
Printf
(
"Waiting for state to become: %s"
,
conf
.
Target
)
sleepSeconds
:=
2
sleepSeconds
:=
2
maxTicks
:=
int
(
TimeoutSeconds
()
/
sleepSeconds
)
+
1
maxTicks
:=
int
(
TimeoutSeconds
()
/
sleepSeconds
)
+
1
notfoundTick
:=
0
notfoundTick
:=
0
for
{
for
{
...
...
builder/googlecompute/step_create_instance.go
View file @
e422a454
...
@@ -58,11 +58,11 @@ func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
...
@@ -58,11 +58,11 @@ func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
DiskSizeGb
:
config
.
DiskSizeGb
,
DiskSizeGb
:
config
.
DiskSizeGb
,
Image
:
config
.
getImage
(),
Image
:
config
.
getImage
(),
MachineType
:
config
.
MachineType
,
MachineType
:
config
.
MachineType
,
Metadata
:
config
.
getInstanceMetadata
(
sshPublicKey
),
Metadata
:
config
.
getInstanceMetadata
(
sshPublicKey
),
Name
:
name
,
Name
:
name
,
Network
:
config
.
Network
,
Network
:
config
.
Network
,
Tags
:
config
.
Tags
,
Tags
:
config
.
Tags
,
Zone
:
config
.
Zone
,
Zone
:
config
.
Zone
,
})
})
if
err
==
nil
{
if
err
==
nil
{
...
...
builder/vmware/common/driver_fusion6.go
View file @
e422a454
...
@@ -26,7 +26,7 @@ func (d *Fusion6Driver) Clone(dst, src string) error {
...
@@ -26,7 +26,7 @@ func (d *Fusion6Driver) Clone(dst, src string) error {
if
_
,
_
,
err
:=
runAndLog
(
cmd
);
err
!=
nil
{
if
_
,
_
,
err
:=
runAndLog
(
cmd
);
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
"parameters was invalid"
)
{
if
strings
.
Contains
(
err
.
Error
(),
"parameters was invalid"
)
{
return
fmt
.
Errorf
(
return
fmt
.
Errorf
(
"Clone is not supported with your version of Fusion. Packer "
+
"Clone is not supported with your version of Fusion. Packer "
+
"only works with Fusion %s Professional or above. Please verify your version."
,
VMWARE_FUSION_VERSION
)
"only works with Fusion %s Professional or above. Please verify your version."
,
VMWARE_FUSION_VERSION
)
}
}
...
...
builder/vmware/iso/driver_esx5.go
View file @
e422a454
...
@@ -22,11 +22,11 @@ import (
...
@@ -22,11 +22,11 @@ import (
// ESX5 driver talks to an ESXi5 hypervisor remotely over SSH to build
// ESX5 driver talks to an ESXi5 hypervisor remotely over SSH to build
// virtual machines. This driver can only manage one machine at a time.
// virtual machines. This driver can only manage one machine at a time.
type
ESX5Driver
struct
{
type
ESX5Driver
struct
{
Host
string
Host
string
Port
uint
Port
uint
Username
string
Username
string
Password
string
Password
string
Datastore
string
Datastore
string
CacheDatastore
string
CacheDatastore
string
CacheDirectory
string
CacheDirectory
string
...
...
packer/rpc/client.go
View file @
e422a454
package
rpc
package
rpc
import
(
import
(
"github.com/mitchellh/packer/packer"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/mitchellh/packer/packer"
"io"
"io"
"log"
"log"
"net/rpc"
"net/rpc"
...
...
packer/rpc/server.go
View file @
e422a454
...
@@ -2,8 +2,8 @@ package rpc
...
@@ -2,8 +2,8 @@ package rpc
import
(
import
(
"fmt"
"fmt"
"github.com/mitchellh/packer/packer"
"github.com/hashicorp/go-msgpack/codec"
"github.com/hashicorp/go-msgpack/codec"
"github.com/mitchellh/packer/packer"
"io"
"io"
"log"
"log"
"net/rpc"
"net/rpc"
...
...
post-processor/vagrant-cloud/post-processor.go
View file @
e422a454
...
@@ -111,7 +111,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
...
@@ -111,7 +111,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
// The name of the provider for vagrant cloud, and vagrant
// The name of the provider for vagrant cloud, and vagrant
providerName
:=
providerFromBuilderName
(
artifact
.
Id
())
providerName
:=
providerFromBuilderName
(
artifact
.
Id
())
boxDownloadUrl
,
err
:=
p
.
config
.
tpl
.
Process
(
p
.
config
.
BoxDownloadUrl
,
&
boxDownloadUrlTemplate
{
boxDownloadUrl
,
err
:=
p
.
config
.
tpl
.
Process
(
p
.
config
.
BoxDownloadUrl
,
&
boxDownloadUrlTemplate
{
ArtifactId
:
artifact
.
Id
(),
ArtifactId
:
artifact
.
Id
(),
Provider
:
providerName
,
Provider
:
providerName
,
})
})
...
...
post-processor/vagrant-cloud/step_release_version.go
View file @
e422a454
...
@@ -2,9 +2,9 @@ package vagrantcloud
...
@@ -2,9 +2,9 @@ package vagrantcloud
import
(
import
(
"fmt"
"fmt"
"strings"
"github.com/mitchellh/multistep"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/packer"
"strings"
)
)
type
stepReleaseVersion
struct
{
type
stepReleaseVersion
struct
{
...
...
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