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
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
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