Commit Graph

1155 Commits

Author SHA1 Message Date
Mitchell Hashimoto 54f4cffc00 providers/virtualbox: export after checking if package exists [GH-2380] 2013-12-31 08:45:56 -08:00
Seginoviax 3559c08086 Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840 2013-12-31 00:54:32 -08:00
Mitchell Hashimoto f89c4412b2 synced_folders/nfs: lock around sudo input [GH-2680] 2013-12-30 14:45:40 -08:00
Mitchell Hashimoto 28720b181d guests/ubuntu: remove mount_nfs cap 2013-12-30 08:12:10 -08:00
Paul Hinze fc66ec1660 providers/virtualbox: allow and prefer static guest IPs for NFS
Since vbox guest properties are proving to be less reliable than we had
hoped, bring back the static config parsing mechanism for finding a
guest IP to hand to NFS. If we find a static IP (or set of IPs) we'll
use that instead of trying to probe guest properties.

This retains NFS support for DHCP interfaces while regaining the
reliability that we previously had when static IPs were required.
2013-12-28 17:01:08 -06:00
Mitchell Hashimoto 5d39cc381f Merge pull request #2694 from tmatilai/plugin-json-errors
core: show more informative error if plugin.json parsing fails
2013-12-28 13:12:59 -08:00
Mitchell Hashimoto 0316665ad8 commands/plugin: use default version requirement 2013-12-28 14:10:57 -07:00
Mitchell Hashimoto 35d4737553 Merge pull request #2705 from tmatilai/upstart-emit-nfs
Emit upstart event `vagrant-mounted` also on NFS mounts
2013-12-28 12:50:53 -08:00
Mitchell Hashimoto 2cf864e95b hosts/bsd: check exports only if exports file exists [GH-2714] 2013-12-28 13:48:13 -07:00
Marc Meszaros 13ff159d8c Fix salt provisioner error namespace to be more consistent with other provisioners 2013-12-27 22:38:44 -05:00
Marc Meszaros 194d7d11cd Add error messages to localization file for salt provisioner 2013-12-27 22:37:54 -05:00
Tobias Bähr 364488eba8 Set default value to avoid a prompt 2013-12-22 18:48:14 +01:00
Teemu Matilainen 572cdeeda9 guests/linux: Emit upstart event on VirtualBox using the expanded path 2013-12-22 08:55:59 -03:00
Teemu Matilainen 2fab268ede guests/linux: Emit upstart event `vagrant-mounted` also on NFS mounts
Complements #2502, and fixes error on VMs without upstart (like #2596).
2013-12-22 08:46:24 -03:00
Teemu Matilainen a5b84f413e core: More informative error if plugin.json parsing fails 2013-12-20 07:10:10 -03:00
Mitchell Hashimoto 489506ff83 guests/linux: up the amount of retries for NFS mounts 2013-12-18 08:38:31 -08:00
Mitchell Hashimoto 9ac4ec85dd Merge pull request #2677 from purpleidea/fix_puppet_apply
provisioner/puppet: do not prepend default path because it can override modules.
2013-12-18 08:31:21 -08:00
James Shubin d4c76d1bcf Do not prepend default path because it can override modules.
It is common for Puppet to manage itself. If the puppet code you are
deploying pushes files to /etc/puppet/modules/, then prepending this
path can break deployment because it will override the module path if
the deployment code is changing. There is no good reason to include this
path. Puppet has built in defaults for this reason.
2013-12-17 14:29:54 -05:00
Charles Blaxland 7518bf94eb Force rm of chef config files #2669 2013-12-17 17:53:52 +11:00
Mitchell Hashimoto 042a8d6428 Merge pull request #2667 from gildegoma/bugfix_ansible_raw_args
provisioner/ansible: Fix a bug in `raw_arguments` option
2013-12-16 13:15:30 -08:00
Gilles Cornu e5f45e2b79 Ansible: Fix a bug in `raw_arguments` option
Without this change, it is not possible to pass more than one "raw"
argument, which was not the expected behavior. In addition to Array
format, String (for a single argument) is still accepted (for sake of
"backward compatibility" and ease of use).

Note: Due to low/expert usage of this option, I think that it is not
necessary to add more robust validation on this parameter (e.g. Array
of String type checking or argument syntax pattern matching). Use it at
your own risk ;-)
2013-12-16 21:20:10 +01:00
Charlie Huggard d26c1471d7 Refactor ChangeHostName for EL.
Based off of the Debian pattern. Need to add tests.

