Commit Graph

807 Commits

Author SHA1 Message Date
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