Commit Graph

70 Commits

Author SHA1 Message Date
Mitchell Hashimoto 23a48d6619 go fmt 2015-06-08 21:34:20 -07:00
jszwedko b1497b951c code.google.com/p/go.crypto/ssh -> golang.org/x/crypto/ssh
code.google.com/p/go.crypto/ssh is now at golang.org/x/crypto/ssh as of
https://code.google.com/p/go/source/detail?spec=svn.crypto.69e2a90ed92d03812364aeb947b7068dc42e561e&repo=crypto&r=8fec09c61d5d66f460d227fd1df3473d7e015bc6

Using the code.google.com import redirects properly, but runs into
issues if you try to use a subpackage of `ssh`, e.g. `agent` which
refers to golang.org/x/crypto/ssh causing conflicts if your types expect
code.google.com/p/go.crypto/ssh.

This is a precursor to a PR for #1066.
2015-05-28 08:17:49 -07:00
Mitchell Hashimoto 77af5f83f7 Merge pull request #2120 from vtolstov/discard
add discard option to qemu builder
2015-05-27 20:18:11 -07:00
Mitchell Hashimoto 3e76547bff bulder/qemu: convert interpolation 2015-05-27 13:39:43 -07:00
Vasiliy Tolstov 3984f5e6f6 add discard option to qemu builder
Enabling discards for disk can greatly minimize disk size then user
inside vm use fstrim command or trim/discard unneded blocks.

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-05-17 20:48:58 +03:00
Emil Hessman cceb4b2868 builder/qemu: fix incorrect printf verb type
Fixes the following vet report:

builder/qemu/builder_test.go:163: arg b.config.DiskSize for printf verb %s of wrong type: uint
2015-02-25 05:43:17 +01:00
Seth Vargo 96c813684e Merge pull request #1645 from vtolstov/qemu_disk
Allow none checksumtype for qemu builder
2014-11-26 16:28:19 -05:00
Vasiliy Tolstov 2126615b3d disk_filename is used for artifacts, but it missed in case of disk_image = true
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-11-06 23:47:00 +03:00
Vasiliy Tolstov 16110c6be6 add CD-ROM only if not used disk_image, also boot from it only if CD-ROM present
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-11-06 23:13:09 +03:00
Vasiliy Tolstov 4762075dc3 add missing variable
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-10-31 16:15:23 +03:00
Vasiliy Tolstov 5631873727 allow none checksumtype for qemu builder (copy/paste from virtualbox)
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-10-31 16:07:04 +03:00
Mitchell Hashimoto 06144cf287 fmt 2014-10-28 08:43:19 -07:00
Mitchell Hashimoto 0db6cd3533 Merge pull request #1330 from qur/qemu-vagrant
Qemu vagrant
2014-10-28 08:42:17 -07:00
Mitchell Hashimoto 60e2a8b5fc Merge pull request #1342 from iwebhosting/qemu-image-support
Add support for building QEMU images from pre-existing image files
2014-10-28 08:38:51 -07:00
Vasiliy Tolstov e1e3d3c1e1 fix quote in variable name
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-10-28 17:25:53 +03:00
Mitchell Hashimoto c161f9adc5 Merge pull request #1558 from vtolstov/qemu_cache
builder/qemu: add ability to set cache mode for disk
2014-10-27 16:56:16 -07:00
Kent Holloway 9e2d0af5ab Reverting previous change, including M on memory line to be explicit about what we are requesting 2014-10-06 10:11:39 -05:00
Vasiliy Tolstov 8efc8ec984 add ability to set cache mode for disk
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2014-10-06 01:09:45 +04:00
Kent Holloway 6b5a505384 -redir is deprecated and missing on some versions of QEMU, using -netdev instead which is recommended. Removing M letter from Memory flag as QEMU now assumes this value is always in MB and errors out if you pass the M as a part of the command 2014-10-03 10:39:57 -05:00
Kent Holloway 2755ba1751 Changing machinetype default to PC instead of PC-1.0 which seems to be a saner default that works on more platforms. RedHat in particular doesnt have PC-1.0 2014-10-03 10:37:03 -05:00
Kent Holloway 2cf7e694bc Fix for panic when ssh min and max port is the same for qemu builder. Taken directly from a previous patch by mitchellh 8f50d2dd9a 2014-10-03 10:14:02 -05:00
Julian Phillips 60e608dfdb Add support for vagrant with qemu
Once we have produced a qemu VM, we now have the option of using
the vagrant post-processor to create a .box file that can be used with
the vagrant-libvirt plugin.