Related to #2653 and #2592
2013-12-16 01:52:39 -06:00
Mitchell Hashimoto da91572ce7 commands/init: error if can't write Vagrantfile [GH-2660] 2013-12-15 11:28:51 -08:00
Gilles Cornu 213534d185 Merge pull request #2606 from maspwr/ansible-groups
Add ability to use Ansible groups in generated inventory. Fixes #2551.
2013-12-14 07:03:22 -08:00
Mitchell Hashimoto 2c568a75f2 commands/ssh: use proper variable 2013-12-13 22:32:01 -08:00
Mitchell Hashimoto 2bebf188d6 hosts/bsd: check for exports file issues prior to exporting NFS 2013-12-13 22:14:13 -08:00
Mitchell Hashimoto c1141dded3 providers/virtualbox: don't clear /etc/exports on BSDs for NFS [GH-2645] 2013-12-13 22:03:14 -08:00
Mitchell Hashimoto 902b769e6b core: -t/-T work for vagrant ssh -c [GH-2618] 2013-12-13 21:07:54 -08:00
Fabio Rehm 46ba43e6ac provisioners/docker: Display warning in case a version get specified on the Vagrantfile and the guest is a RedHat-ian guest [GH-2649] 2013-12-13 23:06:20 -02:00
Fabio Rehm 6f304d5e29 provisioners/docker: Move DockerConfigureVagrantUser capability up to Linux guests [GH-2649] 2013-12-13 23:06:20 -02:00
Fabio Rehm 5a842fc609 provisioners/docker: Check if epel-release is installed on RedHat-ian guests before attempting installation [GH-2649] 2013-12-13 23:06:20 -02:00
Naoto TAKAHASHI 746d406558 add docker for redhat 2013-12-14 02:35:34 +09:00
Teemu Matilainen d321b9199e provisioners/chef: fix node/client deletion when node_name is not set [GH-2345]
V2 config uses `hostname` instead of `host_name`.
2013-12-13 00:51:22 -03:00
Arthur Neves c57073da7b Rename docker_client and docker_installer
We can rename those classes and remove the docker_ prefix as they
already have a module namespace.
2013-12-12 14:59:03 -05:00
Markus Kern c8a09b344b guests/redhat: Don't error if ifdown fails [GH-2614] 2013-12-10 20:04:36 +00:00
Mitchell Hashimoto 05b2e03586 guests/redhat: don't ifdown non-existent interfaces [GH-2614] 2013-12-10 09:04:20 -08:00
Mitchell Hashimoto ed4cfa913c Merge pull request #2620 from ShonM/master
guests/freebsd: Update FreeBSD configure_networks with less shell specifics
2013-12-10 08:53:34 -08:00
Paul Hinze abe0731d2e guests/{ubuntu,debian}: fix change_host_name for trailing dots [GH-2610]
When `/etc/hosts` contained a FQDN with a trailing dot, the `\b` in the
sed expression would not match, since dot is not considered to be a word
character.

Fix this by regexp-escaping the hostname search, and matching the end of
the line on optional space followed by additional characters.

Also add some tests that extract the regexp used by sed and verify that
it does what we want. These will hopefully serve us in the future if we
ever need to test additional edge cases.
2013-12-09 18:56:45 -06:00
Shon M 3e1471fb53 Update FreeBSD configure_networks with less shell specifics 2013-12-09 17:27:54 -07:00
Jacques Fuentes 579cc8e558 Remove defunct @build_options reference 2013-12-09 18:36:57 -05:00
Jacques Fuentes 1738f9dccf Add option to Docker provisioner to build local images 2013-12-09 17:54:32 -05:00
Mark Aaron Shirley 906579d25a Add ability to use Ansible groups in generated inventory. Fixes #2551. 2013-12-08 23:08:03 -08:00
Matt Alexander edeb5f0e9f Add the symlink back that disabled renaming of network interface names 2013-12-07 14:59:40 -06:00
Matt Alexander df67d2b44f Run "ip link set [eth1] down" before running "netctl start [eth1]" in Arch guest network configuration 2013-12-07 14:22:19 -06:00
Mitchell Hashimoto d80f32c20f synced_folders/nfs: allow plugins to provide valid NFS ids 2013-12-06 16:42:34 -08:00
Mitchell Hashimoto 2c65d247da core: Allow options to be passed down into SF cleanup 2013-12-06 16:40:24 -08:00
Mitchell Hashimoto 76df3ced03 synced_folders/nfs: style 2013-12-06 15:07:55 -08:00
Mitchell Hashimoto 55931d507e Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup
Conflicts:
	plugins/providers/virtualbox/action.rb
