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

2373 Commits

Author SHA1 Message Date
Seth Vargo b92d4b21a1 Add UI::Interface#color? 2015-06-01 11:49:09 -04: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 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 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 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 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 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 f5c77765fa Merge pull request #5437 from Jamezz/master 
Fix issue #4152: Salt minion bootstrapping
 2015-05-31 20:08:32 -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 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 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
Dmitry Moskalchuk 26e3994319 Add option to enable trusted HTTP redirects 2015-05-31 09:34:02 -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 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
John Cooper 7f716f4b63 Added synced_folder_args to puppet provisioner 2015-05-30 21:26:05 -07:00
Seth Vargo f9816d89d9 Merge pull request #4867 from malonecm/GH4201-ShowRSyncOutput 
GH-4201: Added rsync__showoutput to display rsync output to console
 2015-05-30 21:21:26 -07:00
Seth Vargo 042928db9f Merge pull request #5601 from benh57/environments_wip 
Puppet 4 and Puppet environments support
 2015-05-30 21:04:48 -07:00
Seth Vargo 50c0c487fb Style cleanup for new name option 2015-05-30 20:57:49 -07:00
Seth Vargo afc02ed681 Merge pull request #5607 from purpleidea/feat/named-shell 
Add :name attribute to shell provisioner.
 2015-05-30 20:54:34 -07:00
Seth Vargo bf45aa6233 Merge pull request #4726 from databus23/patch-3 
Add password to rdp_info hash
 2015-05-30 12:18:29 -07:00
Seth Vargo a60a05f61c Merge pull request #5707 from dcbw/dcbw/fedora-no-biosdevname 
fedora: don't try to use biosdevname if it's not installed
 2015-05-30 12:09:06 -07:00
Seth Vargo baaca21371 Merge pull request #5709 from linyows/fix-network-manager 
Reload iface connection by NetworkManager
 2015-05-30 12:08:15 -07:00
Seth Vargo 7dd7e1718e Merge pull request #5558 from legal90/fix-darwin-hostname 
Fixed error in ChangeHostName capability for Darwin
 2015-05-30 12:05:11 -07:00
Seth Vargo 9dddcdb8de Merge pull request #5691 from bergman/list-of-nics-to-bridge-to 2015-05-30 12:02:17 -07:00
Seth Vargo 08f240668b Minor cleanup 2015-05-30 12:02:10 -07:00
Seth Vargo 464e3f5bec Merge pull request #5749 from jeremyplichta/patch-1 
change to https in sources.list.d
 2015-05-30 11:59:05 -07:00
Seth Vargo 801d590204 Merge pull request #5730 from strzibny/fedora-releases 
Recognize new Fedora releases
 2015-05-30 11:58:18 -07:00
Seth Vargo dadee77730 Merge pull request #5637 from paul-krohn/config-not-found-error 
Provide path to missing file.
 2015-05-30 11:55:25 -07:00
Seth Vargo 56da192878 Merge pull request #5623 from otagi/tinycore-changehostname 
TinyCore change_host_name capability
 2015-05-30 11:52:54 -07:00
Seth Vargo 2801501262 Merge pull request #5325 from frankbb/master 
vagrant duplicates >= eth2 when defining two private network ips
 2015-05-30 11:50:48 -07:00
Seth Vargo 388c2f2383 Merge pull request #5539 from vvchik/vlanid 
HyperV provider: VlanID configuration possibility
 2015-05-30 11:46:43 -07:00
Seth Vargo 39a1a5c7ba Merge pull request #5207 from mwrock/switch_name 
select a Hyper-V switch based on a network_name
 2015-05-30 11:45:09 -07:00
David Cournapeau 3528af2db9 ENH: simpler masterless configuration. 2015-05-30 11:42:15 -07:00
Seth Vargo 0b85e04399 Minor style fixes for salt config_dir 2015-05-30 11:39:24 -07:00
David Cournapeau 74d22069d4 BUG: naive attempt at fixing #2970. 2015-05-30 11:39:23 -07:00
Seth Vargo a59247d4e5 Trailing comma 2015-05-30 11:01:32 -07:00
Seth Vargo c0c7d77ea9 Merge pull request #5647 from Stanzilla/support_vb5 
Support Virtualbox 5.0 (beta) by adding a driver, referencing it in the ...
 2015-05-30 11:00:37 -07:00
Justin Filip 67cde0d9b9 Use hostnamectl to set the hostname on Ubuntu Vivid 15. 2015-05-25 16:06:51 -04:00
alh84001 1c04934d89 Mounting to paths where user has no write permissions (e.g. /) 2015-05-25 15:35:06 +02:00
Matija K 09eec472f6 Mounting as regular user instead of root 2015-05-24 15:11:34 +02:00
Matija K b387f0e15d Capability to mount smb shares in darwin guests 2015-05-24 12:39:28 +02:00
Jeremy Plichta db1bd8d8c1 change to https in sources.list.d 
I started having this problem when running the docker provisioner (Vagrant 1.7.2):
Err http://get.docker.io docker/main amd64 Packages
  Undetermined Error