This uses the new State method of the Artifact API to get necessary
information from the builder.
2014-09-22 11:15:47 +01:00
Julian Phillips 90a57c411f Expand Artifact API to expose build state
In order that something consuming an artifact can have access to extra
builder specific data add the State method which allows the caller to
ask for arbitary values by name.
2014-09-22 11:15:47 +01:00
Mitchell Hashimoto 76a8221636 builder/*: extract key path to ssh.Signer 2014-09-03 20:23:39 -07:00
Mitchell Hashimoto 6bbf64c5ab builder/qemu: use 512M for -m [GH-1444] 2014-09-02 11:19:12 -07:00
Mitchell Hashimoto 752162c234 fmt 2014-09-02 09:55:06 -07:00
Mitchell Hashimoto 78c534227a Merge branch 'master_add_support_for_tcg_accel_in_qemu_builder_' of github.com:mattthias/packer into mattthias-master_add_support_for_tcg_accel_in_qemu_builder_
Conflicts:
	builder/qemu/builder.go
	website/source/docs/builders/qemu.html.markdown
2014-09-02 09:31:53 -07:00
Mitchell Hashimoto 88c186df39 Merge branch 'master' of github.com:matthbak/packer into matthbak-master
Conflicts:
	builder/qemu/step_run.go
2014-09-02 09:24:31 -07:00
Hiroyuki Sato 965d273907 Add machine_type option for qemu builder.
On CentOS7, ``pc-1.0'' qemu-kvm machine type are not supported.

Supported machines are:
none                 empty machine
pc                   RHEL 7.0.0 PC (i440FX + PIIX, 1996) (alias of pc-i440fx-rhel7.0.0)
pc-i440fx-rhel7.0.0  RHEL 7.0.0 PC (i440FX + PIIX, 1996) (default)
rhel6.5.0            RHEL 6.5.0 PC
rhel6.4.0            RHEL 6.4.0 PC
rhel6.3.0            RHEL 6.3.0 PC
rhel6.2.0            RHEL 6.2.0 PC
rhel6.1.0            RHEL 6.1.0 PC
rhel6.0.0            RHEL 6.0.0 PC
q35                  RHEL-7.0.0 PC (Q35 + ICH9, 2009) (alias of pc-q35-rhel7.0.0)
pc-q35-rhel7.0.0     RHEL-7.0.0 PC (Q35 + ICH9, 2009)
2014-08-12 16:02:03 +09:00
Matthew Baker b8c13d3e4d Keeping the -machine type=pc if accelerator method set to "none" 2014-08-07 04:08:50 -07:00
Matthew Baker 99d15abfd2 adding allowed values for accelerator 2014-08-07 02:51:24 -07:00
Matthew Baker 9220d644d1 Making graphics and hardware virtualisation optional and configurable 2014-08-06 02:43:38 -07:00
Matthias Schmitz 65f71daf73 Allow 'tcg' as accelerator in builder-qemu
* Using 'tcg' as accelerator for qemu-system allows packer to run in a
  virtual machine as no kvm or xen support is needed.

* Also document the default behavior if no accelerator is given in the
  documentation.
2014-08-05 22:46:47 +02:00
Matthew Baker c87c88fce2 OEL available net device 2014-07-29 07:41:07 -07:00
Matthew Baker 0d07960f3e Disabling SDL gui mode 2014-07-29 07:40:29 -07:00
iweb d7268a11f7 Add support for building QEMU images from pre-existing image files
If the `disk_image` parameter is set to true treat the ISO location
as the source of the disk image, copy it to the destination,
resize and boot it.
2014-07-17 15:05:46 +01:00
Jakob A. Dam 40150c376d Fix http_files typo in comments 2014-05-06 17:13:15 +02:00
Mitchell Hashimoto fa339fc275 get more proper SSH package usage in 2014-04-26 11:23:26 -07:00
Mitchell Hashimoto e84e5e4f2c Merge branch 'update-ssh-package' of github.com:higebu/packer into higebu-update-ssh-package
Conflicts:
	builder/amazon/common/ssh.go
	builder/digitalocean/ssh.go
	builder/googlecompute/ssh.go
	builder/openstack/ssh.go
	communicator/ssh/communicator_test.go
	communicator/ssh/keychain.go
	communicator/ssh/keychain_test.go
2014-04-26 11:12:06 -07:00
higebu f087ce16dc Fix the build problem by updating ssh package 2014-04-15 10:17:26 +09:00
Ross Smith II 27491f93f8 use old ssh code until higebu's branch is ready, see #1019 2014-04-11 08:23:12 -07:00
Stefano Zanella 85dcdcfead builder/qemu: support user templates in SSH key path 2014-02-27 18:37:44 +01:00
Mitchell Hashimoto 868a64ebbc fmt 2014-02-21 16:48:30 -08:00
Mitchell Hashimoto 0fd7bdd3f5 builder/qemu: style 2014-02-21 15:22:58 -08:00
Mitchell Hashimoto 1b23af2667 Merge pull request #854 from qur/qemu-config-binary
builder/qemu: binary name to be configured
2014-02-21 15:22:27 -08:00
Mitchell Hashimoto d2fe49d6a2 builder/qemu: document run_once is gone (but keep it around for compat) 2014-02-21 15:18:03 -08:00
mheidenr cfb9b4d65d enable qemu builder to handle reboots in the shell provisioner 2014-01-30 08:46:54 +01:00
Julian Phillips a8993662b5 Allow Qemu binary name to be configured
On some systems the default Qemu binary name of qemu-system-x86_64
isn't appropriate.  So expose the binary name as a configurable item,
allowing the user to set it to something more appropriate if they need
to.
2014-01-24 18:01:42 +00:00
Mitchell Hashimoto 430963f400 fmt 2014-01-19 19:30:11 -08:00
Myles Steinhauser 28286d2821 Fix tabs vs spaces 2014-01-13 00:03:10 -05:00