haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,931 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

7931 Commits

Author SHA1 Message Date
Matt Wrock 1cd1033093 fixes from @sethvargo comments. 2015-06-05 05:07:12 -07:00
Matt Wrock c60a020096 adds a ps command to vagrant that drops the user into a remote powershell shell 2015-06-05 05:07:11 -07:00
Seth Vargo b420da0678 Merge pull request #5795 from ivuk/fix-typo 
Fix a typo in ssh_settings.html.md
 2015-06-04 14:21:09 -04:00
Igor Vuk b072e8bcf5 Fix a typo in ssh_settings.html.md 2015-06-04 19:58:56 +02:00
Seth Vargo 2b415d092e Whoops - don't comment that out 
/cc @mbrodala
 2015-06-03 12:11:39 -04:00
Manuel Pöter 9d63ca4dd2 Acquire lock to prevent concurrent creation of master VM for the same box. 2015-06-03 13:31:43 +02:00
Manuel Pöter c3151c0b88 Ignore failure when trying to delete lock file. 
Deleting the lock file can fail when another process is currently trying to acquire it (-> race condition).
It is safe to ignore this error since the other process will eventually acquire the lock and again try to delete the lock file.
 2015-06-03 13:27:03 +02:00
Seth Vargo e071ce4663 Update CHANGELOG 2015-06-02 18:14:27 -04:00
Seth Vargo dc60d6b82c Merge pull request #5785 from mitchellh/sethvargo/ignore_hidden_dirs 
Ignore hidden directories
 2015-06-02 17:44:29 -04:00
Seth Vargo 345935887f Style fixes 2015-06-02 17:18:50 -04:00
Philip Wrenn 4c8fe42d70 Ignore possible version directories that are hidden folders, i.e. dot folders. 2015-06-02 17:09:10 -04:00
Seth Vargo 9b4a498f82 Update CHANGELOG 2015-06-02 17:07:41 -04:00
Seth Vargo a7aea0953f Merge pull request #5771 from mitchellh/sethvargo/color 
Add UI::Interface#color?
 2015-06-02 17:07:08 -04:00
Seth Vargo e34679c20f Merge pull request #5775 from sschuberth/master 
website: Improve description to enable Hyper-V on Windows 8.1
 2015-06-02 17:05:40 -04:00
Sebastian Schuberth 5ad6b7e553 website: Improve description to enable Hyper-V on Windows 8.1 
The step to click on "Turn Windows features on or off" was missing.
 2015-06-02 10:05:39 +02:00
Seth Vargo b92d4b21a1 Add UI::Interface#color? 2015-06-01 11:49:09 -04:00
Tim O'Guin 72e63767ac Salt Provisioner: refactor custom install_type option to add install_command instead 2015-06-01 10:37:41 -05:00
Tim O'Guin 0b24866537 merged in master and resolved conflict in Salt provisioner docs 2015-06-01 10:07:28 -05:00
Gilles Cornu 272fb27e05 provisioners/ansible: trim white spaces 
[ci skip]
 2015-06-01 10:12:22 +02:00
William Durand 6ff15fbedb
Being able to edit a file does not mean you can write in its parent directory 
Interactive `sed` needs write permission on the file itself. However, it
may create a backup file, which leads to the fact that the directory
where the file is located must be writable as well. That is a side
effect because this directory does not need to be writable.

This patch fixes this side effect by editing the file in `/tmp`, and
replaces it right after.
 2015-06-01 10:02:13 +02:00
Gilles Cornu f7894d9c8c provisioners/ansible: fix broken colorized output 
After #5532 (e745436df3), it was no longer
possible to enable ansible colorized output. Even though
`ANSIBLE_NOCOLOR` has no effect *at the moment* in vagrant+ansible
integration, I agree to keep it for clarity and consistence.

