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
canausa
10883b3be6
Add --no-parallel to provision
2013-10-21 10:19:42 -04:00
Heikichi Umehara
c0eb9bd35a
fix nfs mount fail with freebsd.
2013-10-21 08:42:57 +09:00
Evan Borgstrom
9c8ead1ca3
Restore correct pathing
2013-10-17 22:45:23 -04:00
Evan Borgstrom
ebb85b57fd
Allow owner & group to be supplied as an Integer and skip lookup
2013-10-17 22:40:21 -04:00
Mitchell Hashimoto
673a06b54d
hosts/gentoo: use subprocess machinery
...
/cc @timgus
2013-10-17 08:32:09 -10:00
Mitchell Hashimoto
7a99e7a62e
Merge pull request #2382 from timgus/gentoo_systemd
...
hosts/gentoo: recognize systemd for nfsd startup and replace "service" command with /etc/init.d/nfs
2013-10-17 11:29:28 -07:00
Nathan Mische
0c238741d3
Fixing so localhost hosts file entry is not lost when updating hostname. Addresses Issue #2383 .
2013-10-17 12:56:59 -04:00
Tim Gus
7bfc3ea16e
hosts/gentoo: recognize systemd for nfsd startup and
...
replace "service" command with /etc/init.d/nfs
2013-10-17 11:11:59 -04:00
Mitchell Hashimoto
b2070eec53
providers/virtualbox: Support VirtualBox 4.3 [GH-2374]
2013-10-15 11:42:22 -10:00
Teemu Matilainen
330f72eae2
Fix hostname setting also in Debian
...
Same fix as #2334 .
2013-10-15 15:57:40 -03:00
Teemu Matilainen
535eb35206
Use old name instead of hard coded 'precise64'
2013-10-15 15:57:15 -03:00
Mitchell Hashimoto
f988db97bd
Merge pull request #2334 from elliotsegler/issue_2333
...
guests/ubuntu: Hostname and FQDN should be done in one line
2013-10-14 20:21:53 -07:00
Mitchell Hashimoto
2be01284ea
provisioners/chef: fix exception during node cleanup [GH-2345]
2013-10-14 17:12:49 -10:00
Mitchell Hashimoto
4f8b751c4c
Merge pull request #2347 from dougm/esxi-guest
...
guests/esxi: Add support for VMware ESXi guests
2013-10-14 20:09:25 -07:00
Mitchell Hashimoto
cfd81da97e
Merge pull request #2359 from viq/patch-1
...
provisioners/salt: fix seed_master key file name
2013-10-14 20:06:51 -07:00
Mitchell Hashimoto
cb74d208ea
Merge pull request #2358 from sgronblo/disallow_dots_and_hyphens_at_start_of_hostname
...
core: disallow dot and hyphen as first character of hostnames
2013-10-14 19:59:22 -07:00
Gilles Cornu
5aff4a1f20
Ansible: Improvements for 'extra_vars' argument
...
`extra_vars` argument can now:
- contains a hierarchical set of parameters (instead of flat Key-Value Pairs)
- alternatively refers to a configuration file (instead of embedded Hash)
See Ansible Documentation for version requirement details:
http://www.ansibleworks.com/docs/playbooks_variables.html#passing-variables-on-the-command-line
2013-10-12 00:29:39 +02:00
Tomdarkness
27c7243219
Move exception raising back into retryable block in VirtualBox driver command execution
...
By moving the exception throwing back into the retryable block it actually enables the retryable to function properly by retrying, if appropriate, when an certain exception is raised.
2013-10-11 18:32:54 +01:00
viq
fee0f8d8ab
Fix seed_master key file name
...
As per https://github.com/saltstack/salty-vagrant/pull/98 and https://github.com/saltstack/salty-vagrant/issues/97 the expected file name for minion is 'minion', not 'seed-minion.pub'
2013-10-10 13:04:31 +02:00
Sam Gronblom
9a7ca06cfa
Disallow dot and hyphen as first character of hostnames
...
- Causes hostname to be set to an invalid value on some systems which
also causes malfunction of hostname -f so it cannot be changed
2013-10-10 14:42:48 +09:00
Doug MacEachern
6c9edbbdc6
guests/esxi: Add support for VMware ESXi guests
2013-10-08 21:47:32 -07:00
Laurent Raufaste
157a7081ba
Update boundary usage in the sed regexp to update the hosts file
2013-10-08 20:14:22 -04:00
Elliot Segler
06aaa6e6ea
#2333 , more fixes - right order to get fqdn right
2013-10-08 17:53:27 +08:00
Elliot Segler
1abcf1e54f
Better fix for issue #2333 , does localhost as well so we dont break local name resolution for things like puppet
2013-10-08 17:01:54 +08:00
Elliot Segler
9ca6fbe8f4
Hostname and FQDN should be done in one line
2013-10-06 15:33:00 +08:00
Mitchell Hashimoto
193f172b7c
Merge pull request #2313 from jeffasinger/salt-overstate
...
provisioner/salt: adding overstate support to the salt provisioner
2013-10-05 11:46:01 -07:00
Mitchell Hashimoto
4049fd136f
Merge pull request #2329 from mpioli/redhat
...
guests/redhat: create from fedora guest (migrate)
2013-10-05 11:43:42 -07:00
Matthew
e9903422cc
detect Red Hat Enterprise Linux 4 and Oracle Linux
2013-10-05 18:01:27 +01:00
Matthew
b16d56c717
rename host plugin (fedora to redhat)
2013-10-05 17:40:23 +01:00
Matthew
d1871b5c15
do not use systemd on current versions of CentOS or RHEL
2013-10-05 17:33:13 +01:00
Matthew Johnson
b514f0c321
remove extra alias for vvv verbosity
2013-10-04 15:32:10 -04:00
Matthew Johnson
e5a2f1e8b7
fix ansible-playbook runs when verbosity is not specified
2013-10-04 02:58:49 -04:00
Jeff Singer
852812f778
Adding overstate support to the salt provisioner
2013-10-03 15:28:35 -04:00
egghead
4f1a65f74b
fixing default verbosity
2013-10-02 02:28:55 +00:00
Mitchell Hashimoto
6fc0f03865
Merge pull request #2275 from jabclab/ansible-buffering
...
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-10-01 14:26:25 -07:00
Mitchell Hashimoto
9fcc89bcf1
provisioners/chef: use real variable in delete from chef sever [GH-2300]
2013-10-01 14:13:16 -07:00
Mitchell Hashimoto
d052069eb7
Merge pull request #2273 from czi/fix/master/my_contribution
...
guests/suse: Update CFEngine provisioners plugin for SuSE install compatibility
2013-10-01 11:43:10 -07:00
Ian Heggie
4f11716633
Remove old /tmp/bootstrap_salt.sh before uploading as it may not be writeable
2013-09-29 21:05:59 +10:00
jabclab
c51952a68d
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-09-26 10:13:44 +01:00
U-quartz\Cory
ecb6ebaf81
add cfengine provisioner suse install support
2013-09-25 20:29:25 -05:00
Mitchell Hashimoto
d970c4e03f
Merge pull request #2254 from Caustic/fix-hostname-debian
...
guests/debian,ubuntu: Fixed fqdn handling
2013-09-25 10:36:33 -07:00
François Charlier
c1228ae206
Allow to change the DHCP_HOSTNAME on RedHat
2013-09-24 23:48:10 +02:00
Mitchell Hashimoto
33dd881ad7
provisioners/chef: disable color if Vagrant has no color [GH-2246]
2013-09-22 14:15:55 -05:00
Alan Braithwaite
7d53047a92
Fixed fqdn handling on debian/ubuntu
...
The issue was that the old method simply didn't work. When the hosts
file should look like:
127.0.1.1 host.fqdn.com host
It looked like:
127.0.1.1 host.fqdn.com host old.fqdn.com old
Or this if the user didn't set a fqdn
127.0.1.1 host host old.fqdn.com old
This patch fixes that.
2013-09-22 00:33:24 -07:00
Pete Michaud
e65ac705b4
fixed missing backtick
2013-09-21 21:41:06 -05:00
Mitchell Hashimoto
36bd52713b
provisioners/ansible: convert extra vars to strings [GH-2244]
2013-09-20 21:16:50 -07:00
Mitchell Hashimoto
7df64dff0c
Merge pull request #2242 from bt5e/move-up-chmod-in-puppet
...
provisioners/puppet-apply: moved chmod up before verify_shared_folders check #2241
2013-09-20 21:12:10 -07:00
Mitchell Hashimoto
79fa7000fa
providers/virtualbox: don't touch DYLD_* anymore.
...
Subprocess handles this
2013-09-20 17:57:44 -07:00
Mitchell Hashimoto
4d03a7359e
guests/linux: fail after a number of attempts
2013-09-20 17:52:36 -07:00
Mitchell Hashimoto
62e357ffcd
guests/linux: only successful mount if exit status 0
2013-09-20 17:50:29 -07:00
Mitchell Hashimoto
8c4ea4f47b
Update CHANGELOG
2013-09-20 17:24:59 -07:00
Mitchell Hashimoto
5fe6d7a525
Merge pull request #2235 from aleno/shell
...
provisioners/shell: Don't replace Windows newlines to Unix if shell is set as binary
2013-09-20 17:23:48 -07:00
Ben Tse
cd79563837
#2241 moved chmod up before verify_shared_folders check
2013-09-19 14:26:35 -04:00
Alexander Norström
b20fe8d41e
Dont replace Windows newlines to Unix if shell is set as binary
2013-09-19 13:33:58 +02:00
viq
8fd2337038
Fix invocation of initialize
...
Fixes #2229 for me
2013-09-19 11:55:46 +02:00
Mitchell Hashimoto
f9e4ea9ce8
communicators/ssh: timeout waiting for connection + header [GH-2226]
2013-09-18 09:32:30 -07:00
keyist
8cc5b4ddb5
hosts/arch: remove duplication with HostsLinux
2013-09-16 21:27:15 -07:00
Mitchell Hashimoto
ee9fc00a04
provisioners/ansible: default output level is verbose [GH-2194]
2013-09-16 21:02:22 -07:00
Mitchell Hashimoto
b9801f44a0
guests/linux: try `id -g` to determine group as well [GH-2197]
2013-09-16 20:51:09 -07:00
Mitchell Hashimoto
93f2e9ebbb
communicators/ssh: increase conect timeout [GH-2163]
2013-09-15 17:37:40 -07:00
Mitchell Hashimoto
5e468dd110
core: Convert FP ports to ints [GH-2173]
2013-09-15 17:29:49 -07:00
Mitchell Hashimoto
cf5d1f40e0
Merge pull request #2191 from Raman148/fix/master/exportssecurity
...
hosts/bsd: use `sudo` not `su` for NFS export writing
2013-09-15 16:46:53 -07:00
Mitchell Hashimoto
a36f06f28f
Update CHANGELOG
2013-09-15 16:39:54 -07:00
Mitchell Hashimoto
1900f5ecc2
Merge pull request #2200 from mikerowehl/virtualbox_destroy_unused_interfaces_fix
...
providers/virtualbox: call rest of destroy middleware stack
2013-09-15 16:37:36 -07:00
Mitchell Hashimoto
77bd296a07
Merge pull request #2203 from copperlight/ansible-host-key-checking
...
provisioners/ansible: add ansible.host_key_checking configuration parameter
2013-09-15 16:35:45 -07:00
Jurnell Cockhren
624a9dd2fd
need_configure should return true when master_config is defined as well.
...
This fixes #2204 and fixes saltstack/salty-vagrant#100
2013-09-14 09:49:37 -05:00
Matthew Johnson
131ce4fc97
add ansible.host_key_checking configuration parameter
2013-09-13 22:48:12 -04:00
Mike Rowehl
251cafe5e4
Call the rest of the middleware stack all the time.
2013-09-13 09:34:40 -07:00
Raman Nanda
1566280061
Cleanup for Pull Request
2013-09-11 17:57:54 -04:00
Raman Nanda
0c03ad18fc
Updating for NFS Fix
2013-09-11 17:22:13 -04:00
David
d3ab29e279
Put nfs opts setup in separate function and configured to be called by both generic linux and arch nfs_options. Fixes undefined method join exception in arch
2013-09-10 11:39:41 -04:00
Marc Schlaich
42e41eecc9
Removed duplicate entry.
2013-09-09 11:17:04 +02:00
Mitchell Hashimoto
8a9ee5d8dc
hosts/arch: correct variable for NFS exports [GH-2161]
2013-09-07 17:49:52 -07:00
Mitchell Hashimoto
9e878b3bfb
Merge pull request #2153 from gildegoma/ansible-docs-cleanup-and-vv
...
provisioners/ansible: Update documentation, Code Cleanup (and Extend Log Verbosity option)
2013-09-07 17:46:28 -07:00
Mitchell Hashimoto
c29925a6a5
Merge pull request #2156 from gustavobgama/fix/master/linux_nfs_error
...
hosts/linux: fixed options to NFS: no_subtree and check became no_subtree_check
2013-09-07 17:44:25 -07:00
Eric G. Wolfe
1186c86718
[GH-1977] revert and alternate fix
...
@mitchellh, the internal encoding doesn't seem to work. Therefore,
I reverted that previous change to vagrant.rb.
However, I found two alternate solutions. Either transcoding,
`/etc/redhat-release` to ISO-8859-1 on open, or using something
like File.binread to transcode the file contents to raw.
2013-09-07 13:40:23 -04:00
Gustavo Gama
693b813d63
Fixed options to NFS: no_subtree and check became no_subtree_check
2013-09-07 12:09:09 -03:00
Gilles Cornu
ce4f2824f4
Ansible: Support three available verbosity levels
2013-09-07 15:17:43 +02:00
Gilles Cornu
8a925e3461
Ansible: code cleanup and documentation update
...
Clean Up (code logic is kept unmodified):
* Remove repetition around `ansible.limit` option (merge conflict issue)
* Re-add missing comments from GH-1697 (merge conflict issue)
* Reorder instructions
Documentation for following changes:
* [GH-1697] add more options
* [GH-1979] extra verbosity option
2013-09-07 14:49:12 +02:00
Mitchell Hashimoto
517ac20822
guests/coreos: proper guest IP detection [GH-2146]
2013-09-06 11:30:53 -07:00
Mitchell Hashimoto
bad4c78766
hosts/linux: fix undefined variable in NFS export [GH-2137]
2013-09-06 08:54:02 -07:00
Mitchell Hashimoto
0879c1d624
provisioners/chef: fix syntax error
2013-09-05 23:59:11 -07:00
Mitchell Hashimoto
a06742b8ef
provisioners/chef: env config less restrictive
2013-09-05 16:34:21 -07:00
Mitchell Hashimoto
e05cca7ed4
provisioners/puppet: sudo test for folders for umask
2013-09-05 16:24:30 -07:00
Mitchell Hashimoto
592a800f84
provisioners/chef: work with restrictive umask [GH-2121]
2013-09-05 16:12:56 -07:00
Mitchell Hashimoto
1769fbcba8
core: dup option hashes everywhere
2013-09-05 14:26:53 -07:00
Mitchell Hashimoto
0b94ed44b7
core: dup the synced folder options [GH-2134]
2013-09-05 14:25:38 -07:00
Mitchell Hashimoto
d4e6372fa7
provisioners/chef: chown/create folder before access [GH-2121]
2013-09-04 20:43:22 -07:00
Mitchell Hashimoto
4c35f6d071
core: exec with the proxy command if specified
2013-09-04 17:23:43 -07:00
Mitchell Hashimoto
763bdc42f4
Merge pull request #1537 from wormzer/master
...
communicator/ssh: Additional proxy_command option
2013-09-04 17:18:59 -07:00
Mitchell Hashimoto
f82711259c
provisioners/all: report proper invalid keys [GH-2117]
2013-09-04 16:57:15 -07:00
Mitchell Hashimoto
51bdae3b90
Merge pull request #2112 from markpeek/markpeek-file
...
Add a file provisioner
2013-09-03 14:09:10 -07:00
Mark Peek
c158b4aff4
Add a file provisioner
...
Add a provisioner which will upload host files and directories to the
guest via the scp channel. This is useful for populating user specific
files into the guest. This is a rename from scpupload to file and updated
against master. [GH-1357]
2013-09-03 11:03:46 -07:00
Mitchell Hashimoto
3154669835
provisioners/shell: prefer "." over "::"
...
/cc @fgrehm
2013-09-03 10:44:16 -07:00
Mitchell Hashimoto
c752c37586
Merge branch 'shell-provisioner-remote-script' of https://github.com/fgrehm/vagrant into fgrehm-shell-provisioner-remote-script
...
Conflicts:
CHANGELOG.md
2013-09-03 10:40:24 -07:00
Mitchell Hashimoto
89ecb7850f
Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options
...
Conflicts:
plugins/provisioners/ansible/provisioner.rb
2013-09-02 15:30:49 -07:00
Mitchell Hashimoto
154b32e561
Merge pull request #1745 from jheise/master
...
providers/virtualbox: static ip addresses on public networks
2013-09-02 15:10:33 -07:00
Mitchell Hashimoto
b8dc881792
commands/up: validate provision-with args [GH-1957]
2013-09-02 15:06:03 -07:00
Mitchell Hashimoto
e8d2e05c4e
Merge pull request #2077 from miurahr/exportfs
...
Improvement of Linux supports and NFS handling using exportfs
2013-09-02 14:52:59 -07:00
Mitchell Hashimoto
ac1404b9ac
commands/plugin: Add "update" subcommand
2013-09-02 09:31:26 -07:00
Mitchell Hashimoto
c95a68ed5d
commands/reload: dont' provision by default
2013-09-02 09:13:22 -07:00
Mitchell Hashimoto
a656a99654
communicators/ssh: remove use of nonexistent config
2013-09-02 09:11:39 -07:00
Mitchell Hashimoto
63d0400de7
kernel_v1: don't upgrade "max_tries" and "timeout" because they're gone
2013-09-02 09:09:39 -07:00
Mitchell Hashimoto
e2ddab532d
core: Don't provision after first `up` by default [GH-1776]
2013-09-02 09:03:46 -07:00
Mitchell Hashimoto
ab7cee1ae0
Merge pull request #2107 from fgrehm/remove-dead-code
...
core: Remove dead code from Guest
2013-09-01 13:47:18 -07:00
Mitchell Hashimoto
7897de3fbd
guests/ubuntu: enable the new mount_nfs stuff
2013-09-01 13:46:09 -07:00
Mitchell Hashimoto
8bc01c7cb1
Merge pull request #1717 from toretore/master
...
guests/ubuntu: Emit Ubuntu Upstart 'vagrant-mounted' (regression)
2013-09-01 13:43:26 -07:00
Fabio Rehm
77dd626341
guest: Remove dead code
2013-09-01 17:41:17 -03:00
Mitchell Hashimoto
d7b398a905
Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support
...
Conflicts:
CHANGELOG.md
plugins/provisioners/puppet/provisioner/puppet.rb
2013-09-01 13:32:49 -07:00
Mitchell Hashimoto
3a14d27f90
core: Arbitrary NFS options with nfs_options [GH-1029]
2013-09-01 13:08:02 -07:00
Mitchell Hashimoto
df02ddb68c
core: note backwards incompat in code
2013-09-01 12:27:15 -07:00
Mitchell Hashimoto
e5b35d1c83
core: support "mount_options" for arbitrary mount options [GH-1029]
2013-09-01 12:25:21 -07:00
Mitchell Hashimoto
2d2180e5a5
hosts/linux: fix NFS prune regex
2013-09-01 12:00:36 -07:00
Mitchell Hashimoto
a6aa16dcad
hosts/bsd: proper NFS prune sed syntax
2013-09-01 11:58:52 -07:00
Mitchell Hashimoto
65ef8d2477
Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user
...
Conflicts:
plugins/hosts/arch/host.rb
plugins/hosts/bsd/host.rb
plugins/hosts/linux/host.rb
templates/nfs/exports.erb
templates/nfs/exports_freebsd.erb
templates/nfs/exports_linux.erb
2013-09-01 11:44:00 -07:00
Mitchell Hashimoto
c63d4fd6b8
hosts/bsd: nice error if can't read exports file [GH-2038]
2013-09-01 10:25:00 -07:00
Mitchell Hashimoto
a96efcdec9
providers/virtualbox: only set default name on first up [GH-1817]
2013-08-31 22:43:33 -07:00
Mitchell Hashimoto
9e38601f18
provisioners/puppet: run from correct working directory [GH-1967]
2013-08-31 22:24:30 -07:00
Mitchell Hashimoto
949416c76c
provisioners/ansible: use proper config name [GH-2104]
2013-08-31 21:48:41 -07:00
Mitchell Hashimoto
c4e79db552
commmands/box/remove: fix exception when no provider specified [GH-2100]
2013-08-30 09:43:35 -07:00
Mitchell Hashimoto
e5db091b1c
provisioners/salt: default bootstrap script gets latest
2013-08-29 17:40:59 -07:00
Mitchell Hashimoto
874994ff73
provisioners/salt: remove unused code
2013-08-29 17:26:52 -07:00
Mitchell Hashimoto
d154aafc0d
provisioners/salt: remove vagrant check, we core now
2013-08-29 17:08:49 -07:00
Mitchell Hashimoto
93d5182230
Merge pull request #1626 from raadad/salty-vagrant-provisioner
...
Salt provisioner.
2013-08-29 17:06:16 -07:00
Mitchell Hashimoto
c38d28f1c5
providers/virtualbox: 4.2 max network adapters to 36 [GH-1886]
2013-08-29 16:50:20 -07:00
Mitchell Hashimoto
0f4ba6dc3b
providers/virtualbox: Run post-boot after boot but before wait for SSH
...
[GH-2048]
2013-08-29 16:44:32 -07:00
Fabio Rehm
47594036b4
Add support for remote shell provisioner script
2013-08-29 20:44:14 -03:00
Mitchell Hashimoto
5a4c06f75e
core: config.ssh.timeout => config.vm.boot_timeout
2013-08-29 16:41:36 -07:00
Mitchell Hashimoto
c38fadfd2f
core: config.vm.graceful_halt_timeout to specify graceful halt timeout
2013-08-29 16:38:02 -07:00
Mitchell Hashimoto
261d0ef6cd
core: WaitForCommunicator - more robust wait for boot
...
This is a new built-in middleware that is more robust for
waiting for boots. The "max_tries" configuration is now gone, it is
timeout based. Future commits will make this even better as the
SSH communicator will implement the new "wait_for_ready" in a better
way.
2013-08-29 16:27:00 -07:00
Mitchell Hashimoto
2b7a1297c8
core: set `disabled: true` for disabling forwarded port [GH-1922]
2013-08-29 12:25:53 -07:00
Mitchell Hashimoto
c2012ff944
commands/up: flag --no-destroy-on-error [GH-2011]
2013-08-29 12:13:02 -07:00
Mitchell Hashimoto
9e476330f4
provisioners/ansible: execute ansible with cwd of root_path [GH-2051]
2013-08-29 11:55:58 -07:00
Mitchell Hashimoto
1ac3fb39fc
provisioners/chef: error if knife not found and auto-deleting
2013-08-29 11:36:37 -07:00
Mitchell Hashimoto
26b32bf8cd
provisioners/chef: don't delete node/client by default
2013-08-29 11:27:00 -07:00
Mitchell Hashimoto
a8ebd30cb9
provisioners/chef: use Subprocess to execute knife
2013-08-29 11:26:21 -07:00
Mitchell Hashimoto
d4c7e20110
core: ProvisionerCleanup task to run cleanup on provisioners
2013-08-29 11:13:43 -07:00
Mitchell Hashimoto
93c98aad01
Merge branch 'pr/1267'
...
Conflicts:
plugins/provisioners/chef/provisioner/chef_client.rb
2013-08-29 10:50:50 -07:00
Mitchell Hashimoto
50fdf1358c
communicators/ssh: handle closed connection without exception
2013-08-29 10:36:23 -07:00
Mitchell Hashimoto
54ac2e8448
Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704
...
core: respect :nic_type option for private network. Fixes #1704
2013-08-28 22:44:20 -07:00
Mitchell Hashimoto
349b2507f9
Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell
...
Conflicts:
plugins/provisioners/shell/config.rb
plugins/provisioners/shell/provisioner.rb
2013-08-28 22:29:49 -07:00
Mitchell Hashimoto
0e9711d0dd
kernel: config.vm.host_name works again
2013-08-28 17:17:07 -07:00
Mitchell Hashimoto
826c8a884d
Merge pull request #1801 from davegudge/patch-1
...
core: use getent to get group ID
2013-08-28 17:02:46 -07:00
Mitchell Hashimoto
adb72b07d5
plugins/provisioners: put generated inventory file in vagrantfile dir
2013-08-28 16:54:44 -07:00
Mitchell Hashimoto
8445308830
Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts
...
Conflicts:
plugins/provisioners/ansible/provisioner.rb
2013-08-28 16:52:13 -07:00
Mitchell Hashimoto
8f2f654446
Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support
...
Conflicts:
plugins/provisioners/chef/config/chef_solo.rb
2013-08-28 16:49:19 -07:00
Mitchell Hashimoto
02399a145c
provisioners/ansible: allow verbose :extra to be string
2013-08-28 16:46:04 -07:00
Mitchell Hashimoto
99a51a1ba8
Merge pull request #1979 from bmabey/patch-1
...
provisioners/ansible: adds extra verbosity option
2013-08-28 16:45:04 -07:00
Mitchell Hashimoto
5a18be1827
Merge pull request #2052 from janth/solaris11-guest
...
guests/solaris11: Added solaris11 guest plugin
2013-08-28 16:38:54 -07:00
Mitchell Hashimoto
29aab20a9d
core: nitpick the protocol forwarded port checking
2013-08-28 16:32:47 -07:00
Mitchell Hashimoto
44d65de076
Merge pull request #2059 from mlex/forward-tcp-and-udp-with-on-same-port-number
...
core: allow port-forwarding of the same port number but with different protocols [GH-1108]
2013-08-28 16:27:51 -07:00
Mitchell Hashimoto
53619daa74
Merge pull request #2086 from tsahara-iij/openbsd-caps
...
guests/openbsd: more capabilities for OpenBSD guest
2013-08-28 16:26:28 -07:00
Michael G. Noll
5058f351b1
GH-2087: Detect RHEL (Red Hat Enterprise Linux Server) properly
2013-08-28 09:19:08 +02:00
Michael G. Noll
95f5f553d9
GH-2088: Use proper regex capture group to detect OS version of RHEL family
2013-08-28 09:17:23 +02:00
Tomoyuki Sahara
91db685295
more capabilities for OpenBSD guest
2013-08-28 13:12:09 +09:00
Elan Ruusamäe
fda6bf7bf7
fix broken regexp from 2a9d0c9
2013-08-27 22:16:37 +03:00
KATOH Yasufumi
05d27d20e4
improve slackware/plamo detection and change nfs_check_command
...
* On Slackware, /etc/rc.d/rc.nfsd has no "status" argument, so the check command change to pidof command.
* On Plamo Linux, there is no /etc/slackware-release file, so use "/usr/lib/setup/Plamo-*" instead.
2013-08-27 08:13:23 +09:00
Hiroshi Miura
3d886671a6
fix typo for slackware
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-25 00:10:18 +09:00
Hiroshi Miura
bae7dbb0e2
Support slackware linux
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-24 22:11:22 +09:00
Hiroshi Miura
f2b83ac662
export nfs gracer way in Linux
...
To reload /etc/exports, /sbin/exportfs is best way
to command it in standard.
It modify generic linux to check daemon status
before restart instead of restarting everytime.
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2013-08-24 22:11:22 +09:00
Michael Lex
172a5dac5a
allow port-forwarding of the same port number but with different protocols [GH-1108]
2013-08-16 12:10:03 +02:00
Jan Thomas Moldung
75c03726b9
Added solaris11 guest plugin
2013-08-14 16:10:18 +02:00
Ben Mabey
bb3609e6b2
adds extra verbosity option to ansible provisioner
2013-08-12 09:31:54 -06:00
Gilles Cornu
b061e02bc8
Add support for "ansible.skip_tags" attribute
2013-08-12 09:41:18 +02:00
Boohbah
903578269b
Use hostnamectl in plugins/guests/arch/cap/change_host_name.rb
2013-08-10 00:41:18 +00:00
Mitchell Hashimoto
53f214c451
Merge pull request #2040 from timsutton/darwin-verify-vmware-hgfs
...
guests/darwin: Support verify_vmware_hgfs in darwin guest.
2013-08-09 12:05:09 -07:00
Timothy Sutton
caaaa9fe28
Support verify_vmware_hgfs in darwin guest.
2013-08-09 15:00:38 -04:00
Mitchell Hashimoto
b6ec723426
Update CHANGELOG
2013-08-09 11:53:58 -07:00
Mitchell Hashimoto
3b1a314117
Merge pull request #2015 from flozano/master
...
provisioners/puppet: Puppet modules owned by root when mounted in sync'ed folder.
2013-08-09 11:53:00 -07:00
Mitchell Hashimoto
d237bc0657
provisioners/ansible: properly quote vars with spaces [GH-1984]
2013-08-09 11:51:36 -07:00
Mitchell Hashimoto
602a5ce0b4
commands/plugin/install: nitpick on style
...
/cc @ipwnstuff - Just nitpicking and CCing you so you can see. I dislike
the "if (val = something)" syntax so I axed that. Then I simplified
logic a bit.
2013-08-09 11:26:39 -07:00
Mitchell Hashimoto
8e3422403f
Merge pull request #1986 from ipwnstuff/feature/plugin-post-install-message
...
commands/plugin/install: Display a plugin's post install message if available
2013-08-09 11:24:19 -07:00
Mitchell Hashimoto
b2f32543d9
Merge pull request #1689 from philippfranke/master
...
guests/suse: Add ability to configure networks
2013-08-09 11:21:26 -07:00
Mitchell Hashimoto
269f7c2cc6
Merge pull request #2007 from ches/ansible-exit-status
...
provisioners/ansible: Fix Ansible provisioner exit code reporting
2013-08-09 11:17:52 -07:00
Mitchell Hashimoto
bb209bacc2
Merge pull request #2008 from gwenci/master
...
hosts/fedora: Update host.rb vagrant failing on CentOS 6
2013-08-09 11:16:30 -07:00
Mitchell Hashimoto
0dfeec4fae
Merge pull request #2016 from mcourtois/fix/master/status_cosmetic
...
commands/status: Cosmetic fix to align machine name and states in the status command
2013-08-09 11:14:15 -07:00
Mitchell Hashimoto
8e065abf3c
Merge pull request #2026 from ppp0/patch-set-hostname-debian
...
plugins/guests/debian: Forcing eth0 to come up
2013-08-09 11:11:57 -07:00
Mitchell Hashimoto
17ecd05c5f
plugins/provisioners/ansible: rename inventory_file to inventory_path
...
/cc @ches
2013-08-09 11:06:02 -07:00
Mitchell Hashimoto
ac8b2c5047
plugins/provisioners/ansible: use exist? check
...
/cc @ches
2013-08-09 11:04:35 -07:00
Mitchell Hashimoto
15142704eb
Merge pull request #2035 from ches/ansible-inventory-directories
...
Ansible inventory can be a directory, not just a file
2013-08-09 11:03:52 -07:00
Mitchell Hashimoto
d24caac5ae
Merge pull request #1914 from b2jrock/darwin-guest
...
OS X (darwin) guest support.
2013-08-09 10:53:29 -07:00
Ches Martin
c38855f8c1
Ansible inventory can be a directory, not just a file
...
It is an under-documented feature that one can specify a directory as
the Ansible inventory source, not just a single file. In that case,
Ansible merges the contents of flat files and any executable inventory
plugins found in the directory.
This is useful, for instance, to put localhost in your inventory for use
with `local_action` even if your entire infrastructure is otherwise on
EC2 or some other dynamic inventory source. I also use a flat file to
create aliases for host groups automatically generated from the EC2 API,
like "staging" for `tag_Environment_staging`.
2013-08-09 01:26:04 +07:00
Timothy Sutton
23962baac9
Darwin: use :sudo for communicate.test
2013-08-07 17:10:32 -04:00
Timothy Sutton
a3b9428f67
Darwin: code debug cleanup
2013-08-06 10:18:38 -04:00
Timothy Sutton
8b925e6c15
Update Darwin guest description
2013-08-06 10:18:12 -04:00
Timothy Sutton
78ec8b5809
Darwin: clean up temporary network interface file downloaded from guest
2013-08-06 10:17:52 -04:00
Timothy Sutton
300d151608
Darwin guest: mount_vmware_shared_folder cap for use with vmware_fusion provider
...
- It's not clear whether it's possible to mount individual shares
using 'mount -t vmhgfs', as the vagrant-vmware-fusion provider now does
for Linux guests. Any mount from '.host', even if not a valid share
name, succeeds and mounts _all_ shares in their respective directories
at the root of the mountpoint. Instead, we symlink each directory from
its place in '/Volumes/VMware Shared Folders'
2013-08-06 10:17:12 -04:00
Brian Johnson
7d0a92c5b4
Remove the +1 offset, I resolved the issue with the 'phantom' en1
...
interface. For some reason interfaces still skip en1, but provided we
enumerate based on order and not name, things should work smoothly.
2013-08-05 18:45:42 -07:00
Brian Johnson
e5ce19ff11
Tabs must die.
2013-08-05 18:07:45 -07:00
Brian Johnson
3611ff39f4
Change mount_nfs_folder cap to be more like the linux version, adding a
...
bunch of retires rather than a long sleep.
Add DarwinNFSMountFailed error. This might move be more appropriate at
the plugin level.
Integrate some of tvsutton's work in configure_networks to get the
implementation closer to working in both fusion and virtualbox.
Add shell_expand_guest_path capability (also copied from linux)
2013-08-05 17:39:44 -07:00
Philipp Gysin
b6f2443bd5
Forcing eth0 to come up
2013-08-05 18:02:12 +02:00
Artur Roszczyk
bf21021cfc
Cleanup of CoreOS guest plugin
2013-08-04 02:15:37 +02:00
Artur Roszczyk
c8cd47ff6d
Make slaves connecting to first node
2013-08-03 22:53:31 +02:00
Artur Roszczyk
d8c10ad901
LVP for coreos guest support
2013-08-03 20:31:42 +02:00
Artur Roszczyk
5010738043
Improve Gentoo guest detection
2013-08-03 19:55:17 +02:00
Marc-André Courtois
ed03add533
Start padding with 25 characters to keep original behavior
2013-08-01 13:23:18 -04:00
Marc-André Courtois
97aed37aea
Use longest machine name to pad in status cmd
2013-08-01 13:17:55 -04:00
Francisco A. Lozano
521a5c5829
Added :owner => root to mount options
2013-08-01 14:46:03 +02:00
Brian Johnson
5606aa8b1e
Working implementation with NFS, still some caveats:
...
- There's a lengthy sleep in there, probably could use a back-off loop
- en1 seems totally worthless on vbox, I skip it and just use the en2 it creates.
2013-07-31 18:07:04 -07:00
gwenci
2a9d0c9d7f
Update host.rb
...
Vagrant has been failing to run on CentOS 6 since version 1.2.5.
The read of file /etc/redhat-release appeared to be only checking for the word Fedora. Altered the regex to match CentOS as well
2013-07-30 18:00:08 +01:00
Ches Martin
d937cca495
Fix Ansible provisioner exit code reporting
...
In eb70c0d6bb
we were trying to compare a Subprocess::Result to a
Fixnum, resulting in Vagrant always reporting failure regardless of
Ansible's exit code.
2013-07-30 19:25:15 +07:00
Mitchell Hashimoto
e1c0c48ffa
Show the correct installed plugin [GH-1834]
2013-07-28 21:38:48 -07:00
Michael Glass
a2a88118de
removing dead code
...
concept introduced in 59282ba999
was removed in 28de46f3b4
2013-07-28 16:07:20 -07:00
Mitchell Hashimoto
2282a88f3d
Convert config.vm.hostname to string [GH-1999]
2013-07-28 12:08:49 -07:00
Mitchell Hashimoto
6c4592ad64
Use --color=false for Puppet no color [GH-2000]
2013-07-28 12:07:48 -07:00
Mitchell Hashimoto
aeb1fa7ecb
unnecessary '!'
2013-07-27 22:21:37 -07:00
Mitchell Hashimoto
632349710e
Convert hostpath to string on windows so gsub works
2013-07-27 22:20:55 -07:00
Erran Carey
2033eba2d4
Display post install messages if a plugin has any
2013-07-26 01:50:35 -05:00
Michael Glass
876937fc9e
fix regression chowning chef provisioning directory
...
if the provisioning directory is mounted before this method is called, and the mounted filesystem is of a type that doesn't support chown (e.g. vmhgfs for vmware or hfs) then this method will fail.
2013-07-25 13:22:03 -07:00
Timo Sugliani
75da036f42
Cosmetic typo error.
2013-07-24 08:55:12 +01:00
Mitchell Hashimoto
fc7c8b1e99
Replace '\' with '/' on synced folders on Windows
2013-07-23 17:36:48 -05:00
Mitchell Hashimoto
c0404e3f63
Mount NFS with UDP protocol by default [GH-1706]
2013-07-23 17:36:48 -05:00
Mitchell Hashimoto
b2ee015d00
VirtualBox no longer removes network interfaces [GH-1324]
2013-07-23 17:36:48 -05:00
Mitchell Hashimoto
aeb0132dcb
Discover and set SSH_AUTH_SOCK on sudo with forward agent [GH-1307]
2013-07-23 17:36:48 -05:00
Mitchell Hashimoto
92a61f96a0
Config validation error if :id in pre-import VBoxManage
2013-07-23 17:36:47 -05:00
Mitchell Hashimoto
5f34a694f5
VBoxManage customizations can run at different events [GH-1247]
2013-07-23 17:36:47 -05:00
Fabio Rehm
4b299c9fc2
Add missing comma on puppet provisioner file
2013-07-21 17:38:56 -03:00
Mitchell Hashimoto
2d16588952
Validation so private network IP doesn't end in .1 [GH-1750]
2013-07-20 00:43:42 -04:00
Mitchell Hashimoto
b2d1a26dcf
NFS request is silently ignored on Windows [GH-1748]
2013-07-20 00:38:58 -04:00
Mitchell Hashimoto
cf1768c7be
Retry SSH on ENETUNREACH [GH-1732]
2013-07-20 00:27:25 -04:00
Mitchell Hashimoto
af66f5f930
box_download_insecure to not validate https of box_url [GH-1712]
2013-07-20 00:18:02 -04:00
Mitchell Hashimoto
4151df884a
Forwarded ports don't auto-correct by default [GH-1701]
2013-07-20 00:15:11 -04:00
Mitchell Hashimoto
eb70c0d6bb
Show an error message if ansible fails to run [GH-1699]
2013-07-20 00:07:09 -04:00
Mitchell Hashimoto
1841723478
Add read_mac_addresses to 4.2 VirtualBox driver [GH-1690]
2013-07-20 00:02:05 -04:00