2013-12-06 15:06:34 -08:00
Mitchell Hashimoto f3d71de022 Merge pull request #2591 from instilled/arch-netctl-fix
guests/arch: netctl fix
2013-12-06 15:02:41 -08:00
Mitchell Hashimoto 89f4e14ab3 Merge pull request #2585 from mitchellh/2585-fix-docker-image-assignment
provisioner/docker: unable to run multiple docker containers based off the same image
2013-12-06 14:56:15 -08:00
Teemu Matilainen b0919b916b Remove extraneous character
Going down? ;)
2013-12-06 18:57:27 -03:00
Mitchell Hashimoto 5b7a4d7f6e Merge pull request #2596 from tmatilai/fix-initctl-test
guests/linux: fix testing if initctl exists
2013-12-06 13:22:03 -08:00
Mitchell Hashimoto b65462faf1 providers/virtualbox: resume should wait for boot 2013-12-06 13:21:07 -08:00
Teemu Matilainen c566465bdc Fix testing if initctl exists
If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
2013-12-06 18:17:41 -03:00
Mitchell Hashimoto 17b68f7d50 provisioners/puppet: use unique directory for each definition 2013-12-06 12:39:50 -08:00
Mitchell Hashimoto f8223d4704 provisioners/chef: support proper counter for multiple chefs 2013-12-06 12:26:48 -08:00
Mitchell Hashimoto 38f931ba93 provisioners/shell: array args properly work 2013-12-06 11:28:32 -08:00
Fabio Rehm 8688c6b8b2 provisioners/docker: Only assign the `image` config in case it was not specified 2013-12-05 22:12:44 -02:00
Mitchell Hashimoto 0d02ada43b providers/virtualbox: only clear shared folders if we have a VM 2013-12-05 13:39:23 -08:00
John Bellone bebaa63063 [provisioner/chef]: Update base to fix typo.
It seems this was introduced by accident with #2281.
2013-12-05 15:24:53 -05:00
me 2a75c34d62 systemctl wasn't a good idea 2013-12-05 16:01:44 +01:00
me 158d82ea39 Avoid udev rule masking and configure ifaces with sed instead. 2013-12-05 15:16:59 +01:00
Teemu Matilainen 897fde3274 Add missing argument to ProviderVirtualBox::SyncedFolder#driver call
GH-2577 missed passing the `machine` to the `driver` method.
2013-12-05 00:21:16 -03:00
Fabio Rehm 7e0b0a5a3c provisioners/docker: Extract container lookup method 2013-12-04 22:13:17 -02:00
Fabio Rehm c7a5592b96 provisioners/docker: Ensure checks for whether the container exists / is running works accross multiple Docker versions [GH-2579] 2013-12-04 22:10:39 -02:00
Teemu Matilainen 294f4def91 Fix `vagrant plugin` commands
`StateFile#installed_plugins` returns now a Hash instead of Array.