Err http://get.docker.io docker/main i386 Packages
  Undetermined Error
Ign http://get.docker.io docker/main Translation-en_US
Ign http://get.docker.io docker/main Translation-en


Stderr from the command:

stdin: is not a tty
W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-amd64/Packages  Undetermined Error

W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-i386/Packages  Undetermined Error

Changing this to https seemed to fix the problem for now.
 2015-05-22 15:18:11 -06:00
Mikhail Zholobov c399f075d5 darwin/cap/change_host_name: Fixed invalid argument LocalHostName 2015-05-21 18:48:39 +03:00
Dan Williams ccc4162ee8 fedora: don't try to use biosdevname if it's not installed 
If biosdevname isn't installed it doesn't make sense to try using it
for persistent device names.  Just treat lack of biosdevname as
virtual networking.
 2015-05-19 09:22:13 -05:00
Josef Stribny c1a26a66d1 Fix RHEL name and description 2015-05-19 12:58:19 +02:00
Josef Stribny bd2f2fc3a0 Add Atomic guest support 2015-05-19 12:55:44 +02:00
Josef Stribny b85248cb97 Recognize new Fedora releases 2015-05-19 10:44:25 +02:00
linyows 421fab17a2 reload connection instead of restart 2015-05-14 12:53:23 +09:00
linyows c1c39beaab restart NetworkManager and network for CentOS 7.1 2015-05-13 18:07:32 +09:00
Benjamin Staneck 7a94eba0b4 Port changes from pull request #5495 to the vb_5 module to fix #4815 here, too. 2015-05-09 02:03:33 +02:00
Joakim Bergman 2b3411965a virtualbox: handle a list of bridged nics 
This change allows you to specify multiple network interfaces to bridge
to, picking the first found.

```ruby
config.vm.network "public_network",
  bridge: ["en4: Thunderbolt Ethernet",
           "en6: Broadcom NetXtreme Gigabit Ethernet Controller",
           "en0: Wi-Fi (AirPort)"]
```
 2015-05-07 18:23:11 +02:00
Seth Vargo 3b10a3165a Merge pull request #5495 from jfbibeau/windows_unc_paths 
Proposed fix for #4815 - Windows UNC path to allow > 256 characters
 2015-05-06 14:06:38 -07:00
Taliesin Sisson 9233e22974 Use powershell syntax for Chef provisioner when using windows 2015-05-02 16:21:32 +01:00
Nathan a6f300f3e9 Implement download method 
Use the same method as upload, in a different order
 2015-04-28 15:35:39 -05:00
Benjamin Staneck 4d3e0cac62 Support Virtualbox 5.0 (beta) by adding a driver, referencing it in the list of acceptable versions/drivers, and autoloading the file in the virtualbox plugin file. 2015-04-28 17:53:48 +02:00
Ben Hines 9bbfbef977 Be a bit more robust when parsing environment.conf 2015-04-27 23:09:07 -07:00
Paul Krohn c7f32e6159 When you can't find the salt minion or master config, say what you were looking for. 2015-04-26 11:34:34 -07:00
Aneesh Agrawal 49ff17b9b9 Check Upstart is running before emitting upstart events. 
Fixes issue #5377.
Check that Upstart is not just installed but currently actively running
before attempting to emit an event after mounting shared folders.
Only requires the binary be named upstart, not that it lives in /sbin.
 2015-04-22 09:20:27 -04:00
bmx0r 0b588e3656 Remove useless line 
/usr/bin/sethostname will change /etc/hostname, useless to do it twice
 2015-04-21 21:04:40 +02:00
Tiago Mendes-Costa a9b8139755 Added change_host_name capability for tinycore. 2015-04-21 20:48:34 +02:00
Fabio Rapposelli 90bb760b3b Added tests 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-04-20 14:56:26 -07:00
Fabio Rapposelli 21db4470a0 Add Guest support for VMware Photon. 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-04-20 10:13:21 -07:00
James Shubin b16b85aa7d Add :name attribute to shell provisioner. 
This allows the display of friendly output to the user when we think an
important action should be labeled a certain way. This makes vagrant
output a lot more useful when many inline shell provisioners are
present.
 2015-04-18 00:35:21 -04:00
Ben Hines 602227ca7d Remove debug spam from development. 2015-04-16 00:50:53 -07:00
Shawn Neal 9de3c481de Salt bootstrap ps1 should be idempotent 
- WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist.
 2015-04-14 05:57:16 -07:00
Aaron Quint 2f81669394 Move shell_cmd to a method in SSH::Communicator 
This allows shell_cmd to be overridable by plugins/patches without
having to override the entire (large) shell_execute method
 2015-04-13 13:45:17 -04:00
