f42f5a8ad3
Remove some extra logging.
2018-10-25 12:44:29 -07:00
e7e6a80587
No need to make upload public.
2018-10-25 12:39:51 -07:00
c294e65c36
A separate driver file is not really needed anymore
2018-10-25 12:39:51 -07:00
2ed6c3ef5e
Set output dir always according to the config.
2018-10-25 12:37:47 -07:00
c940f7e754
Conditional reload.
2018-10-25 12:37:47 -07:00
17845beadc
Fix the CommHost tests
2018-10-25 12:37:47 -07:00
5e74bcfb88
Fix tests, move remote_ default values to driver_config.
2018-10-25 12:30:57 -07:00
4d9cb19012
Refactor artifacts and output_dir implementations.
2018-10-25 12:21:24 -07:00
2d00dc6756
Add VMName to the vmx mods.
2018-10-25 11:17:09 -07:00
7b5943160b
Re-enable the CommHost() call. Use common's driver factory.
2018-10-25 11:17:09 -07:00
ba22090bc9
Move step_register and step_uload_vmx from iso to common.
2018-10-25 11:07:02 -07:00
b5298464c5
Move the remote_driver from iso to common.
2018-10-25 11:01:22 -07:00
91c7089455
Implement the first version of the remote Clone().
2018-10-25 10:37:45 -07:00
46cfb5a30c
Move driver_esx5 to commons and allow it to be instantiated wtih NewDriver()
2018-10-25 10:33:37 -07:00
fd8a85042d
use strconv.Quote instead of fmt.Sprint
2018-10-22 10:59:47 -07:00
18c5e8deb8
fix
2018-10-19 13:46:55 -07:00
1e4133cbf9
quote upload path
2018-10-19 13:43:13 -07:00
3f591d78f3
quote vmx path in register function
2018-10-19 13:42:40 -07:00
8cba32d526
escape all the d.sh calls that contain paths
2018-10-19 13:42:40 -07:00
5b9adc0c48
single quotes
2018-10-19 13:42:40 -07:00
e5e75df033
fix datastore path that contains spaces
2018-10-09 16:36:55 -07:00
38cc525ec7
new option allowing user to clean up the ephemeral ssh key from the authorized_keys file
2018-09-14 11:06:38 -07:00
1833b4edaf
validate compaction is skipped when not 'thin'
2018-08-30 16:44:00 -05:00
b51cd22b21
document ESXi disk compaction & use verbose option
2018-08-30 16:44:00 -05:00
09c71f3810
add support for disk compaction to esx5 builder
2018-08-30 16:43:53 -05:00
25de7ad1f2
PrivateKey => PrivateKeyFile
2018-08-29 14:40:33 +02:00
5369c15459
helper: communicator.SSHFileSigner => ssh.FileSigner
...
* had to to avoid circular dependency
* this commit fixes #6631 ( esxi cannot be reached by ssh )
2018-08-29 14:40:33 +02:00
51d2aac9f6
SSHPrivateKey => SSHPrivateKeyFile
2018-08-29 14:40:32 +02:00
bf191d1ef6
Merge pull request #6204 from arizvisa/GH-6197
...
Specify "bios.hddOrder" during the CreateVMX step for the vmware-iso builder.
2018-08-24 15:46:31 -07:00
340363a649
Merge pull request #6613 from hashicorp/merge_ssh_config_funcs
...
Merge ssh config funcs from builders
2018-08-23 16:03:36 -07:00
31d4f8af45
use a time.Duration instead of a hardcoded ms
2018-08-23 13:16:01 -07:00
918db58604
added new template variables to replace PACKER_KEY_INTERVAL with tunable key and keygroup intervals depending on driver used
2018-08-22 11:37:56 -07:00
fa44a4546f
use ssh.ParsePrivateKey where we can
2018-08-22 18:23:09 +02:00
41f6e0334d
refactor all copy pasted sshConfig with into communicator.Config.SSHConfigFunc
...
* still need to append the auth methods into an array for gracefullness
2018-08-22 17:02:23 +02:00
6b3844a64f
Revert "allow to use ISO images in-place v.s. copying them"
2018-08-20 10:48:06 +02:00
17f2949e36
remove stuttering; ISOConfig.InplaceISO -> Inplace
2018-08-15 15:51:25 +02:00
82e480a285
allow to use ISO images inplace v.s. copying them
2018-08-15 14:37:38 +02:00
2c4f703ff8
Merge
2018-07-24 20:54:08 -04:00
1d15f09e36
Merge pull request #6440 from DanHam/simplify-vmx-find-disks
...
Further simplify enumeration of attached disks for VMware VMX builder
2018-07-12 11:05:35 -07:00
a39c5887fb
Test we halt if a bad path is set in vmx_path
2018-07-06 10:58:25 +01:00
21117e5d38
Test we fail if displayName is not stored in the statebag as 'display_name'
2018-07-06 10:58:25 +01:00
88c43ec98d
Test we fail if the displayName key is not found in the VMX
2018-07-06 10:58:24 +01:00
d68d26a6e5
Fix tests: We now need to set `displayName` key/val pair in the test VMX
2018-07-06 10:58:24 +01:00
902cea0f30
ESXi: Fix failure to export VM when `displayName` differs from `vm_name`
...
ovftool requires we pass in `displayName` as part of the source locator
string so that it can successfully determine the VM intended for export.
2018-07-06 10:58:17 +01:00
cd7d3812ea
ESXi: Fix failure to get VM IP when `displayName` differs from `vm_name`
...
The value in the Name field returned by 'esxcli network vm list'
actually returns the VMs `displayName`. As such, we need to match
against `displayName` to discover the VMs 'WorldID'.
'WorldId' is ultimately used/needed as an argument in the command that
returns the VMs IP.
2018-07-06 10:58:09 +01:00
3eab3cc99b
ESXi builds require we store the value of displayName in the statebag
...
The value of displayName is needed by later steps:
* When determining the IP address of the build VM
* When exporting the VM using ovftool
By default Packer will configure the VMX so `displayName` is equal to
the value defined for `vm_name` in the build template. However, it is
possible (and sometimes desirable) to set a custom value for
`displayName`.
Users can set a custom `displayName` through use of the `vmx_data`
option in their template.
2018-07-06 01:58:09 +01:00
8658eaf1ac
Merge pull request #6424 from DanHam/fix-esxi-export-hang
...
Prevent hang on export when using VMware ISO builder on remote ESXi host
2018-07-02 16:42:08 -07:00
939aa7e289
Add test: We shouldn't error when main remote options are unset
2018-07-02 18:13:19 +01:00
efcdf60d96
Add tests to ensure remote_password is set when exporting with ovftool
2018-07-02 18:13:19 +01:00
0d9134bdbc
Fix existing tests as they were not doing what they should have been
...
* Fix test to check for remote_host when remote_type is set
* Fix tests by including remote_password where required
2018-07-02 18:12:41 +01:00
eee16262b6
Remove duplicate/redundant test
2018-07-02 18:10:50 +01:00
c8199458a7
Prevent hang on export for remote ESXi build due to empty remote_password
2018-07-02 18:10:50 +01:00
406f4eeb93
Merge pull request #6394 from conradjones/master
...
Add support to vmware-vmx for linked clones
2018-07-02 09:50:24 -07:00
fff72780e1
Further simplify enumeration of attached disks for VMware VMX builder
...
* Collate separate regexp's into one for greater efficiency
* Inline function and remove unnecessary struct and variables
2018-07-01 16:18:33 +01:00
d9b6924986
Add cloneType to fusion driver
2018-06-30 16:31:42 +01:00
04ff0761e6
Notify that we are skipping file, but retain error message
2018-06-25 08:28:32 -07:00
591bfe3dfa
Continue searching for leases even if one of the files cannot be read.
2018-06-22 18:09:27 -07:00
d05a601d00
Add support to vmware-vmx builder for linked clones.
2018-06-17 01:38:42 +01:00
c586312bf7
Merge pull request #4538 from hashicorp/defaultovf
...
builder/vmware: correctly default export format to ovf
2018-06-07 11:36:48 -07:00
73eb9a629e
Revert "Fix test - reporting compaction results requires a tmp file"
...
This reverts commit f342975ff3
2018-05-16 13:52:00 +01:00
2939cd75ae
Revert "Report the result of the disk compaction step"
...
Unfortunately this broke the ability to build on remote (ESXi) hosts.
This reverts commit 08f9d619a9
2018-05-16 12:55:59 +01:00
a866232ac9
Use regex based approach to detect attached disks
2018-05-08 12:52:39 +01:00
25dd27a164
Remove tmp directories created by builder/vmware/common tests
2018-04-30 20:38:03 +01:00
c828015bc3
Follow variable varName <-> statebag var_name convention
2018-04-27 20:09:19 +01:00
f342975ff3
Fix test - reporting compaction results requires a tmp file
2018-04-27 16:40:44 +01:00
08f9d619a9
Report the result of the disk compaction step
2018-04-27 16:40:29 +01:00
10d93dffa4
Fix tests for vmware/common
2018-04-27 16:40:23 +01:00
a729ecda87
Fix tests for vmware/vmx builder
2018-04-27 16:40:13 +01:00
c48a7889f9
Simplify handling of disks by collating requirements and unifying ops
2018-04-27 16:39:52 +01:00
67a9c7fb92
we never expect remote cache to be a directory.
2018-04-26 12:40:40 -07:00
de1dac1bdf
don't delete the cache directory.
2018-04-26 12:40:40 -07:00
97cfd60b82
Remove remote cache correctly.
2018-04-26 12:40:35 -07:00
673d4579e4
Ack! Forgot to include the template variable in the definition for vmxTemplateData for commit 0e519d79e0. Now it's added..
2018-04-26 14:22:37 -05:00
0e519d79e0
Modified iso/step_create_vmx.go in the vmware-iso builder to also specify the "bios.hddOrder" field depending on the hdd device that was specified. This might close issue #6197
2018-04-26 14:16:50 -05:00
5d8b476a7f
Fixed the regex in common/step_clean_vmx.go for the VMware builder to also support removal of sata-based cdrom devices. Also added a comment in iso/step_create_vmx.go that links both pieces of related code.
2018-04-26 14:01:58 -05:00
451e3d0554
builder/vmware-esxi: remove floppy files when done
2018-04-26 10:47:33 -07:00
6bbfe7e0bd
remove useless check against format
2018-04-23 10:24:49 -07:00
fdeadfe3f6
builder/vmware: correctly default export format to ovf
2018-04-23 10:17:53 -07:00
bd9e585cb9
Add test for enumeration of vmx network type
2018-04-21 22:49:36 +01:00
94d5a7f2e2
Fix copy/paste error referencing Virtualbox
2018-04-21 22:49:36 +01:00
1aee759f06
Fix tests and reconfigure for support of multi-disk vm
2018-04-21 22:49:36 +01:00
6c9d4efd9f
Fix error on compaction step of vmx build. Support compacting multi-disk vm
2018-04-21 22:49:36 +01:00
c6299972b9
s/boot_command/bootcommand/
2018-04-19 14:26:31 -07:00
408eba88ad
flatten boot command config and implement for vmware
2018-04-19 14:26:30 -07:00
cba4d3235f
cleanup
2018-04-19 14:26:29 -07:00
bf0a320125
Implement new parser for qemu boot command
2018-04-19 14:26:29 -07:00
1c0af28662
Some cleanup and comments.
2018-04-19 14:26:29 -07:00
4e2f14196a
Rely on context to cancel typing boot command.
2018-04-19 14:26:28 -07:00
673245afcf
Replace boot command parser with PEG parser.
2018-04-19 14:26:28 -07:00
83162717ed
Merge pull request #4563 from marema31/vmware-iso-warn-esx
...
builder/vmware-iso: Fail on wrong remote_type value
2018-04-06 16:52:26 -07:00
2c2904c095
Modified the path finders for the Player driver in the vmware-builders to search through all the possible variations for dhcp configuration and leases..
2018-03-30 18:19:25 -05:00
7e9699675f
Modified device matching logs to look more consistent.
2018-03-30 18:15:46 -05:00
6e176f97a0
Added logs to all of the VMware drivers that emits each detected network device that gets enumerated for a network.
2018-03-29 13:12:59 -05:00
646523c5f4
Replaced the call to os.Open and ReadNetworkMap to just a single call to ReadNetmapConfig in both the Workstation9 and Player5 VMware drivers.
2018-03-29 13:04:25 -05:00
55702a697a
Ack, forgot to :w in vim. Changed ui.Say in step_clone_vmx.go to use fmt.Sprintf as it originally was a call to log.Printf.
2018-03-25 19:03:46 -05:00
72da7cbfbb
Fixed a case-sensitivity issue when determing the network type during cloning in the vmware-vmx builder and added also some logs that output the different options that were determined from the .vmx. This outputs more accurate debug information and helps out with issue #5925
2018-03-25 18:51:37 -05:00
ef4f3f143b
Merge pull request #5985 from AndiDog/f-5979-vmware-fusion-guestip-lookup-multiple-devices
...
Handle multiple devices per VMware network type
2018-03-21 17:12:36 -07:00
fa36e1d961
spelling: processing
2018-03-14 02:17:22 +00:00
61030c0d85
spelling: output
2018-03-13 08:27:26 +00:00
d987fcefc3
spelling: multiples
2018-03-13 08:12:53 +00:00
ff92fb883d
Handle multiple devices per VMware network type
...
Fixes #5979
2018-03-07 10:59:55 +01:00
ac2e02b938
remove loglines that should not have made it onto master
2018-03-06 14:12:39 -08:00
df6cdcc7f7
Disable the usage of the XHCI bus for USB on the vmware-iso builder.
...
Some platforms with incomplete XHCI implementations (i.e. FreeBSD)
will poll the bus despite there being no usb devices available.
This disables XHCI by default and documents how to enable it using
the vmx_data option.
This closes issue #5961 .
2018-03-05 20:58:43 -06:00
9e8e376d6c
Merge pull request #5932 from hashicorp/add_configurable_snapshot_timeout
...
add configurable snapshot timeout to oracle-classic builder
2018-02-22 14:27:20 -08:00
597ddc2192
add configurable snapshot timeout to oracle-classic builder
2018-02-22 14:01:53 -08:00
33acdbf3bf
move comments so indentation is more logical
2018-02-21 14:57:58 -08:00
ac2ddbcbf5
Fixes the assumption that all the VMware builder's drivers will implement a network mapper for mapping a network name to it's corresponding device.
...
The ESX5 driver doesn't have a way of mapping the network name to its device name because a .vmx template uses different field names for it and so packer let's ESX handle filling this in. This patch will check to see if the driver that packer determines is missing a NetworkMapper implementation (by checking for nil). If it is, then fall back to using "nat" despite ESX not using the network type at all. This is what packer did prior to exposing the network type to the user back in version 1.1.3.
This closes issue #5916 .
2018-02-20 19:45:55 -06:00
27ed479b0a
Reinforced the VMWare Workstation builder methodology for locating the dhcp.conf and dhcpd.leases files on Linux.
...
It was reported that on WS14 on Linux, that the path may be different than stated in the documentation. This modifies `workstationDhcpConfPath` and `workstationDhcpLeasesPath` functions to walk through every permutation while attempting to find the correct file.
This reinforces the fix for issue #5882 .
2018-02-14 00:11:17 -06:00
d6e5342ece
Fixed a type-o in the VMWare builder when locating the dhcp configuration file on Linux.
...
Closes issue #5882 .
2018-02-13 17:27:17 -06:00
fa2dddd26d
Fixed some things mucked up during rebase.
2018-02-02 19:45:18 -06:00
aefe41a44a
Fixed an issue with the previous commit so that when the user does not specify the cdrom_adapter_type to fallback to the original decision made by the disk adapter type selection.
2018-02-02 19:18:50 -06:00
eb0445ca96
Added support for specifying both the network adapter type and cdrom adapter type as requested by @night199uk. Also included the respective documentation for these new options.
2018-02-02 19:18:50 -06:00
74946071d2
Added support for specifying the disk adapter type to the vmware builders. This was squashed from the vmware-diskAdapterType branch ( #2968 ) as submitted by Rami Abughazaleh <icnocop@users.noreply.github.com>. This closes #5671 and possibly #4885 .
...
arizvisa: Updated icnocop's documentation to include the possible disk adapter types that one can specify.
arizvisa: Tweaked icnocop's support for the `disk_adapter_type` option to the VMWare builder that caused conflicts due to version skew.
icnocop: Updated links to the Virtual Disk Manager User's Guide PDF to open in a new window and also added the Adobe PDF icon
icnocop: Added support for vmware to specify the disk adapter type, ide or scsi (lsilogic or buslogic)
2018-02-02 19:18:49 -06:00
594ed950c7
Fixed a race condition in builder/vmware/common/driver_parser.go due to a misunderstanding how channels work when you close them.
2018-02-02 19:18:49 -06:00
737e951685
Added missing root path to path-finders for the VMware Fusion implementation in the vmware builder as mentioned by @SwampDragons.
2018-02-02 19:18:49 -06:00
b2fec18b1e
Added parser for VMware Fusion's networking file. Replaced VmwareDriver's NetmapConfPath with a NetworkMapperInterface in order to handle the differences between VMware Fusion and the rest of the VMware suite.
2018-02-02 19:18:49 -06:00
069d00f70b
Added the paths suggested by @phekmat and @SwampDragons for VMware Fusion... Although parser for the new mapper format is likely to be needed still.
2018-02-02 19:18:49 -06:00
8cc0776f3a
Fixed oversight in VMware builder's mock-driver that neglected to initialize 'HostAddressResult'.
2018-02-02 19:18:49 -06:00
029c357d8c
Modified some tests to require the PACKER_ACC environment variable to be set before executing them. This turns them into acceptance tests as per CONTRIBUTING.md.
2018-02-02 19:18:49 -06:00
58ebc5c9a5
When specifying NONE for serial or parallel in the VMware builder, disable the serial and parallel port devices entirely.
2018-02-02 19:18:48 -06:00
258804106b
Added missing GetVmwareDriver() method to VMware Builder's DriverMock.
2018-02-02 19:18:48 -06:00
6423525a33
Updated imports of github.com/mitchellh/packer to new naming scheme github.com/hashicorp/packer
2018-02-02 19:18:48 -06:00
75fbfa0763
Replaced a hacky type assertion in the VMware builder with a call to Driver.GetVmwareDriver() that returns the driver-specific structure for ip and addressing information. Also implemented the addressing functions for the ESXi driver interface.
...
This fixes an issue where a driver might not have defined a VmwareDriver by forcing a developer to implement it via the standard Driver interface.
2018-02-02 19:18:48 -06:00
898b27c16d
Added support for the NONE option to be specified for parallel and serial ports in the vmware iso builder.
2018-02-02 19:18:48 -06:00
884af69da1
go fmt on builder/vmware/*
2018-02-02 19:18:48 -06:00
0d6cf7fac4
Added support for auto-detection to the serial and parallel port types.
...
Included the yield option to all the serial port types.
Added the ability for the network type to fallback to a custom network if the
specified network name is not found in netmap.conf.
Promoted the scope for both Read{Dhcp,Netmap}Config inside vmwcommon.driver.
Updated the documentation for the VMware builder.
2018-02-02 19:14:29 -06:00
b52e2d3f45
Added the ability for the vmware-builder to fallback and determine the network device-name using the .vmx configuration in case of a guest using the "custom" connection type.
2018-02-02 19:13:02 -06:00
e389d30a1b
Implemented the unit-tests for builder/vmware/iso/step_create_vmx.go
2018-02-02 19:13:02 -06:00
15cb6a833a
Ugh..missing argument in VMware builder's driver_esx5 unit-test due to api change for .HostIP(). Fixed.
2018-02-02 19:11:41 -06:00
9b95ce0bc6
Completely forgot to support the unix paths in each of the drivers for the VMware builder. Fixed.
2018-02-02 19:11:41 -06:00
4225b3568e
Fixed bad ORs and a bad fmtstring.
2018-02-02 19:11:41 -06:00
75d3ea7cee
Added support for sound, serial ports, parallel ports, usb, and specifying a default network to the vmware builder.
...
builder/vmware/{iso,vmx}:
Added the specific configuration options that get parsed.
Normalize paths when pulling them from the json template so that they'll work on Windows too.
Added some improved error checking when parsing these options.
Stash the vm's network connection type so that other steps can figure out addressing information
Modified the esx5 driver to support the new addressing logic.
Modified the template in step_create_vmx to include the new options.
builder/vmware/common:
Implemented a parser for vmware's configuration files to the vmware builder.
Modified the driver's interface to include support for resolving both guest/host hw and ip addresses
Implemented a base structure with some methods that implement these features.
Rewrote all ip and mac address dependent code to utilize these new methods.
Removed host_ip and guest_ip due to their logic being moved directly into a
base-structure used by each driver. The code was explicitly checking runtime.GOOS
instead of portably using net.Interfaces() anyways.
Updated driver_mock to support the new addressing methods
2018-02-02 19:11:41 -06:00
8ae8f31a52
Merge pull request #5681 from mcandre/super-key
...
add super key (vmware builder)
2018-02-02 13:33:11 -08:00
8bdd3b45c7
use helper functions for reading vmx files
2018-01-31 13:19:31 -08:00
76b2ce8604
log which vmware driver we decide on
2018-01-26 16:12:43 -08:00
07421b4433
test vmware workstation version checking
2018-01-26 15:58:17 -08:00
8cd403425e
test fixes WIP
2018-01-24 17:09:17 -08:00
7a189a83a1
fix imports
...
`find . -type f -name '*.go' -not -path "./vendor/*" -exec goimports -w {} \;`
2018-01-24 17:09:17 -08:00
a831d522be
change run signatures
...
Run now takes a context as well as a statebag. We'll assign the context
to the blank identifier to prevent namespace collisions. We'll let the
step authors opt-in to using the context.
`find . -iname "step_*.go" -exec gsed -i'' 's/func \(.*\)Run(/func \1Run(_ context.Context, /' {} \;`
2018-01-24 17:09:17 -08:00
366dc3da0a
move multistep imports to helper.
...
gomvpkg -from "github.com/mitchellh/multistep" -to "github.com/hashicorp/packer/helper/multistep"
2018-01-24 17:09:15 -08:00
ebe995c0ff
run goimports
2018-01-22 17:21:10 -08:00
d069dc5b7c
handle holding a-z keys, such as for boot options (vmware builder)
2017-12-09 20:51:49 -06:00
4acc98a729
add super key (vmware builder)
2017-12-07 23:15:56 -06:00
8a30b3db80
Merge pull request #5456 from GoSecure/vmware-iso-improved-network-logging
...
vmware-iso builder: Logging on network errors on connection refused
2017-11-30 16:31:30 -08:00
f7b45312f1
Removing skip attribute
2017-11-10 23:58:24 -03:00
be2afccb85
Revamped the process to verify remote cache.
2017-11-10 23:55:26 -03:00
463d87adcd
Merge branch 'master' of https://github.com/hashicorp/packer into esxi-remote-cache
2017-11-10 23:08:09 -03:00
23f4d187e2
validating keep_registered and fixing skip_export issues
2017-11-08 15:57:34 -03:00
4d117bf117
Make vm log output less confusing
2017-11-02 10:45:54 -07:00
820811675d
vmware-iso builder: Logging on network errors on connection refused
2017-10-13 19:00:48 -04:00
Alexander Laamanen
Megan Marsh
Jeffrey Martin
Adrien Delorme
Adrien Delorme
bugbuilder
DanHam
Conrad Jones
Bob Brumfield
Matthew Hooker
Ali Rizvi-Santiago
Josh Soref
Andreas Sommer
Andrew Pennebaker
bugbuilder
Olivier Bilodeau