Fixes regression from 39b2539.
2013-12-04 18:25:33 -03:00
Mitchell Hashimoto 3df245f1fd provisioners/chef: create/chown backup folders [GH-2281] 2013-12-04 11:51:05 -08:00
Mitchell Hashimoto d354cdda4a core: request users upgrade plugins if they're old 2013-12-04 11:43:39 -08:00
Mitchell Hashimoto 236141ba90 commands/plugin: old state files default to 0 for vagrant version 2013-12-04 11:29:17 -08:00
Mitchell Hashimoto 39b2539ec7 commands/plugin: state file keeps track of the Vagrant version 2013-12-04 11:17:48 -08:00
Emiliano Ticci 07bbca426e NFS/VBox: remove dedicated cleanup action in favour of native routine. 2013-12-04 12:29:09 +01:00
Emiliano Ticci c95fc4e27c VirtualBox shared folders: remove dedicated cleanup action in favour of native routine. 2013-12-04 12:22:01 +01:00
Mitchell Hashimoto 4f17a70c4e commands/plugin: ignore default gems when pruning
For modern RubyGems compatibility
2013-12-03 23:48:06 -08:00
Mitchell Hashimoto e83070371d kernel/v2: fix validation on checksum types 2013-12-03 18:46:22 -08:00
Mitchell Hashimoto 832a5ef70b providers/virtualbox: clean up synced folders on destroy 2013-12-03 18:44:37 -08:00
Mitchell Hashimoto ca521887eb Merge pull request #2561 from emyl/synced-folder-cleanup-v2
core: Enhance the synced folder plugin implementation with a cleanup routine
2013-12-03 18:08:42 -08:00
Mitchell Hashimoto 146bc34019 Merge pull request #2549 from mitchellh/f-docker-provisioner
docker provisioner
2013-12-03 17:47:42 -08:00
Mitchell Hashimoto 8f4fa897d0 provisioners/docker: use proper UNSET_VALUE for no value 2013-12-03 16:19:08 -08:00
Mitchell Hashimoto 999ce22354 provisioners/docker: output version when installing 2013-12-03 14:39:32 -08:00
Mitchell Hashimoto f7916c0cff provisioners/docker: output for each image pulling 2013-12-03 14:38:38 -08:00
Mitchell Hashimoto ecbd0bfa85 provisioners/docker: style nitpicks 2013-12-03 14:36:14 -08:00
Mitchell Hashimoto 8d6cac959f provisioners/docker: only allow 'args' special 2013-12-03 14:35:56 -08:00
Mitchell Hashimoto 33d3c28086 provisioners/docker: simplify run, output which are running 2013-12-03 14:33:13 -08:00
Mitchell Hashimoto c55f7dfd64 provisioners/docker: allow images to be configured with images: 2013-12-03 14:25:20 -08:00
Mitchell Hashimoto d3b7bffc65 provisioners/docker: style nitpick on unless 2013-12-03 14:19:31 -08:00
Mitchell Hashimoto dda7cbb412 provisioners/docker: make sure version is correct type, fix Ruby warning 2013-12-03 14:18:30 -08:00
Mitchell Hashimoto 5ee3a06740 provisioners/chef: fix validate return so that it is properly formatted 2013-12-03 13:59:59 -08:00
Mitchell Hashimoto d9dc2d6cfd guests/linux: --no-wait on emit [GH-2564] 2013-12-03 12:14:10 -08:00
Mitchell Hashimoto 9cd9e6e55d communicators/ssh: add -E to sudo to preserve env 2013-12-03 12:07:14 -08:00
Mitchell Hashimoto d2bc1dbc3b Merge pull request #2560 from phinze/vbox-nfs-dhcp-support
providers/virtualbox: support DHCP interfaces for NFS
2013-12-03 11:49:54 -08:00
Paul Hinze c25172d0f7 providers/virtualbox: support DHCP interfaces for NFS
Previously, we required a host-only interface with a static IP for NFS
to work in VirtualBox, because we needed access to the guest's IP in
order to properly configure mount commands.

After boot, VirtualBox exposes the IP addresses of a guest's network
adapters via the "guestproperty" interface.

This adds support for reading VirtualBox guest properties to the
VirtualBox driver and utilizes that support to prepare NFS settings,
which removes the necessity for a static IP for NFS to work.

In this commit we also start building out scaffolding for unit testing
vbox actions and drivers.

Test plan:
 - Prepare a Vagrantfile with the following:
   * private network with type: :dhcp
   * synced folder with nfs: true
 - Boot a VM from this Vagrantfile using the virtualbox provider
 - Machine should boot successfully with working synced folder
2013-12-03 10:21:28 -05:00
Emiliano Ticci 578393ac8e Add cleanup routine to synced folder plugin implementation 2013-12-02 11:19:09 +01:00
Mitchell Hashimoto 72edddbb09 core: do proper type conversions for box checksum types 2013-12-01 23:03:21 -08:00
Mitchell Hashimoto 555f4c7dcf kernel/v2: support checksum on box config 2013-12-01 23:03:21 -08:00
Mitchell Hashimoto 1094ac976e core: support checksum on box add 2013-12-01 23:03:20 -08:00
Nicolas Delaby 7cd7077467 salt-bootstrap.sh: options are only allowed before install arguments 2013-11-29 15:52:12 +01:00
Fabio Rehm 3289141fc3 provisioners/docker: Clean up some leftovers from vocker 2013-11-29 10:22:06 -02:00
Fabio Rehm 82fc9330af provisioners/docker: Simplify raising of Docker related errors 2013-11-29 10:22:06 -02:00
Fabio Rehm 0536817e90 provisioners: Import Docker provisioner code from Vocker 2013-11-29 10:22:06 -02:00
Mitchell Hashimoto cfb258a55b provisioners/shell: s/unless/if !/ 2013-11-29 00:02:20 -08:00
Paul Hinze fef60242b0 provisioners/shell: fix validation for args [GH-1949]
The logic change in 57d4775140 introduced
a bug where neither strings nor arrays provided as `args` for shell
provisioners would pass validation.

