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
Stoned Elipot
27f323ed5a
Fix message provision / disabled_by_config
2015-04-11 14:32:05 +02: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
1b99272b13
Do not use ftp.list for checking the existence of a remote directory
2015-04-02 10:12:26 -04:00
Seth Vargo
fa3efaa866
Update CHANGELOG
2015-04-02 10:12:20 -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
Brian Dwyer
e72d03cfc6
VMware Documentation Fix - SED Syntax
...
we should only create the backup file on the first `sed` modification. The second `sed` operation will create a backup with the changes from the first `sed` operation.
2015-03-31 18:20:42 -04: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
Philipp Schrader
29040b3920
Make sure debian net post-up never returns an error code.
...
Inspired by e7dce43af3
.
I'm using this configuration in my Vagrantfile:
config.vm.network :public_network, use_dhcp_assigned_default_route: true
Every once in a while the secondary network interface would not come
up properly and cause the init scripts to wait for ~ 3 minutes before
giving up and continue with booting.
2015-03-30 12:47:54 -07:00
Volodymyr Babchynskyy
8e6db0015f
Fixed typo
2015-03-30 11:01:38 -06:00
Volodymyr Babchynskyy
7628ca71e7
Removed default dependences to number
2015-03-30 10:57:11 -06:00
Volodymyr Babchynskyy
b752805d53
Vlan_id configuration option description added to documentation
2015-03-30 10:29:06 -06: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
Seth Vargo
f5ee8b8b7d
Ignore vendor/
2015-03-30 10:19:02 -04:00
Seth Vargo
91752bcd1a
Update CHANGELOG
2015-03-30 10:18:38 -04:00
Seth Vargo
91f416ec5e
Merge pull request #5536 from delftswa2014/error-message-private_network
...
Fixed VirtualBox's error message on 'private_network'
2015-03-30 10:12:28 -04:00
Seth Vargo
7c84879644
Merge pull request #5538 from ssugar/master
...
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 10:09:31 -04:00
ssugar
fd557592d4
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 20:00:16 +07:00
Tim Rensen
1a2f403d0c
Fixed VirtualBox's error message on 'private_network'
2015-03-30 12:41:19 +02:00
Mario Rodas
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
Mattias Appelgren
0b737b8683
contrib/bash: Auto-complete VMs for up command
2015-03-25 15:51:23 +01: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
Emilien Kenler
1c1dd1ef8a
Allow to use several boxes with the same name
2015-03-23 16:30:23 +09:00
Paul Hinze
8b8f2b26a6
Merge pull request #5469 from mitchellh/b-winrm-idle-state
...
communicators/winrm: don't stop task on idle end
2015-03-22 11:02:48 -05: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
Mitchell Hashimoto
76f79d1bd8
Merge pull request #5484 from follower/patch-2
...
website: Fix known/kownn typo
2015-03-15 10:20:55 -07:00
follower
21538fd64f
Fix known/kownn typo
2015-03-16 03:17:56 +13: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
Jamezz
2f4a0af5d1
Fix issue #4152 : Salt minion bootstrapping
...
Copy the config after we know the installer exits. Also rev the
installed version to 2014.7.1 (latest stable as of 3/4/2015)
2015-03-04 18:08:07 -08:00
Tim O'Guin
0289ab986c
Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs.
2015-03-04 15:05:24 -07:00
Dan Duvall
3b8bc2a433
core: allow IO redirection of UI for testing
...
Use of $stdin, $stdout, and $stderr globals makes testing difficult. By
exposing the IO objects as writable attributes, input/output can be more
easily simulated using StringIO or doubles.
2015-03-04 11:23:16 -08:00
Seth Vargo
a8dcf92f14
Merge pull request #5412 from ivuk/capitalize-vagrant-readme
...
Fix capitalization of Vagrant in README.md
2015-03-01 19:06:25 -05:00
Igor Vuk
419a1a26ef
Fix capitalization of Vagrant in README.md
2015-03-01 21:34:26 +01:00
Seth Vargo
bd39b08532
Merge pull request #5405 from tomcodes/master
...
website/docs: fix typo in cli box repackage
2015-02-27 15:22:57 -05:00
tomcodes
f3109d483f
website/docs: fix typo in cli box repackage
2015-02-27 21:18:17 +01:00
Seth Vargo
c16fc181ad
Merge pull request #5403 from mitchellh/sethvargo/help_updates
...
Update help and FAQ
2015-02-27 11:44:50 -05:00
Seth Vargo
1302da80c8
Update docs Gemfile too
2015-02-27 11:04:51 -05:00
Seth Vargo
d877700f98
Add FAQ to buy page
...
This separates "buying" FAQ from installing FAQ. There is still some
overlap, but this should reduce confusion while purchasing.
2015-02-27 11:04:24 -05:00
Seth Vargo
041645de21
Update website build
2015-02-27 11:03:52 -05:00