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 (e745436df3c64537570953d4d815eaec840da46d), 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
Seth Vargo
be2b6d620e
Update CHANGELOG
2015-05-31 09:35:47 -07:00
Seth Vargo
95c9638e14
Merge pull request #4422 from crystax/master
2015-05-31 09:34:44 -07:00
Dmitry Moskalchuk
26e3994319
Add option to enable trusted HTTP redirects
2015-05-31 09:34:02 -07:00
Seth Vargo
3d66e16240
Merge pull request #5520 from Mattias-/bash-completion-vms-to-up
...
contrib/bash: Auto-complete VMs for up command
2015-05-30 21:46:03 -07:00
Seth Vargo
ebb6fa5a6f
Update CHANGELOG
2015-05-30 21:44:57 -07:00
Seth Vargo
95764f86d7
Merge pull request #5738 from mitchellh/bump-winrm-fs-version
...
Use latest winrm-fs release
2015-05-30 21:44:28 -07:00
Seth Vargo
30308f7b53
Update CHANGELOG
2015-05-30 21:41:06 -07:00
Seth Vargo
07efee776e
Merge pull request #5677 from mrahtz/fix/master/unescape-curl-passwords
...
Escape/unescape cURL URLs/auth
2015-05-30 21:40:18 -07:00
Seth Vargo
d62ddb3012
Switch back to hashicorp/precise64
2015-05-30 21:39:06 -07:00
Seth Vargo
b7bdfb4a40
Merge pull request #5713 from berendt/fix_vagrantfile
...
Fix Vagrantfile to develop Vagrant
2015-05-30 21:38:34 -07:00
Seth Vargo
8cdd6e2e12
Update CHANGELOG
2015-05-30 21:35:29 -07:00
Seth Vargo
6210f13338
Merge pull request #5750 from alh84001/feature/capability_guest_darwin_mount_smb
...
Capability to mount smb shares in darwin guests
2015-05-30 21:34:53 -07:00
Seth Vargo
ce8dd0c5f0
Update CHANGELOG
2015-05-30 21:32:28 -07:00
Seth Vargo
01ce48ea9e
Merge pull request #5669 from taliesins/ChefProviderWindowsSupport
...
Use powershell syntax for Chef provisioner when using windows guest
2015-05-30 21:31:43 -07:00
Seth Vargo
d8e929cfdb
Update CHANGELOG
2015-05-30 21:27:53 -07:00
Seth Vargo
a382944b07
Merge pull request #5359 from choffee/fix/master/puppet_folder_sync_args
2015-05-30 21:26:51 -07:00
Seth Vargo
d8285653e2
Remove extra newline
2015-05-30 21:26:40 -07:00