This fixes that problem along with a few extras:

- split out arg validation into a private method
- update comment describing valid args
- add a few unit tests around config validation
2013-11-28 19:54:10 -06:00
Elan Ruusamäe 1df4f5a8ed require pld/cap/change_host_name 2013-11-27 09:38:28 +02:00
Elan Ruusamäe 2416149aa3 fix hostname change on pld 2013-11-27 09:35:18 +02:00
Mitchell Hashimoto db9c8dd6b3 core: validate box_download_ca_cert_file, expand 2013-11-26 21:10:33 -08:00
Mitchell Hashimoto d0f14250d6 core: can specify config.vm.box_download_ca_cert 2013-11-26 19:35:04 -08:00
Mitchell Hashimoto cd3e19306c commands/box/add: custom CA cert [GH-2337] 2013-11-26 19:32:56 -08:00
Mitchell Hashimoto 798432febe provisioners/chef: validate environments path [GH-2381] 2013-11-26 18:57:27 -08:00
Mitchell Hashimoto 6f2d6981cb website/docs: better Chef docs [GH-2436] 2013-11-26 11:44:16 -08:00
Mitchell Hashimoto fc190fad9f guests/redhat: DHCP_HOSTNAME set to hostname [GH-2441] 2013-11-26 11:28:47 -08:00
Mitchell Hashimoto 5790235a54 Merge pull request #2539 from bearstech/debian_ifdown_ifup
guests/debian: ifdown is not enough for network config
2013-11-26 11:16:37 -08:00
Mitchell Hashimoto cd106986b4 provisioners/ansible: use the first private key
/cc @gildegoma - Does Ansible support multiple private keys? Vagrant
now does, so this isn't exactly safe.
2013-11-26 10:07:52 -08:00
Mathieu Lecarme 09a86bd70a Sometimes, ifdown is not enough. 2013-11-26 13:40:50 +01:00
Mitchell Hashimoto 9dfac9557b provisioners/puppet: fix some bonehead mistakes 2013-11-25 22:46:10 -08:00
Mitchell Hashimoto 25a8491465 provisioners/puppet: manifests path can be in the VM [GH-1805] 2013-11-25 22:39:20 -08:00
Mitchell Hashimoto d7b74ca8b9 core: config.vm.box_url can be array of urls [GH-1958] 2013-11-25 21:57:20 -08:00
Mitchell Hashimoto d88e3dcff2 kernel/v2: new style default box url 2013-11-25 18:46:54 -08:00
Mitchell Hashimoto 7d1fe7c6fe kernel/v2: properly set default value for client cert 2013-11-25 16:51:22 -08:00
Mitchell Hashimoto 13b52f6b6e Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs
Conflicts:
	config/default.rb
	lib/vagrant/action/builtin/handle_box_url.rb
	plugins/commands/box/command/add.rb
2013-11-25 16:50:11 -08:00
Mitchell Hashimoto 8581a93e76 provisioners/chef: upload encrypted data bag secret to prov path
[GH-1246]
2013-11-25 15:55:00 -08:00
Mitchell Hashimoto 45e09eb677 core: allow multiple private keys [GH-907] 2013-11-25 15:45:39 -08:00
Mitchell Hashimoto d08e3f7ab3 provisioners/puppet: use better flags for one-time run 2013-11-25 15:28:17 -08:00
Mitchell Hashimoto 4a3259443d provisioners/puppet: make the output a bit clearer 2013-11-25 15:18:35 -08:00
Mitchell Hashimoto e72cd9c98e provisioners/puppet: can specify a client key/cert 2013-11-25 15:17:05 -08:00
Mitchell Hashimoto 57c25a26ad provisioners/puppet: update config to new style 2013-11-25 15:07:12 -08:00
Mitchell Hashimoto 57d4775140 provisioners/shell: allow array args [GH-1949] 2013-11-25 13:36:51 -08:00
Mitchell Hashimoto 741930b439 Merge pull request #1949 from mpapis/feature/shell_provisoner_array_args
provisioners/shell: implement array arguments from #1569
2013-11-25 13:31:48 -08:00
Mitchell Hashimoto 48973a72d5 commands/box/list: clean up 2013-11-25 13:26:46 -08:00
Mitchell Hashimoto 3bedc77cc4 Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url
Conflicts:
	plugins/commands/box/command/list.rb
