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
5c5d6273
Commit
5c5d6273
authored
May 01, 2014
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fmt
parent
19317fe9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
builder/digitalocean/builder.go
builder/digitalocean/builder.go
+5
-5
builder/parallels/iso/step_attach_iso.go
builder/parallels/iso/step_attach_iso.go
+1
-1
builder/parallels/iso/step_create_disk.go
builder/parallels/iso/step_create_disk.go
+1
-1
builder/parallels/pvm/step_test.go
builder/parallels/pvm/step_test.go
+1
-1
common/config.go
common/config.go
+2
-2
packer/template.go
packer/template.go
+2
-2
provisioner/chef-solo/provisioner_test.go
provisioner/chef-solo/provisioner_test.go
+4
-4
No files found.
builder/digitalocean/builder.go
View file @
5c5d6273
...
...
@@ -17,7 +17,7 @@ import (
// see https://api.digitalocean.com/images/?client_id=[client_id]&api_key=[api_key]
// name="Ubuntu 12.04.4 x64", id=3101045,
const
DefaultImage
=
"ubuntu-12-04-x64"
const
DefaultImage
=
"ubuntu-12-04-x64"
// see https://api.digitalocean.com/regions/?client_id=[client_id]&api_key=[api_key]
// name="New York", id=1
...
...
@@ -25,7 +25,7 @@ const DefaultRegion = "nyc1"
// see https://api.digitalocean.com/sizes/?client_id=[client_id]&api_key=[api_key]
// name="512MB", id=66 (the smallest droplet size)
const
DefaultSize
=
"512mb"
const
DefaultSize
=
"512mb"
// The unique id for the builder
const
BuilderId
=
"pearkes.digitalocean"
...
...
@@ -42,9 +42,9 @@ type config struct {
SizeID
uint
`mapstructure:"size_id"`
ImageID
uint
`mapstructure:"image_id"`
Region
string
`mapstructure:"region"`
Size
string
`mapstructure:"size"`
Image
string
`mapstructure:"image"`
Region
string
`mapstructure:"region"`
Size
string
`mapstructure:"size"`
Image
string
`mapstructure:"image"`
PrivateNetworking
bool
`mapstructure:"private_networking"`
SnapshotName
string
`mapstructure:"snapshot_name"`
...
...
builder/parallels/iso/step_attach_iso.go
View file @
5c5d6273
...
...
@@ -3,8 +3,8 @@ package iso
import
(
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
parallelscommon
"github.com/mitchellh/packer/builder/parallels/common"
"github.com/mitchellh/packer/packer"
)
// This step attaches the ISO to the virtual machine.
...
...
builder/parallels/iso/step_create_disk.go
View file @
5c5d6273
...
...
@@ -3,8 +3,8 @@ package iso
import
(
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
parallelscommon
"github.com/mitchellh/packer/builder/parallels/common"
"github.com/mitchellh/packer/packer"
"strconv"
)
...
...
builder/parallels/pvm/step_test.go
View file @
5c5d6273
...
...
@@ -3,8 +3,8 @@ package pvm
import
(
"bytes"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
parallelscommon
"github.com/mitchellh/packer/builder/parallels/common"
"github.com/mitchellh/packer/packer"
"testing"
)
...
...
common/config.go
View file @
5c5d6273
...
...
@@ -68,7 +68,7 @@ func DecodeConfig(target interface{}, raws ...interface{}) (*mapstructure.Metada
var
md
mapstructure
.
Metadata
decoderConfig
:=
&
mapstructure
.
DecoderConfig
{
DecodeHook
:
mapstructure
.
ComposeDecodeHookFunc
(
DecodeHook
:
mapstructure
.
ComposeDecodeHookFunc
(
decodeHook
,
mapstructure
.
StringToSliceHookFunc
(
","
),
),
...
...
@@ -221,7 +221,7 @@ func decodeConfigHook(raws []interface{}) (mapstructure.DecodeHookFunc, error) {
// because internally Packer uses MsgPack for RPC and the MsgPack
// codec turns strings into []uint8
if
f
==
reflect
.
Slice
{
dataVal
:=
reflect
.
ValueOf
(
v
)
dataVal
:=
reflect
.
ValueOf
(
v
)
dataType
:=
dataVal
.
Type
()
elemKind
:=
dataType
.
Elem
()
.
Kind
()
if
elemKind
==
reflect
.
Uint8
{
...
...
packer/template.go
View file @
5c5d6273
...
...
@@ -131,8 +131,8 @@ func ParseTemplate(data []byte, vars map[string]string) (t *Template, err error)
if
vCur
.
LessThan
(
vReq
)
{
return
nil
,
fmt
.
Errorf
(
"Template requires Packer version %s. "
+
"Running version is %s."
,
"Template requires Packer version %s. "
+
"Running version is %s."
,
vReq
,
vCur
)
}
}
...
...
provisioner/chef-solo/provisioner_test.go
View file @
5c5d6273
...
...
@@ -279,11 +279,11 @@ func TestProvisionerPrepare_jsonNested(t *testing.T) {
},
"bFalse"
:
false
,
"bTrue"
:
true
,
"bNil"
:
nil
,
"bStr"
:
[]
uint8
(
"bar"
),
"bTrue"
:
true
,
"bNil"
:
nil
,
"bStr"
:
[]
uint8
(
"bar"
),
"bInt"
:
1
,
"bInt"
:
1
,
"bFloat"
:
4.5
,
}
...
...
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