The new `--no-color` behaviour (bug fix #5531) is now covered by a unit
test.

//cc @marsam, @sethvargo
 2015-06-01 08:36:09 +02:00
Seth Vargo 2daa9ed175 Merge pull request #5591 from paperlesspost/extract_shell_cmd 
Move shell_cmd to a method in SSH::Communicator
 2015-05-31 20:57:46 -07:00
Seth Vargo 1413cd56cf Merge pull request #5626 from brooksbrown/smb-docs-update 
Added a note on PowerShell to prerequisites SMB documentation.
 2015-05-31 20:53:01 -07:00
Seth Vargo a642663a73 Merge pull request #5584 from stoned/fix-locale-en 
Fix message provision / disabled_by_config
 2015-05-31 20:46:44 -07:00
Seth Vargo f48b704ba0 Update CHANGELOG 2015-05-31 20:45:37 -07:00
Seth Vargo 3017243a24 Merge pull request #5577 from luciddg/fix/master/docker-provisioner-restart-fix 
Use service command to restart docker, not upstart.
 2015-05-31 20:44:48 -07:00
Seth Vargo 13b8cda214 Merge pull request #5544 from bdwyertech/bdwyertech-patch-1 
VMware Documentation Fix - SED Syntax
 2015-05-31 20:41:57 -07:00
Seth Vargo f1928959dc Update CHANGELOG 2015-05-31 20:34:57 -07:00
Seth Vargo 6a48af6350 Merge pull request #5532 from marsam/fix/master/ansible-no-color 
Disable color if in ansible provisioner if Vagrant has no color
 2015-05-31 20:34:06 -07:00
Seth Vargo 99e0cac237 Update CHANGELOG 2015-05-31 20:32:09 -07:00
Seth Vargo dc713cbd66 Merge pull request #5517 from obnoxxx/fix-freebsd-ssh-remove-key 
guests/freebsd: fix call of set -i : missing extension
 2015-05-31 20:31:04 -07:00
Seth Vargo d7283277cf Update CHANGELOG 2015-05-31 20:20:15 -07:00
Seth Vargo 6309847420 Merge pull request #5512 from johnsonj/issue_3620 
For SMB on Linux guests, specify the user's domain as a separate parameter
 2015-05-31 20:19:08 -07:00
Seth Vargo 06fe7163d2 Update CHANGELOG 2015-05-31 20:11:11 -07:00
Seth Vargo 624a3200f3 Merge pull request #5478 from aogail/ignore-windows-virtual-network-connections 
Ignore Windows NICs with nil :net_connection_id
 2015-05-31 20:10:08 -07:00
Seth Vargo 50b78b6039 Update CHANGELOG 2015-05-31 20:09:30 -07:00
Seth Vargo f5c77765fa Merge pull request #5437 from Jamezz/master 
Fix issue #4152: Salt minion bootstrapping
 2015-05-31 20:08:32 -07:00
Seth Vargo 655d1adf6f Update CHANGELOG 2015-05-31 19:08:10 -07:00
Seth Vargo 50f8c161e3 Merge pull request #5770 from mitchellh/pr-4847 
Add nfs and flavor cap to Fedora
 2015-05-31 19:07:04 -07:00
Seth Vargo 19f3c10777 Always return the version 2015-05-31 19:02:24 -07:00
Seth Vargo 30dda77454 Remove unneeded tap on nfs_client cap for Fedora 2015-05-31 19:02:23 -07:00
Seth Vargo 3fcd3d691a Fix syntax errors and style on Fedora flavor cap 2015-05-31 19:02:23 -07:00
langdon efd7b459dd Add more capabilities for Fedora guests 2015-05-31 19:02:23 -07:00
Seth Vargo ece8e858a6 Update CHANGELOG 2015-05-31 18:40:05 -07:00
Seth Vargo 9cf362292f Merge pull request #5769 from mitchellh/pr-4711 
Pr 4711
 2015-05-31 18:39:07 -07:00
Seth Vargo 6b2ef13785 Be more defensive when trying to get the line number 
Since this is the last line of defense before raising an error, we want to make
sure we don't cause an error while trying to render the error.
 2015-05-31 18:32:23 -07:00
Adam Spiers ce13051d61 eliminate guesswork with Vagrantfile errors 
If the Vagrantfile has some kind of error, display not only
its path and the exception message, but also the originating
line number and exception class.

Also log the full backtrace when the error is in a provider
block, just as it is done when it's outside a provider block.
 2015-05-31 18:25:51 -07:00
Seth Vargo e9b11b4ee4 Update CHANGELOG 2015-05-31 10:19:27 -07:00
Seth Vargo b90807648b Style fixes 2015-05-31 10:19:03 -07:00
Seth Vargo e34308ec12 Merge pull request #4371 from andrewmains12/salt_orchestrations 
Added ability to run salt orchestrations to Salt provisioner
 2015-05-31 10:17:54 -07:00