2013-11-25 13:20:26 -08:00
Mitchell Hashimoto 195f0d9639 guests/linux: emit upstart event for vagrant mounted if avail [GH-2502] 2013-11-25 11:31:15 -08:00
Mitchell Hashimoto 602505a136 providers/virtualbox: some validation around internal networks 2013-11-25 11:25:10 -08:00
Mitchell Hashimoto 2d957cdaab providers/virtualbox: internal networks [GH-2020] 2013-11-25 11:13:46 -08:00
Mitchell Hashimoto cc57933675 update changelog 2013-11-24 21:29:04 -08:00
Mitchell Hashimoto 10daa6fddf Merge pull request #2366 from gildegoma/ansible-extra-vars
provisioners/ansible: Improvements for 'extra_vars' argument
2013-11-24 21:21:44 -08:00
Mitchell Hashimoto 6baab10df4 communicators/ssh: pty can be enabled 2013-11-24 16:48:07 -08:00
Mitchell Hashimoto 7ba9d2d0a0 commands/init: add --output flag [GH-1364] 2013-11-24 11:53:15 -08:00
Mitchell Hashimoto 5cbc54d570 commands/box: list has machine-readable output 2013-11-24 11:42:24 -08:00
Mitchell Hashimoto 15d639c8dc website: document machine-readable output 2013-11-24 11:37:57 -08:00
Mitchell Hashimoto 42a71a953d commands/status: add machine-readable output 2013-11-24 11:11:38 -08:00
phinze 688bca14f5 refactoring ubuntu/debian change_host_name
there's been a lot of churn around this code, so i figure it was worth
trying to clean it up.

 - the methods were doing a lot, so make them into template methods with
   one helper per step
 - spread out /etc/hosts regexp into a couple of helper variables for
   clarity
 - remove handling for broken hostname implementations (like basing all
   of the checks on name.split('.')[0]), since it seems reasonable to
   remove code dedicated only to handling broken boxes
 - DRY up the shared code between debian/ubuntu implementations, which
   clarifies the differences as well
 - add unit tests around the behavior; this will help us in the future
   to separate flaws in our understanding from flaws in implementation
 - includes a new DummyCommunicator in tests which should be useful in
   supporting additional unit testing of this kind
 - manually tested this on squeeze, wheezy, precise, quantal, raring,
   and saucy successfully.

handles the issue in #2333
2013-11-24 11:46:12 -06:00
Mitchell Hashimoto f66d08d73c commands/plugin: style nitpick 2013-11-23 16:45:45 -08:00
Mitchell Hashimoto 63005fc1c6 Merge pull request #2420 from tmacedo/rubygems_2_compatibility
core: compatibility with rubygems 2.x
2013-11-23 16:44:10 -08:00
Mitchell Hashimoto c8be50c69e providers/virtualbox: get rid of some 4.3 global state 2013-11-23 16:30:09 -08:00
Mitchell Hashimoto 2044c7445e Merge pull request #2484 from andyfowler/virtualbox-parallel-import
provider/virtualbox: virtualbox parallel box import
2013-11-23 16:23:07 -08:00
Mitchell Hashimoto cfe17076b5 providers/virtualbox: nitpick on style 2013-11-23 16:16:45 -08:00
Mitchell Hashimoto 56eb53d8af Merge pull request #2483 from andyfowler/retryable-customize
providers/virtualbox: use Retryable for Virtualbox customize & sane_defaults actions
2013-11-23 16:12:20 -08:00
Mitchell Hashimoto b65b22cef2 update changelog 2013-11-23 16:05:44 -08:00
Mitchell Hashimoto 2a35ec425c Merge pull request #2505 from jaugustin/shell-keep-color
provisioner/shell: add keep_color option to allow custom color output
2013-11-23 16:03:15 -08:00
Mitchell Hashimoto 46d9ded812 commands/box/add: add --clean flag to ignore continuation 2013-11-23 15:55:52 -08:00
Mitchell Hashimoto 45702f9d44 Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333
Conflicts:
	plugins/guests/ubuntu/cap/change_host_name.rb
