Dan Dunckel
aec65b5d66
Fix user to username that was lost in merge conflict resolution
2015-10-15 12:41:08 -07:00
Dan Dunckel
d859a3b752
Somehow I missed this param while resolving conflicts
2015-10-15 12:36:19 -07:00
Dan Dunckel
9d87be51da
Small refactor on conditional check and add tests
2015-10-15 12:25:50 -07:00
Marc Siegfriedt
8e87990599
add the option to make elevated interactive scripts
2015-10-15 12:25:50 -07:00
Seth Vargo
c88d52082a
Merge pull request #6296 from tomfanning/master
...
Hyper-V set mac address
2015-10-14 13:02:53 -04:00
Mitchell Hashimoto
5e48d35911
Merge pull request #6229 from mitchellh/b-winrm-info-respect-timeout
...
communicators/winrm: respect boot_timeout when fetching winrm_info
2015-10-12 15:50:05 -04:00
Tadej Janež
29e60882ca
Fixes Fedora network issues when biosdevname command is not present.
...
Previously, configuring and enabling network interfaces failed with:
"The following SSH command responded with a non-zero exit status.
Vagrant assumes that this means the command failed!
/usr/sbin/biosdevname --policy=all_ethN -i bash: /usr/sbin/biosdevname:
No such file or directory
Stdout from the command:
bash: /usr/sbin/biosdevname: No such file or directory"
The previous attempt to fix this (ccc4162
) doesn't work since it doesn't
properly parse the 'bash: /usr/sbin/biosdevname: No such file or
directory' error message.
This patch works around that problem and adds a comment explaining the
meaning of the return codes.
2015-10-11 23:10:26 +02:00
Johannes Graf
9998544995
Fix for #6151 / provisioner puppet_server with Puppet Collection 1
...
puppet_server provisioner fails with Puppet Collection 1 with the
following error:
```bash
==> default: Running provisioner: puppet_server...
The `puppet` binary appears not to be in the PATH of the guest. This
could be because the PATH is not properly setup or perhaps Puppet is not
installed on this guest. Puppet provisioning can not continue without
Puppet properly installed.
```
2015-10-10 21:16:12 +02:00
Mikhail Zholobov
f930fa94af
Move "cant_read_mac_addresses" error to the global space
...
Now it is used not only by Windows, but by Darwin guests as well.
2015-10-09 14:57:41 +03:00
Mikhail Zholobov
e426455309
guests/darwin: Configure network following the MAC addresses matching
...
Currently `configure_networks` guest cap configures NICs following the device order and fails
when the device order is mixed. We should detect the appropriate NIC by its MAC address.
2015-10-09 14:57:41 +03:00
Mitchell Hashimoto
36cfc77167
providers/virtualbox: make prepare clone a core thing
2015-10-08 16:02:37 -04:00
Jurnell Cockhren
86e56aeac3
Revert "Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs."
...
This reverts commit 0289ab986c
.
Refers to issues #6276 , #5973 , #5936 and #5435
Conflicts:
website/docs/source/v2/provisioning/salt.html.md
2015-10-08 15:01:00 -05:00
Jurnell Cockhren
1a7c6dcfeb
Revert "Salt Provisioner: refactor custom install_type option to add install_command instead"
...
Refers to issues #6276 , #5973 , #5936 and #5435
This reverts commit 72e63767ac
.
Conflicts:
website/docs/source/v2/provisioning/salt.html.md
2015-10-08 15:01:00 -05:00
Jurnell Cockhren
fb611c7389
Revert "Initialize the install_command salt config var"
...
Refers to issues #6276 , #5973 and #5936
This reverts commit ccd7354665
.
2015-10-08 15:01:00 -05:00
Jurnell Cockhren
70e9079449
Revert "Fix alignment of initializer"
...
Refers to issues #6276 , #5973 and #5936
This reverts commit 27d7518636
.
2015-10-08 15:01:00 -05:00
Mitchell Hashimoto
5ea24e39d0
providers/virtualbox: unify import/clone
2015-10-08 13:07:05 -04:00
Mitchell Hashimoto
4908cd9cd9
providers/virtualbox: copy SSH key
2015-10-08 12:58:06 -04:00
Mitchell Hashimoto
e9922d1754
providers/virtualbox: discard state if cloning
2015-10-08 12:50:02 -04:00
Mitchell Hashimoto
dbcc936a71
kernel/v2: box is optional if clone is set
2015-10-08 12:41:16 -04:00
Mitchell Hashimoto
f0ddac8c9a
providers/virtualbox: clone
2015-10-08 12:33:55 -04:00
Mitchell Hashimoto
c5c3ba616b
providers/virtualbox: some progress
2015-10-08 12:09:46 -04:00
Mitchell Hashimoto
9f05d22eb0
providers/virtualbox: cloning can do a non-linked clone
2015-10-08 12:03:58 -04:00
Mitchell Hashimoto
20310dce0c
noop
2015-10-08 11:59:30 -04:00
Mitchell Hashimoto
06f8595bc0
kernel/v2: clone option
2015-10-08 11:59:09 -04:00
Mitchell Hashimoto
44d484e2e0
providers/virtualbox: ability to customize linked clone snapshot
2015-10-08 11:58:47 -04:00
Mitchell Hashimoto
ec0326f1c8
Merge pull request #6377 from mitchellh/f-cap-command
...
"cap" command
2015-10-08 10:52:14 -04:00
Mitchell Hashimoto
50638b2e55
commands/cap: require_relative
2015-10-08 10:42:10 -04:00
Mitchell Hashimoto
0a52e06298
commands/snapshot: use require relative
2015-10-08 10:40:46 -04:00
Mitchell Hashimoto
0b2d60ac39
commands/cap: better help
2015-10-08 10:36:44 -04:00
Mitchell Hashimoto
99d29f17fa
commands/cap
2015-10-08 10:35:36 -04:00
Mitchell Hashimoto
6e187aaefb
providers/virtualbox: v4.2 and 4.3 support
2015-10-08 08:57:21 -04:00
Mitchell Hashimoto
0abc17eaed
commands/snapshot: push now uses caps to be more resilient
2015-10-08 08:55:13 -04:00
Mitchell Hashimoto
7480b65e9d
providers/virtualbox: use caps for snapshot list
2015-10-08 08:46:36 -04:00
Mitchell Hashimoto
ed4df21c85
commands/snapshot: push and pop
2015-10-07 22:52:27 -04:00
Mitchell Hashimoto
c36b682e40
providers/virtualbox: fix error if no snapshots
2015-10-07 22:22:55 -04:00
caleblloyd
00894b5a27
hyper-v boot device by generation fixes #6372
2015-10-07 20:25:09 -04:00
Mitchell Hashimoto
8c0e38b397
providers/virtualbox: snapshot restore
2015-10-07 16:48:29 -04:00
Mitchell Hashimoto
c635352b89
providers/virtualbox: list snapshots, progress for delete
2015-10-07 16:41:58 -04:00
Mitchell Hashimoto
d0e8ecfc73
providers/virtualbox: snapshot save/delete
2015-10-07 16:16:53 -04:00
Mitchell Hashimoto
a99ebcb3ce
commands/snapshot
2015-10-07 15:52:37 -04:00
Guillermo Bonvehí
07e38f1bb3
Fix Slackware Host detection and nfsd checks
...
Slackware's version file is /etc/slackware-version not
/etc/slackware-release.
pidof is not on PATH by default (not running as root) so call it using
full path
2015-10-07 01:17:07 -03:00
Mitchell Hashimoto
0586412f9d
providers/virtualbox: fix some crashing bugs
2015-10-06 16:22:48 -04:00
Mitchell Hashimoto
2c936b2e37
providers/virtualbox: tidying up the linked clone feature
2015-10-06 14:11:41 -04:00
Mitchell Hashimoto
d519d927fa
Merge branch 'VB-linked-clone-support' of https://github.com/mpoeter/vagrant into mpoeter-VB-linked-clone-support
2015-10-06 13:50:34 -04:00
ctammes
0556b3b040
Update push.rb
...
https://github.com/mitchellh/vagrant/issues/5570
When uploading from Windows to Linux, the Windows filepath was added to the Linux path.
2015-10-06 14:02:45 +02:00
Mitchell Hashimoto
2299715b41
providers/virtualbox: code review comments
2015-10-01 17:01:27 -04:00
Mitchell Hashimoto
05fbb4ced2
providers/virtualbox: more support
2015-10-01 08:50:47 -04:00
Mitchell Hashimoto
061a91d09b
providers/virtualbox: workaround IPv6 routing bug in VB
...
VirtualBox has a bug where the IPv6 route is lost on every other
configuration of a host-only network. This is also triggered when a VM
is booted.
To fix this, we test the route-ability of all IPv6 networks, and
reconfigure if necessary. This is very fast but we still only do this if
we have any IPv6 networks.
2015-09-30 18:19:37 -07:00
Mitchell Hashimoto
0d50f454ea
providers/virtualbox: VB5 support
2015-09-30 17:29:23 -07:00
Mitchell Hashimoto
ec0b0fb7f9
providers/virtualbox: IPv6 host only networks
2015-09-30 17:23:25 -07:00
Maarten De Wispelaere
cfd4270cdb
FIX bug introduced in #6315
2015-09-28 09:08:20 +02:00
Brian Dwyer
fd593a85b7
Add `nodes_path` support for the Chef-Solo provisioner
2015-09-27 23:23:28 -04:00
Maarten De Wispelaere
e0dad41b0c
FIX: no exception for debian 8 needed, shutdown -h -H doesn't work ; use normal shutdown -h now
2015-09-24 12:18:59 +02:00
Trey Briggs
a5b6e23e20
Removed extra quote in powershell command.
2015-09-22 23:28:14 -05:00
Trey Briggs
ed1c219a07
version is a Symbol, convert to String before concat.
2015-09-22 23:26:02 -05:00
tomfanning
41beaac074
Hyper-V set mac address
2015-09-22 11:35:55 +01:00
Rickard von Essen
acde6e1b16
Use dnf on Fedora guests instead of yum if available.
...
Fixes #6286 now properly installs Docker on Fedora guests.
Fixes #6287 use dnf if available.
2015-09-20 09:30:49 +02:00
Sam Phippen
53714abfa3
Handle encoding errors in shell provisioner newline normalization.
...
The problem demonstrated in #6065 is that a string has incorrectly been
encoded with US-ASCII even though it contains invalid US-ASCII byte
sequences (any byte with the most significant bit on is invalid in the
US-ASCII encoding).
The thing about doing newline normalization is that it is not actually
sensitive to the presence of US-ASCII byte sequenzes. Additionally, it
is very unlikely that a user will ever be using an encoding where \r\n
is not encoded the same as it would be in ASCII.
This patch first tries the existing method of normalizing the newlines
in the provided script file, if that fails for any reason it force
encodes the string to ASCII-8BIT (which allows the most significant bit
to be on in any individual byte) and then performs the substitution in
that byte space.
2015-09-12 14:36:54 +01:00
Philip Wigg
33b4d6a63d
Fix verify_binary for Puppet for Windows guests.
2015-09-11 20:06:21 +01:00
Kristoffer Grönlund
1911586832
Better NFS status check command for SUSE
2015-09-10 10:05:14 +02:00
Jeff Kwan
4b32744424
Use a .NET API call instead of a Win8+ cmdlet
...
The root cause is that Windows 7 doesn't have Get-NetIPAddress (
see:
https://stackoverflow.com/questions/19529442/gather-ip-address-information
)
but the change was to try and solve the bug that the VPN IP
addresses
aren't visible detailed
here:
https://support.microsoft.com/en-us/kb/2549091
Resolved using the
2nd solution
from
http://serverfault.com/questions/145259/powershell-win32-networkadapterconfiguration-not-seeing-ppp-adapter
2015-09-03 16:54:41 -04:00
Paul Hinze
1e84cc4d6a
communicators/winrm: respect boot_timeout when fetching winrm_info
...
We gained a ton of improvemnts to WinRM error handling in
https://github.com/mitchellh/vagrant/pull/4943 , but we also got one bug.
The new code raises an exception when `winrm_info` does not return right
away. This was preventing us from catching the retry/timout logic that's
meant to wait until boot_timeout for the WinRM communicator to be ready.
This restores the proper behavior by rescuing the WinRMNotReady
exception and continuing to retry until the surrounding timeout fires.
2015-09-02 16:36:23 -05:00
Jeff Goldschrafe
c7186236f1
Better Ubuntu systemd detection
...
Check the running process at PID 1 to determine which init system is currently in use.
2015-08-31 17:24:13 -04:00
Jeremy Roberts
c844a9c4fd
Adding WinRM execution_time_limit to log.
2015-08-31 11:42:35 -04:00
Jeremy Roberts
18d229ca82
Added execution_time_limit for WinRM.
...
Adds a configurable value for WinRm and the elevated permission shell ExecutionTimeLimit.
Please see mitchellh/vagrant#5506
Ex: config.winrm.execution_time_limit = "P1D"
2015-08-31 11:42:25 -04:00
konomae
ad9a7324c5
Fix invalid ini entry error when ansible_ssh_private_key_file contains spaces
2015-08-29 18:00:20 +09:00
Dusty Mabe
be90f6b1da
Fix Fedora /etc/hosts bug
...
Update so that localhost entries don't get deleted when the hostname
gets added to the 127.0.0.1 line. Closes #6202
2015-08-27 16:53:21 -04:00
Arlo Louis O'Keeffe
af0f267b50
Check if Schedule.Service com object is available
2015-08-26 00:15:03 +02:00
Elan Ruusamäe
f71b27ff27
fix network detection on pld-linux
...
pld linux uses redhat as base, but lacks :flavour
this will add it
2015-08-21 12:49:36 +03:00
Lonnie VanZandt
b897fd7365
Scrub Guest Paths for Windows Rsync leaving Dirty Paths for Winrm Mkdir
...
Windows offers no out-of-the-box rsync utility. By far, the most
commonly used external utilities for Windows rsync are built with the
GNU Cygwin libraries. The cost for this convenience is that rsync on
Windows has to be provided paths that begin “/cygdrive/c” rather than
“c:/“ like other Windows-API utilities. Compounding the situation,
rsync doesn’t create paths/to/sub/targets and so the vagrant plugin
code, when performing an rsync, is responsible for creating
intermediate directories in guest paths if there are any. Furthermore,
the mkdir utility in Windows is not another Cygwin utility like rsync
but the routine mkdir of Windows command.com. Therefore, while rsync
needs the /cygwin paths, mkdir uses the Windows paths. Later, the
chef_solo.rp provisioner running within the guest will expect to find
Windows-style paths in its solo.rb configuration file. Due to all this,
vagrant has to keep track of both the original, possibly dirty Windows
guest path and the cygwin-scrubbed guest path.
2015-08-18 10:56:13 -06:00
Victor Costan
4425d91d86
Don't warn about an .1 IP for DHCP networks
...
When the network's type is :dhcp, the :ip option is used to derive the DHCP server configuration, and it doesn't actually indicate the IP that will be received by the VM(s).
2015-08-15 06:53:01 -04:00
Manuel Pöter
2a2f0a4751
Use hash of machine name for lock file to avoid problems with invalid characters for file names.
2015-08-12 14:25:54 +02:00
Mike Averto
587c88e65a
Fix Win 10 Enterprise Vagrant Error
...
This fixes error for Win 10 Enterprise:
An error occurred while executing a PowerShell script. This error
is shown below. Please read the error message and see if this is
a configuration error with your system. If it is not, then please
report a bug.
Script: get_vm_status.ps1
Error:
C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\providers\hyperv\scripts\get_vm_status.ps1 : Unable to
find type [Microsoft.HyperV.PowerShell.VirtualizationOperationFailedException].
At line:1 char:1
+ &('C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\prov ...
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ CategoryInfo : InvalidOperation: (Microsoft.Hyper...FailedException:TypeName) [get_vm_status.ps1], Ru
ntimeException
+ FullyQualifiedErrorId : TypeNotFound,get_vm_status.ps1
2015-08-09 12:44:49 -04:00
Jason Woods
ff941ef4e8
Fix broken masterless minion configuration
2015-08-03 12:11:32 +01:00
John Syrinek
ea7b277f41
Prevent fatal error caused by attempting to upload minion config to
...
privileged directory
2015-07-31 16:05:55 -05:00
Ben Hines
3f29be0de2
Fix string parse error in the environment path missing error message.
2015-07-28 11:16:20 -07:00
Brian Dwyer
e4cdb473bd
Bring back `nodes_path` support for the Chef Zero provisioner
2015-07-28 12:41:51 -04:00
지훈
287831dd2e
Fix for Issue #6006 - cfengine will now install
2015-07-20 02:08:13 -07:00
Pat O'Shea
d34bc38bf3
Updated salt-minion and call ext on windows guest
...
Salt-minion and salt-call are batch files on a windows guest, not executables.
2015-07-18 20:53:46 -06:00
Mattias Appelgren
f349a58a1e
provisioners/puppet: Fix Puppet environment default manifest
...
Also parse the puppet variables $codedir and $environment when
resolving a manifest path from environment.conf
2015-07-18 14:48:03 +02:00
Denis Brækhus
d2b0df0a7d
Specify time and don't do -h -H which is not really a valid usage.
2015-07-17 21:44:58 +02:00
Mitchell Hashimoto
4b217e2128
Merge pull request #5980 from PatOShea/PatOShea-ConfigDir-Typo
...
Fixed salt minion configuration directory typo
2015-07-17 12:37:44 -07:00
Jon Burgess
209556c3cd
Allow provisioner instance names to be specified for `up` and `reload` commands and option `--provision-with`
...
Ref: https://github.com/mitchellh/vagrant/issues/5139
2015-07-17 14:26:13 +10:00
Pat O'Shea
a4eede0c42
fixed typo for config_dir
...
Only exposed when calling highstate with config_dir being set
2015-07-16 18:45:59 -06:00
Pat O'Shea
956bbf011c
Changed minion config path for windows
...
Copy of minion is wrong on windows. Moved to sub-dir, conf.
2015-07-16 18:37:36 -06:00
Manuel Pöter
772f276ee3
Port support for linked clones to VirtualBox 5.0 driver.
2015-07-16 13:27:24 +02:00
Mitchell Hashimoto
bac5d039db
providers/docker: pull setting, default false [GH-5932]
2015-07-15 11:08:01 -07:00
Mitchell Hashimoto
f26293bb06
hosts/linux: sudo to copy back to exports [GH-5957]
2015-07-15 11:04:05 -07:00
Mitchell Hashimoto
ce5a30b264
provisioners/puppet: fix config merging [GH-5958]
2015-07-15 10:59:34 -07:00
Mitchell Hashimoto
3476491881
update CHANGELOG
2015-07-15 10:57:38 -07:00
Mitchell Hashimoto
087ffa67b2
Merge pull request #5967 from benh57/fix_puppetwin_path
...
Fix custom puppet.binary_path to work properly on windows and fix puppet detection on windows.
2015-07-15 10:56:19 -07:00
Bob
f12f50c552
Raise Errno::ETIMEDOUT as "acceptable" Errors::ConnectionTimeout
2015-07-15 19:41:10 +02:00
Ben Hines
46eedb6491
Back to using 'which' when no path is defined since the winrm communicator overrides it anyway.
2015-07-14 23:55:09 -07:00
Ben Hines
8c2ddac2cd
Check for nil config_path.
2015-07-14 23:26:55 -07:00
Ben Hines
8c1ff5ee26
Fix custom puppet.binary_path to work properly on windows.
...
Fix automatic puppet path detection on windows
2015-07-14 23:21:46 -07:00
Mitchell Hashimoto
b118ab10c8
providers/virtualbox: remove windows UNC path [GH-5933]
2015-07-13 08:38:41 -07:00
Mitchell Hashimoto
39baec78e7
Merge pull request #5936 from wkral/fix-salt-bootstrap-install
...
Fix salt bootstrap issue after 1.7.3 upgrade with verbose option set
2015-07-13 08:34:01 -07:00
Mitchell Hashimoto
a9d5d6ae4a
Merge pull request #5931 from kaorimatz/fix/guests-fedra-nmcli
...
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-13 08:31:01 -07:00
Mitchell Hashimoto
639f22c4d0
Merge pull request #5954 from mitchellh/sethvargo/tmpdir
...
Fallback to /tmp if $TMPDIR is not set
2015-07-13 08:30:25 -07:00
Seth Vargo
bfbf96c385
Fallback to /tmp if $TMPDIR is not set
2015-07-13 10:40:28 -04:00
Manuel Pöter
f4d1d068f9
Merge branch 'master' into VB-linked-clone-support
2015-07-13 10:56:17 +02:00
Yang Sheng Han
d09e8e6f50
guests/redhat: Fixed the NFS detection on guest, not host [GH-5948]
2015-07-13 14:18:27 +08:00
aidanhs
13e2dbaf9d
Fix setting hostname in 12.04
...
Fixes #5934
2015-07-11 19:15:54 +01:00
William Kral
27d7518636
Fix alignment of initializer
2015-07-11 10:40:17 -07:00
William Kral
ccd7354665
Initialize the install_command salt config var
2015-07-11 10:31:19 -07:00
Satoshi Matsumoto
73d5718da3
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-11 16:14:11 +09:00
Seth Vargo
5f383b546c
Use sudo for read_ip_address capability
...
Fixes #4868
2015-07-10 13:25:11 -06:00
Seth Vargo
516d475f16
Checksum args to each docker container in local data
...
This allows Vagrant to calculate if a container's arguments (such as the run
arguments) have changed in the Vagrantfile since the original run.
Fixes GH-3055
2015-07-10 11:32:02 -06:00
Seth Vargo
3e3037f313
Add a space before args
2015-07-10 10:49:21 -06:00
Gilles Cornu
3842a1f710
provisioners/ansible: provide ssh identities via ANSIBLE_SSH_ARGS (when necessary)
...
When provisioning multiple machines in sequence (the default vagrant
behaviour), it doesn't make sense to require to provide the private ssh
key(s) via the custom ansible inventory script/file.
To align with the handling of multiple ssh keys per machine, we won't
rely any longer on `--private-key` command line argument, but only pass
the keys via `ANSIBLE_SSH_ARGS` environment variable.
Note that when vagrant generates the ansible inventory and that only one
key is associated to a VM, this step would be redundant, and therefore
won't be applied.
This change fixes the breaking change introduced by 3d62a91.
2015-07-10 08:51:17 +02:00
Luis Pabón
f0718d620d
provisioners/ansible: Put ssh key in the inventory
...
Vagrant 1.7.1 creates and injects new ssh keys for each virtual machine.
When it started ansible with the "parallel provisioning trick",
it would only send the ssh key of the targeted virtual machine.
With this change, vagrant now stores the ssh key for each virtual
machines directly in the generated ansible inventory, and thus allow
ansible parallelism.
Note that this change is not sufficient, as it would break vagrant
configuration based on a custom inventory (file or script). This issue
will be addressed in a next commit.
Signed-off-by: Luis Pabón <lpabon@redhat.com>
2015-07-10 08:39:49 +02:00
Seth Vargo
4b1847acf3
Use Chef Client for Chef Zero
...
Fixes GH-5619
2015-07-09 21:23:42 -06:00
Seth Vargo
40b94afeb5
Update command builder now that provisioning_path has moved to runtime
2015-07-09 17:46:39 -06:00
Seth Vargo
60330218fb
Merge pull request #5913 from mitchellh/sethvargo/windows_chef_paths
...
Use windows-specific Chef paths
2015-07-09 17:05:40 -06:00
Seth Vargo
e9bcf147f0
Prefix with guest_
2015-07-09 17:01:36 -06:00
Seth Vargo
0e039159a6
Calculate Chef paths at provision time
2015-07-09 16:55:55 -06:00
Nicholas Randon
eb6aa2ac8c
Allow Ansible provisioner to run reliably in parallel
...
The Ansible Vagrant provisioner has a race where the inventory file is
updated every time the provisioner runs unless a file is provided.
Therefore if Ansible attempts to provision two nodes in parallel, you
may see the following race:
* System A writes the inventory file and calls Ansible.
* System B starts to provision and truncates the file before
creating a new one.
* Ansible on system A now attempts to read the inventory
file, which is blank. Ansible bombs out with "ERROR: provided
hosts list is empty".
To fix this, we only allow Vagrant to update the inventory file if
it needs to.
2015-07-10 00:53:59 +02:00
Seth Vargo
742d47c4cf
No longer need subprocess wrapping there :)
2015-07-09 16:06:03 -06:00
Mitchell Hashimoto
790c625bc0
Merge pull request #5884 from dcbw/dcbw/fedora-network-mac-address
...
[fedora] honor MAC address when configuring networks
2015-07-09 16:01:33 -06:00
Mitchell Hashimoto
cea44847de
Merge branch 'filter_synced_folders' of https://github.com/maxlinc/vagrant into maxlinc-filter_synced_folders
2015-07-09 15:05:52 -06:00
Mitchell Hashimoto
d51c5fbc69
Merge pull request #5435 from juiceinc/bugfix/salt-provisioner
...
Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script
2015-07-09 15:02:34 -06:00
Mitchell Hashimoto
5fd3ab5bb0
Merge pull request #5706 from jim-minter/master
...
Remove docker0 from guest network interface enumeration
2015-07-09 14:31:00 -06:00
Mitchell Hashimoto
c65c62b2c1
Merge pull request #5880 from strzibny/fix-nfs
...
Fix: Rewrite Red Hat NFS handling based on systemd
2015-07-09 14:27:30 -06:00
Mitchell Hashimoto
3cad495064
Merge pull request #5887 from msabramo/config.ssh.ssh_command
...
Add setting config.ssh.ssh_command
2015-07-09 14:24:48 -06:00
Mitchell Hashimoto
f1618f5ec8
providers/docker: don't remove image on reload for build cache
2015-07-09 14:23:26 -06:00
Adrian Guenter
9bdefb5c59
Don't destroy built Docker image on reload
2015-07-09 16:15:56 -04:00
Mitchell Hashimoto
300b9c9109
provisioners/chef: don't check existing set, unique ID
...
[GH-5199]
2015-07-09 14:04:12 -06:00
Mitchell Hashimoto
d5458247c7
update to latest listen
2015-07-09 11:18:36 -06:00
Mitchell Hashimoto
9596b7a46c
synced_folders/rsync-auto: don't crash if rsync command fails [GH-4991]
2015-07-09 11:11:58 -06:00
Mitchell Hashimoto
d95dad9a79
synced_folders/rsync: command help [GH-5868]
2015-07-09 10:58:45 -06:00
Mitchell Hashimoto
964f340f09
synced_folders/nfs: verify_installed option [GH-5269]
2015-07-09 10:24:40 -06:00
Mitchell Hashimoto
31448d126b
synced_folders/rsync: can set rsync_path [GH-3966]
2015-07-09 10:02:38 -06:00
Mitchell Hashimoto
c1508cd893
kernel/v2: customizable sudo_command [GH-5573]
2015-07-09 09:30:47 -06:00
Mitchell Hashimoto
536ea0729b
providers/virtualbox: name for private network chooses right interface
...
[GH-5389]
2015-07-08 18:35:44 -06:00
Mitchell Hashimoto
45a5bc3bd9
kernel/v2: make provisioner name show up on invalid [GH-5902]
2015-07-08 17:50:36 -06:00
Mitchell Hashimoto
9dd87b289e
providers/docker: validate config after HandleBox [GH-5667]
2015-07-08 17:45:32 -06:00
Mitchell Hashimoto
be21604d45
providers/docker: style on custom Dockerfile
2015-07-08 16:07:57 -06:00
Mitchell Hashimoto
8d725c1f27
Merge pull request #5482 from duro/support-named-dockerfile
...
Support for Docker 1.5.0 named Dockerfile
2015-07-08 16:06:13 -06:00
Mitchell Hashimoto
0b6938d8ab
core: don't prepare folders in disable ode
2015-07-08 15:43:42 -06:00
Mitchell Hashimoto
1c203405d2
providers/docker: fix crash if host VM file can't be foundJ:wq
...
gs
2015-07-08 12:31:24 -06:00
Mitchell Hashimoto
9dd5640324
provisioners/docker: for debian, chmod the var lib docker folder
2015-07-08 12:13:25 -06:00
Mitchell Hashimoto
606a8fdde2
providers/docker: validate create args is list [GH-4850]
2015-07-08 10:25:32 -06:00
Mitchell Hashimoto
855aa66ad9
providers/docker: better error on suspend
2015-07-08 10:18:43 -06:00
Mitchell Hashimoto
dbf0af2e3f
providers/docker: don't pull if image is built
2015-07-08 10:10:43 -06:00
Mitchell Hashimoto
c2cae80de5
providers/dock: pull image prior to starting
2015-07-08 10:09:15 -06:00
Mitchell Hashimoto
26fe5ac89f
guests/tinycore: more robust rsync install
2015-07-08 09:47:48 -06:00
Mitchell Hashimoto
0d561ddf94
guests/tinycore: fix rsync install on 64-bit b2d
2015-07-07 16:21:34 -06:00
Mitchell Hashimoto
72b3ccd64f
providers/docker: use new b2d box
2015-07-07 16:06:04 -06:00
Mitchell Hashimoto
dd69de1073
communicators/ssh: only try auth methods that are valid
2015-07-07 16:06:03 -06:00
Gilles Cornu
839a2e6fa6
provisioners/ansible: show ansible-playbook only when the verbose option is enabled
...
Revert 1c884fa4e5
which introduced the
following bug:
Instead of allowing to dump the `ansible-playbook` command details when
VAGRANT_LOG=debug was defined, it was then impossible to disable this
console output when VAGRANT_LOG was undefined (in such case,
``@logger.debug ? systematically returns `true`)
In order to keep things simple and focused, it is preferable to drop the
bad idea to mix Ansible verbosity and Vagrant log level.
Fix #5803
2015-07-07 22:37:06 +02:00
Mitchell Hashimoto
9c7f666e48
provisioners/docker: support restart flag [GH-4477]
2015-07-07 12:17:24 -06:00
Pat O'Shea
da67824a53
Adding run_service and minion/master ids for windows
2015-07-07 00:24:23 -06:00
Mitchell Hashimoto
33d4f4d2a9
push/local-exec: close temp script, fix inline [GH-5695]
2015-07-06 23:42:07 -06:00
Mitchell Hashimoto
0b9ec53f46
commands/rdp: support username param [GH-5460]
2015-07-06 23:07:22 -06:00
Mitchell Hashimoto
cd18eddb1c
providers/virtualbox: fix bug, make message clearer
2015-07-06 18:18:13 -06:00
Mitchell Hashimoto
71940c60ba
providers/virtualbox: error if uid mismatch
2015-07-06 18:13:59 -06:00
Mitchell Hashimoto
92e6062f8d
Merge pull request #5622 from aneeshusa/fix-mounting-with-inactive-upstart
...
Check Upstart is running before emitting upstart events.
2015-07-06 16:20:21 -06:00
Mitchell Hashimoto
709f20b54f
Merge pull request #5651 from nspaeth/docker-download
...
Implement docker download method
2015-07-06 15:34:27 -06:00
Mitchell Hashimoto
4d4d2a4eec
Merge pull request #5731 from strzibny/rhel
...
Fix RHEL name and description
2015-07-06 15:31:26 -06:00
Mitchell Hashimoto
6c8c15b2ab
Merge pull request #5753 from jfilip/fix/master/ubuntu_vivid_hostname
...
Fix #5673 - Use hostnamectl to set the hostname on Ubuntu Vivid 15.
2015-07-06 15:28:23 -06:00
Mitchell Hashimoto
a8580353b1
Merge pull request #5773 from willdurand/fix-sed
...
guest/linux: Being able to edit a file does not mean you can write in its parent directory
2015-07-06 15:26:56 -06:00
Mitchell Hashimoto
d0b359cecf
Merge pull request #5798 from mwrock/preferipv4
...
prefer ipv4 host address over ipv6 for smb synced folders
2015-07-06 15:23:08 -06:00
Mitchell Hashimoto
bd0626672b
Merge pull request #5818 from mitchellh/issue-5790-password-in-cleartext
...
provisioner/shell: remove plaintext auth from Windows powershell
2015-07-06 15:21:47 -06:00
Mitchell Hashimoto
a0326751e6
Merge pull request #5847 from strzibny/atomic-guest
...
guest/atomic: Add Atomic guest support
2015-07-06 15:20:02 -06:00
Mitchell Hashimoto
4d2e8fd591
Merge pull request #5860 from arthurvanduynhoven/docker-provisioner-deb-fix
...
provisioner/docker: Docker Provisioner fails on Debian [ubuntu/trusty64]
2015-07-06 15:16:03 -06:00
Mitchell Hashimoto
cc2d393611
Merge pull request #5892 from PatOShea/master
...
provisioner/salt: Updated version for windows and added passing in version via vagrantfile
2015-07-06 15:11:08 -06:00
Mitchell Hashimoto
f5e38a4a14
kernel/v2: not an error if synced folder guest path is empty [GH-4833]
2015-07-06 14:58:48 -06:00
Mitchell Hashimoto
6dffec4bf9
guests/solaris11: fix suexec inheritence [GH-5247]
2015-07-06 14:23:24 -06:00
Mitchell Hashimoto
2fc8d99f6d
provisioners/file: validate source relative to Vagrantfile path
...
[GH-5252]
2015-07-06 14:22:00 -06:00
Jeff Quast
1ac3d17773
bugfix: undefined local variable or method `dir'
...
resolves bug introduced in 74d22069d4
2015-07-06 11:39:07 -07:00
Mitchell Hashimoto
fec6ef11c8
provisioners/puppet: just quiet the NFS errors for Puppet [GH-5456]
2015-07-06 11:19:32 -06:00
Mitchell Hashimoto
d03b1f6930
push/atlas: ATLAS_TOKEN env var works [GH-5489]
2015-07-06 11:01:50 -06:00
Mitchell Hashimoto
e64cef9d31
provisioners/chef: fix crash if run list is somehow nil [GH-5545]
2015-07-05 17:30:29 -07:00
Mitchell Hashimoto
262b50bc02
guests/linux: fix exception when printf is empty [GH-5846]
2015-07-05 17:14:48 -07:00
Mitchell Hashimoto
67c14c4889
guests/openbsd: add newline after insert_public_key [GH-5881]
2015-07-05 17:10:10 -07:00
Mitchell Hashimoto
36fa04fd1e
providers/virtualbox: catch subprocess launch error [GH-1483]
2015-07-05 17:01:06 -07:00
Pat O'Shea
eab702da83
Adding config to set version to install
2015-07-04 01:25:31 -06:00
Marc Abramowitz
9240ea30b6
Add setting config.ssh.ssh_command
...
Lets the user specify what ssh to use or even direct Vagrant to use an
ssh wrapper like sshrc (https://github.com/Russell91/sshrc ).
2015-07-01 23:33:13 -07:00
Dan Williams
49c4581a8c
[fedora] honor MAC address when configuring networks
...
Configuring by :interface doesn't work very well because Vagrant has
no idea about what interfaces are present in the VM, for example if
the image has 'docker' installed but not biosdevname, then
interface_names[0] = "docker0" which is usually not what you want
mapped to the first network from the Vagrantfile.
So if the plugins (like vagrant-libvirt) or the Vagrantfile has
given us a network with a MAC address, use that to find the interface
name for the network. Otherwise use slot numbers as before.
2015-06-30 16:43:36 -05:00
Josef Stribny
a151f7172a
Remove Fedora nfs cap
2015-06-30 10:23:15 +02:00
Josef Stribny
c4733a02d4
Rewrite Red Hat nfs caps based on systemd checks
2015-06-30 10:21:58 +02:00
arthurvanduynhoven
94549ab755
Need to do update before installing linux-image-extra kernel in case system is outdated.
2015-06-24 14:56:28 +02:00
Shawn Neal
1152b4e1df
Fix issue 5790
...
Leaving around plaintext username and passwords in a script on a box isn't the best from a security standpoint. This change ensures the scheduled task wrapper script for WinRM doesn't leave these around on the box, and instead passes them to the script as arguments.
2015-06-10 16:04:46 -07:00
Francesco
ca8923835a
Use the extended password parameter, more compatible
2015-06-08 04:13:23 +01:00
Matt Wrock
e6daf2f172
fix pscommand error messaging
2015-06-05 22:24:05 -07:00
Matt Wrock
ac9b0b7978
prefer ipv4 host address over ipv6 for smb synced folders
2015-06-05 06:19:58 -07:00
Matt Wrock
740877065a
marshall back command output when passing a command to ps
2015-06-05 05:07:14 -07:00
Matt Wrock
cf6d4ef5a1
clean up command encoding
2015-06-05 05:07:13 -07:00
Matt Wrock
47e57a7cd9
fix relative path
2015-06-05 05:07:12 -07:00
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
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
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
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