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
9ad2b986
Commit
9ad2b986
authored
Aug 11, 2014
by
Mikhail Zholobov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
builder/parallels: Removed config parameter 'ostype'
We have to set either 'ostype' or 'distribution', but not both.
parent
77ae2014
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
builder/parallels/iso/builder.go
builder/parallels/iso/builder.go
+3
-6
builder/parallels/iso/builder_test.go
builder/parallels/iso/builder_test.go
+2
-2
builder/parallels/iso/step_create_vm.go
builder/parallels/iso/step_create_vm.go
+0
-1
No files found.
builder/parallels/iso/builder.go
View file @
9ad2b986
...
...
@@ -33,7 +33,6 @@ type config struct {
ParallelsToolsMode
string
`mapstructure:"parallels_tools_mode"`
ParallelsToolsGuestPath
string
`mapstructure:"parallels_tools_guest_path"`
ParallelsToolsHostPath
string
`mapstructure:"parallels_tools_host_path"`
GuestOSType
string
`mapstructure:"guest_os_type"`
GuestOSDistribution
string
`mapstructure:"guest_os_distribution"`
HardDriveInterface
string
`mapstructure:"hard_drive_interface"`
HostInterfaces
[]
string
`mapstructure:"host_interfaces"`
...
...
@@ -47,6 +46,9 @@ type config struct {
RawSingleISOUrl
string
`mapstructure:"iso_url"`
// Deprecated parameters
GuestOSType
string
`mapstructure:"guest_os_type"`
tpl
*
packer
.
ConfigTemplate
}
...
...
@@ -95,10 +97,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
b
.
config
.
HardDriveInterface
=
"sata"
}
if
b
.
config
.
GuestOSType
==
""
{
b
.
config
.
GuestOSType
=
"other"
}
if
b
.
config
.
GuestOSDistribution
==
""
{
b
.
config
.
GuestOSDistribution
=
"other"
}
...
...
@@ -125,7 +123,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
"parallels_tools_mode"
:
&
b
.
config
.
ParallelsToolsMode
,
"parallels_tools_host_path"
:
&
b
.
config
.
ParallelsToolsHostPath
,
"parallels_tools_guest_path"
:
&
b
.
config
.
ParallelsToolsGuestPath
,
"guest_os_type"
:
&
b
.
config
.
GuestOSType
,
"guest_os_distribution"
:
&
b
.
config
.
GuestOSDistribution
,
"hard_drive_interface"
:
&
b
.
config
.
HardDriveInterface
,
"http_directory"
:
&
b
.
config
.
HTTPDir
,
...
...
builder/parallels/iso/builder_test.go
View file @
9ad2b986
...
...
@@ -42,8 +42,8 @@ func TestBuilderPrepare_Defaults(t *testing.T) {
t
.
Errorf
(
"bad parallels tools mode: %s"
,
b
.
config
.
ParallelsToolsMode
)
}
if
b
.
config
.
GuestOS
Type
!=
"other"
{
t
.
Errorf
(
"bad guest OS
type: %s"
,
b
.
config
.
GuestOSType
)
if
b
.
config
.
GuestOS
Distribution
!=
"other"
{
t
.
Errorf
(
"bad guest OS
distribution: %s"
,
b
.
config
.
GuestOSDistribution
)
}
if
b
.
config
.
VMName
!=
"packer-foo"
{
...
...
builder/parallels/iso/step_create_vm.go
View file @
9ad2b986
...
...
@@ -28,7 +28,6 @@ func (s *stepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
commands
:=
make
([][]
string
,
8
)
commands
[
0
]
=
[]
string
{
"create"
,
name
,
"--ostype"
,
config
.
GuestOSType
,
"--distribution"
,
config
.
GuestOSDistribution
,
"--dst"
,
path
,
"--vmtype"
,
"vm"
,
...
...
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