2013-11-23 15:38:49 -08:00
Mitchell Hashimoto 97389d4255 core: output synopsis with command [GH-2249] 2013-11-23 14:00:42 -08:00
Mitchell Hashimoto 23bdbd6fd8 synced_folders/nfs: specify nfs_udp false to disable udp [GH-2304] 2013-11-23 13:43:48 -08:00
Mitchell Hashimoto 88425f0146 Merge pull request #2390 from borgstrom/master
core: allow owner & group to be supplied as an Integer and skip lookup
2013-11-23 11:46:50 -08:00
Mitchell Hashimoto a4fe547536 Merge pull request #2444 from tmatilai/debian_hostname_fix
guests/debian: Fix hostname setting also in Debian, part N
2013-11-23 11:45:38 -08:00
Mitchell Hashimoto aed61291e8 Update CHANGELOG 2013-11-23 11:45:06 -08:00
Mitchell Hashimoto 4e75e39ee5 Merge pull request #2426 from tmatilai/virtualbox_memory
providers/virtualbox: Add shortcut for setting the memory size for VirtualBox VM
2013-11-23 11:44:13 -08:00
Mitchell Hashimoto 5b71cf87f3 Merge pull request #2450 from onejli/master
guests/redhat: ifdown ethN before munging ifcfg-ethN
2013-11-23 11:40:02 -08:00
Mitchell Hashimoto 05e9dc6e59 Update CHANGELOG 2013-11-23 11:36:20 -08:00
Mitchell Hashimoto dcf57bd2cc guests/linux: increase sleep time btween NFS mount retries 2013-11-23 11:35:27 -08:00
Mitchell Hashimoto 52c27cd498 Merge pull request #2448 from rimckenn/patch-1
hosts/bsd: don't set both maproot and mapall
2013-11-23 11:34:27 -08:00
Mitchell Hashimoto 9362063623 Merge pull request #2487 from hatsuseno/master
hosts/gentoo: Restart NFS on Gentoo host instead of starting [GH-2487]
2013-11-23 11:25:42 -08:00
Mitchell Hashimoto c00b045f53 providers/virtualbox: retry suspended check [GH-2479] 2013-11-23 11:20:22 -08:00
Mitchell Hashimoto 33273ee561 Merge pull request #2529 from markpeek/markpeek-freebsd-nobashshell
guests/freebsd: Allow the FreeBSD plugin to install without bash [GH-2485]
2013-11-23 11:04:29 -08:00
Mitchell Hashimoto 0425d1712b synced_folders/nfs: config goes here 2013-11-23 10:49:51 -08:00
Mitchell Hashimoto 2c8b6ace7f providers/virtualbox: output UI 2013-11-22 19:33:17 -08:00
elliotsegler 803e78a5d4 fixing error in comment #2333 2013-11-23 10:18:59 +08:00
Mitchell Hashimoto 0b9861db7d providers/virtualbox: fix broken NFS check 2013-11-22 17:29:35 -08:00
Mitchell Hashimoto 850c9ea7a6 kernel: handle new NFS types 2013-11-22 17:22:47 -08:00
Mitchell Hashimoto 22a5430068 synced_folders/nfs: use proper error classes 2013-11-22 17:18:08 -08:00
Mitchell Hashimoto be6d4cc116 providers/virtualbox: make sure sf host paths are strings 2013-11-22 17:16:21 -08:00
Mitchell Hashimoto 35ac7da5a0 providers/virtualbox: don't use NFS middleware anymore 2013-11-22 17:13:53 -08:00
Mitchell Hashimoto 52fe93cc41 synced_folders/nfs: begin implementation (not functional) 2013-11-22 16:51:55 -08:00
Mitchell Hashimoto 9d3818a380 providers/virtualbox: use new SyncedFolders middleware 2013-11-22 16:21:14 -08:00
Mark Peek d5dcf84d62 Allow the FreeBSD plugin to install without bash [GH-2485]
The default shell is "bash -l" which does not get installed by default
on FreeBSD. This change allows the plugin to override the default shell
and use a known installed shell (sh).
2013-11-22 15:30:12 -08:00
elliotsegler a80de51054 Fixes recommended by phinze for #2333 2013-11-22 11:55:17 +08:00
Mitchell Hashimoto 97148379d2 providers/virtualbox: implement the synced folder plugin 2013-11-21 17:38:17 -08:00
Mitchell Hashimoto 504707f96a Merge pull request #2482 from andyfowler/safer-vbox-names
core: safer default VM names for Virtualbox
2013-11-21 15:01:31 -08:00
Daniel Miller 31894171d3 Make salt bootstrap work on systems without python 2013-11-21 10:42:06 -05:00
phinze 4225b0eb7b provider/virtualbox: fix bad constant reference in dhcp error
refs #2454
2013-11-20 11:15:25 -06:00
jaugustin 722e9e6afb [Provisioner][Shell] add keep_color option to allow custom color output 2013-11-16 13:34:58 +01:00
Rudolf Leermakers aa749db079 Restart NFS on Gentoo host instead of starting
In the case that NFS is already started on a Gentoo host, /etc/init.d/nfs start will not reload exports, but fail. /etc/init.d/nfs reload is known to fail for some esoteric configurations of /etc/exports, restart should be safe for existing connections.
2013-11-11 12:30:40 +01:00
Andy Fowler b13122cab7 use Retryable for virtualbox customize + defaults
when up-ing several boxes at once, VBoxManage modifyvm gets cranky and throws random lock errors. this adds the existing retryable logic to
the customize and sane_defaults actions, both of which fire a bunch of
modifyvm commands, all of which are fine to run multiple times.
2013-11-09 18:16:47 -05:00
Andy Fowler d775756d18 use a safer default name for virtualbox
if the same vagrantfile is up'd in the same second in the same basedir
this caused a conflict,