Ben Hines ffcb58bcd9 When using environments, allow specifying the 'main manifest' using manifest_path and manifest_file. 2015-04-12 12:31:31 -07:00
Ben Hines 0efb9a3932 Fix resolution of puppet path for <4.0 2015-04-12 12:29:50 -07:00
Ben Hines b40426aca5 Properly parse out and use the environment's manifest file which is specified in environment.con. 2015-04-12 02:16:54 -07:00
Ben Hines c8f300e5f5 Correct environment path option to puppet apply. 2015-04-12 01:43:19 -07:00
Ben Hines c701bab253 Properly handle various combinations of Puppet options being specified. 2015-04-12 01:26:41 -07:00
Ben Hines cff7c52716 Use localized error message. Update strings for puppet provisioner errors. 2015-04-12 01:25:40 -07:00
Ben Hines 7a4e7929f8 Don't parse env metadata until provisioning time. TBD: make it functional 2015-04-12 01:18:49 -07:00
Ben Hines 3ee47acb42 Remove debug output 2015-04-12 01:18:12 -07:00
Ben Hines e2c68fc12d Correct environment path config name. 2015-04-11 23:48:18 -07:00
Ben Hines 3a2a9a3b94 Add a binary_path option to the puppet provisioner to match the chef provisioner, and support new puppet 4 install location. 2015-04-11 23:35:25 -07:00
Ben Hines cf847e0410 Merge branch 'master' into environments_wip 
Conflicts:
	Vagrantfile
	vagrant.gemspec
 2015-04-11 13:33:32 -07:00
Ben Hines e8843b8648 Merge branch 'master' of https://github.com/mitchellh/vagrant 2015-04-11 13:03:18 -07:00
Brandon Matthews c0f43c362c Use service command to restart docker, not upstart. 
upstart ships by default on Ubuntu, but not on Debian, and service works
everywhere. Fixes #5245.
 2015-04-10 10:06:21 -07:00
Jean-Francois Bibeau 415837c544 moved function to platform utils, added unit test as per @sethvargo 2015-04-06 16:51:55 -04:00
Seth Vargo 13d4899d16 Cleanup style 2015-04-02 10:11:41 -04:00
wucheng ca3cb385d4 fix ftp push check bug 
list method is not safe to check if a dir exist or not on remote.
 2015-04-02 14:44:11 +08:00
Jeff Johnson 9d50f72df3 For SMB on Linux guests, specify the user's domain as a separate parameter to the mount command. This is more reliable than passing user@domain as the username. This is not needed for SMB on Windows guests as they expect the user@domain form. 
This does not change how it is configured in the Vagrantfile.

Fixes #3620
 2015-03-31 08:16:06 -07:00
Volodymyr Babchynskyy 9a0aab4bd7 Improved behavior for case if vlan_id is not set 2015-03-30 10:17:29 -06:00
Volodymyr Babchynskyy 9e23d16d9c merged vlan_id changes for hyperv by tomassrnka 2015-03-30 08:37:29 -06:00
ssugar fd557592d4 only set EFI secure boot for gen 2 machines in hyperv provider 2015-03-30 20:00:16 +07:00
Mario Rodas e745436df3 provisioners/ansible: disable color if Vagrant has no color [GH-5531] 2015-03-28 19:05:54 -05:00
Michael Adam b43413525f guests/freebsd: fix call of set -i : missing extension 
Sed on freebsd seems to be mores strict than on other
platforms about use of -i: the extension is not optional.

Signed-off-by: Michael Adam <obnox@samba.org>
 2015-03-23 13:31:07 +01:00
Jean-Francois Bibeau 7d17574a76 changing windows/virtualbox shared path names to UNC format to allow > 256 characters 2015-03-18 15:29:43 -04:00
Adam Duro be81f09a60 Supporting a named Dockerfile for Docker 1.5.0 2015-03-13 17:30:42 -07:00
Ben Jansen 992c148169 Ignore Windows NICs with nil :net_connection_id 
When upping a Win XP box, vagrant found a lot of "virtual" network
connections that did not have DHCP enabled, and tried to configure them
for DHCP. This did not work because their :net_connection_id is nil.
Ignoring these network connections enabled the XP box to be upped.
 2015-03-13 11:49:15 -07:00
Paul Hinze 291db96510 communicators/winrm: don't stop task on idle end 
StopOnIdleEnd was set in the task definition for elevated/privileged
windows guest scripts. This setting:

> specifies that the task stops when the idle condition ceases to be true [1]

The "idle condition" is something that Windows periodically checks for,
and it's defined by a bunch of criteria like user presence/absence, CPU
/ IO idle time, etc. [2]

Telling our provisioner to stop the task if the "idle condition" ceases
to be true is a recipe for some sporadically stopped tasks, which seems
like precisely the behavior being reported in #5362.

I'm pretty sure this fixes #5362

[1] https://msdn.microsoft.com/en-us/library/cc248332.aspx
[2] https://msdn.microsoft.com/en-us/library/windows/desktop/aa383561%28v=vs.85%29.aspx
 2015-03-12 15:25:40 -05:00
Jamezz 71c40bdf6a File architecture string should be x86 
As of 2014.7.0, Salt has changed their file naming for 32-bit from win32
to x86.
 2015-03-06 13:14:11 -08:00