most notably, all jenkins jobs sit in a 'workspace' directory, which
breaks if more than one job launches from the same trigger.
2013-11-09 15:54:46 -05:00
Andy Fowler 2e9286b4d3 use vbox4.2 driver parallel-safe box import in 4.3
uses what @smoyer did for vbox 4.2 in vbox 4.3,
tested against VBoxManage 4.3.2
2013-11-08 12:48:37 -05:00
Scott Moyer c2a3a30e35 Update the virtualbox driver to import base boxes into a unique(ish) VM folder to prevent collisions. 2013-11-07 17:07:29 -05:00
Jonathan Li 1ad756d52c ifdown ethN before munging ifcfg-ethN (i.e. removing previous vagrant config for network interface) 2013-11-02 12:35:37 -07:00
rimckenn 3047b81256 Update host.rb
mapall= and maproot= are mutually exclusive options. Currently, when trying to use maproot=, mapall= is getting automatically added, which prevents us from using the NFS mount. This change turns off the adding of mapall= if maproot= has been specified as an option.
2013-11-01 14:44:49 +00:00
Teemu Matilainen 2073a1a939 Fix hostname setting also in Debian, part N
Port #2384 / #2383 for Debian guests.
2013-10-31 21:39:45 -03:00
Fabio Rehm 48875124b9 commands/box: Read box URL and downloaded date from JSON 2013-10-29 13:09:24 -02:00
Fabio Rehm 05a8cf523a core: Get rid of code that deals with box info on a separate statefile 2013-10-29 13:09:24 -02:00
Fabio Rehm 18cf66e83a commands/box: List base box downloaded URL and datetime when `-i` gets provided to `box list` 2013-10-29 13:09:24 -02:00
Fabio Rehm cbc7e7eedb commands/box: Preparing to display additional box information on `box list` 2013-10-29 13:09:23 -02:00
Fabio Rehm 031119a858 commands/box: Extract a base class for dealing with StateFile instantiation 2013-10-29 13:09:23 -02:00
Fabio Rehm 1c689d2211 core: Remove box information from state file after box removal 2013-10-29 13:09:23 -02:00
Fabio Rehm e4b5db829e commands/box: Extract box removal code from `box remove` command into a builtin action 2013-10-29 13:09:23 -02:00
Fabio Rehm 17fd5f9e4e commands/box: Introduce a StateFile for keeping track of downloaded boxes 2013-10-29 13:09:23 -02:00
Teemu Matilainen 3368ef610a Add shortcut for setting the memory size for VirtualBox VM 2013-10-28 00:43:33 -03:00
Tiago Macedo 2d66d94ebe compatibility with rubygems 2.x 2013-10-25 11:27:17 +02:00
Mitchell Hashimoto 2ca350c816 Merge pull request #2400 from hikch/master
guests/freebsd: fix nfs mount fail with FreeBSD9.1 (synced_folder).
2013-10-23 23:15:33 -07:00
Mitchell Hashimoto af66984ca1 Merge pull request #2404 from canausa/patch-1
commands/provision: add --no-parallel
2013-10-23 23:13:04 -07:00
Stephan Meissl 889233ed94 Automatically enable symlinks on vboxsf for VirtualBox 4.1 (see #713 and 387692f9c8). 2013-10-23 23:00:07 +02:00