37a525fbbc
Little bit of cleanup.
2016-10-20 22:43:00 +02:00
e6093dd709
The virtual machine doesnt need 'Virtual Machines' in its path, this is created when importing.
2016-10-19 21:03:48 +02:00
c075c026be
Keyboard language setting made my comment bad
2016-10-19 20:56:52 +02:00
055bed5918
removed an extra echo and added proper error message when there is incompatibilities. Appearantly importing into a compressed folder wont work and will result in an error.
2016-10-19 20:55:56 +02:00
fa2a9105f0
provisioners/salt: Synchronize config defaults with documentation
2016-10-17 10:11:39 -07:00
418064519d
Move dynamic memory settings into conditional block
2016-10-14 18:53:44 -07:00
803fff7f03
Fix issue with missing slash in paths
...
It was failing to create files below the machines\default\hyperv folder, rather it was creating folders named 'hypervSnapshots', 'hypervVirtual Hard Disks', and 'hypervVirtual Machines'. This was causing the files to not be removed when destroying the vm, and an error when subsequently bringing it up again.
2016-10-11 15:31:28 -05:00
b9ea9a2ac2
Merge pull request #7887 from chrisroberts/guests/linux-detection
...
Guests/linux detection
2016-10-11 12:55:52 -07:00
9d61d7c61b
Merge pull request #7818 from rswarts/vz7flavor
...
Add Virtuozzo Linux 7 to list of RHEL flavors
2016-10-11 10:35:20 -07:00
d0549d6e11
guests/linux: Provide common linux detection style
...
Defines a common and generic linux detection strategy which can be
subclassed and easily reused by providing a custom detection constant.
2016-10-11 07:50:34 -07:00
6050b13f43
Make Debian guest detection more reliable
...
/etc/issue is far from being a reliable source for OS detection as it
can be changed by a user without affecting any OS functionality. As
newer Debian systems run systemd by default, check for /etc/os-release
and fallback to lsb_release for older Debian versions. Check #7625 for
a similar issue. Even lsb_release is not manatory, therefore keep the
current code of parsing /etc/issue to avoid regressions.
2016-10-11 07:49:35 -07:00
a55590b84f
provisioners/ansible_local: Change binary detection
...
- Remove `ansible-galaxy` detection, since this command was introduced
in Ansible 1.4.2 (December 2013). Checking for `ansible-playbook`
presence should therefore be enough for any "modern" Ansible setup.
- Look for the command defined by the new `playbook_command` option.
Related to GH-7881 and GH-7536
2016-10-10 23:24:19 +02:00
b1ddc98e17
Merge pull request #7881 (Add playbook_command option)
...
Note that error messages were not adapted, and only mention
a generic "Ansible Software" when executed commands are failing.
We assume that people using the `playbook_command` option are
advanced users that will know all the components to be considered.
2016-10-10 23:18:24 +02:00
26e8bdc1f1
Merge pull request #7536
2016-10-10 23:03:00 +02:00
07ce1c6930
Merge pull request #7866 from chrisroberts/guest-linux/network-interfaces-sorting
...
guests/linux: Update network interface sorting implementation
2016-10-10 10:59:52 -07:00
7eb1091a71
Merge pull request #7874 from chrisroberts/enhancement/cast-box-version
...
config/vm: cast box version to string before string operations
2016-10-10 10:57:53 -07:00
a8970281ce
guests/linux: Properly sort interface name types
...
Add failing networking interface list sorting test with example
provided by #7883 . Update sorting logic to properly handle different
types and differing array lengths.
Fixes #7883
2016-10-10 10:22:19 -07:00
42efd5c198
Make the Virtual Hard Disks directory if importing from XML to keep it consistant across config types
2016-10-09 21:10:56 +02:00
58f2b0c8c7
Make ansible-playbook command configurable
...
The ansible-playbook command is currently hardcoded for the ansible and
ansible_local provisioners. This patch adds the config option
playbook_command to allow the user to change the command.
2016-10-09 20:48:50 +02:00
8744caebcf
Small typo in options
2016-10-09 20:39:17 +02:00
7b03bf335b
Whitespace
2016-10-08 16:44:24 +02:00
debe50957b
Refactor the import script to fully use Compare-VM for creating the new VM.
...
Implemented the differencing disk for vmcx.
This means the disk is now copied by Hyper-V (Powershell) instead of Ruby for new machines.
This does mean EFI Firmware now does work for machines since it is quite a feep copy. Compare-VM will report incompatibilities should they be found.
2016-10-08 16:38:42 +02:00
d178631ff9
Generic white space strip from command strings
2016-10-07 17:30:27 -07:00
703513bd0f
Revert "Fix incorrect ssh-config output when '--host' is defined"
...
This reverts commit c77326438b
2016-10-07 16:50:12 -07:00
bb60fdd790
Merge pull request #7877 from guessi/fix_7728_incorrect-ssh-config-output
...
Fix incorrect ssh-config output when '--host' is defined
2016-10-07 15:19:18 -07:00
33b13dffbe
Merge pull request #7873 from markpeek/markpeek-photon-netmask
...
Fix typo (netmast => netmask) for Photon guest #7808
2016-10-07 15:15:26 -07:00
4bf32e3f6d
Fix typo (netmast => netmask) for Photon guest #7808
2016-10-07 12:32:21 -07:00
a77da314e5
Only check for .vmcx if there is no XML found to not risk breaking older vagrant boxes that added an XML file manually
2016-10-07 20:38:05 +02:00
c77326438b
Fix incorrect ssh-config output when '--host' is defined
...
Fixes : #7728
Signed-off-by: guessi <guessi@gmail.com>
2016-10-07 23:47:56 +08:00
6ed612e93b
Move package_setup_files to general lib to minimize code duplication
2016-10-07 17:31:15 +02:00
26b3a303d2
config/vm: cast box version to string before string operations
2016-10-06 16:16:59 -07:00
8291c56fd2
Merge pull request #7688 from hunterboerner/7597-docker-interactive-flag
...
Remove --interactive flag from Docker command
2016-10-06 15:41:58 -07:00
b738aaac0f
Merge pull request #7813 from rudineirk/fix-non-upstart-linux
...
Fix non upstart linux nfs mounts
2016-10-06 12:59:23 -07:00
a4d41d0a0e
Move code for set-folders for packing VirtualBox to general
2016-10-06 15:07:13 +02:00
5877e8fe22
Sart refactor duplicate classes
2016-10-06 08:55:59 +02:00
8619267cd9
Fix getting mac address from the driver.
2016-10-06 08:29:05 +02:00
5d0de9486e
Remove some logging from the package action.
2016-10-06 08:28:52 +02:00
391c5be08e
Remove --interactive flag from Docker command
...
See: GH-7597. Due to the childprocess gem setting STDIN to a pipe,
Docker will fail as it requires STDIN to be a TTY if run with
--interactive.
2016-10-05 14:38:20 -05:00
0970a5a67b
Generate metadata.json in root of package.
2016-10-05 14:42:46 +02:00
be2e9e79aa
FIrst draft of packaging of Hyper-V boxes. Need to refactor the package_* files since right now they are copies of the virtualbox versions, might just put them in general.
2016-10-05 13:48:48 +02:00
a384276431
Merge pull request #7751 from wakeful/fix-centos7-do-not-prompt-before-overwriting
...
Fix CentOS7 network config - do not prompt before overwriting
2016-10-04 17:31:42 -07:00
e2b18fc65d
guests/linux: Update network interface sorting implementation
...
Always pull ordered ethernet devices to the head of the list. Ensure
aliases are not included.
2016-10-04 17:25:00 -07:00
133e2a7b0f
Broke Path argument in mini refactor.
2016-10-04 20:06:10 +02:00
2fc93277fd
change argument to vm_config_file so it isn't the same as variable in powershell script.
2016-10-02 18:45:51 +02:00
1ec1cf8177
Update Hyper-V import command and the driver to check for configuration type and call the correct import script.
2016-10-02 16:10:58 +02:00
b041c1955c
Add support for vmcx files, new binary format for Hyper-V configurations.
2016-10-02 16:10:16 +02:00
f72cd286c1
Merge pull request #7831 from mwrock/nano
...
Use the cmd shell to check winrm availability to fix `vagrant up --no-provision` on nano
2016-09-30 16:16:42 -07:00
2e6b23c8fd
Merge pull request #7848 from chrisroberts/fix/eth-first-predictable
...
guests/linux: Place ethernet devices at start of device list
2016-09-30 14:50:08 -07:00
0300df09fb
guests/linux: Update constant name, freeze constant values
2016-09-30 12:11:54 -07:00
6e6b35f1c5
Merge pull request #7712 from mwrock/executor
...
fix #7489 preventing winrm connection leakage
2016-09-30 09:10:42 -07:00
9f468d2626
guests/linux: Place ethernet devices at start of device list
2016-09-29 15:33:29 -07:00
c5e1a6d8c0
use the cmd shell to check winrm availability
2016-09-26 14:07:11 -07:00
2ecbc241c3
Add Virtuozzo Linux 7 to list of RHEL flavors
2016-09-23 10:45:16 +02:00
e8cf9bb168
provisioners/ansible: review pull request #7752
...
- Honour `ssh.proxy_command` setting (even when the Docker provider is
used via a proxy host). Silly configurations may lead to silly
behaviors, but let's apply the settings...
- Remove condition on `provider_config.connect_via_ssh`, which is
a provider specific parameter (from vagrant-libvirt provider).
- Add a simple unit test
2016-09-21 23:40:20 +02:00
a1d78edaf8
changes after review
2016-09-21 23:40:15 +02:00
a943f67da1
support ansible for remote servers and vm
2016-09-21 23:39:43 +02:00
8b8c961935
Fix non upstart linux nfs mounts
2016-09-20 17:57:54 -03:00
2e723ea308
added general restart for network - to prevent IP address dropping on interfaces
2016-08-23 21:02:11 +01:00
1c4e7ee068
assuming a scenario - vagrant up -> power off -> vagrant up
...
vagrant will stuck on the network configuration
DEBUG ssh: stdout: mv: overwrite '/etc/sysconfig/network-scripts/ifcfg-eth0'?
DEBUG ssh: Sending SSH keep-alive...
2016-08-23 20:58:15 +01:00
c59723e595
Merge pull request #7740 from chrisroberts/nfs/v4
...
Add NFSv4 warning and information
2016-08-19 10:19:34 -07:00
a7537a6be0
Merge pull request #7726 from chrisroberts/fix/rsync-exclude
...
Ignore files excluded from sync on chown
2016-08-19 09:58:31 -07:00
5e44e308a5
Merge pull request #7725 from chrisroberts/fix/package-machine-dir
...
Machine data directory for base box package
2016-08-19 09:48:38 -07:00
bbac718925
Add NFSv4 warning and information
2016-08-19 09:33:36 -07:00
dd6ad2fbf3
guests/linux: only use effective group ID when appropriate
2016-08-17 06:53:26 -07:00
f577ca3d23
commands/package: provide machine data directory for base box
2016-08-17 06:49:12 -07:00
185a7dfc2e
guests/rsync do not chown files excluded from sync
2016-08-16 15:13:19 -07:00
64828f1ed3
fix #7489 preventing winrm connection leakage
2016-08-13 07:49:08 -07:00
dd91269491
guests: Prevent ssh disconnect from causing error on halt
2016-08-12 13:25:39 -07:00
ce3329e184
guests/linux: Always order discovered network interfaces
2016-08-12 10:31:41 -07:00
155c78ea93
communicators/ssh: Filter command stdout output
2016-08-11 13:26:56 -07:00
9e26e31a6b
Add generated private key options to rsync command
2016-08-11 13:00:37 -07:00
ee185f4b9e
Set private_key_path and log_level within hash construction
2016-08-11 12:13:11 -07:00
7ba4f2087b
Include LogLevel option within ssh command setup
2016-08-11 12:12:45 -07:00
cb70749bd8
redux of pr 7398 for ssh-agent key fix
2016-08-11 11:48:10 -07:00
6cdab917de
guests/dragonflybsd: add detection for DragonFly BSD
2016-08-10 09:14:08 -07:00
571659a5d1
guests/openbsd: include -h option on shutdown
...
For OpenBSD versions prior to 5.7 the `-h` option _must_ be provided
to the `shutdown` command when `-p` is used. Later versions no longer
require the `-h` option but still allow it for compatibility.
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.8?rev=1.40&content-type=text/x-cvsweb-markup
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.c?rev=1.40&content-type=text/x-cvsweb-markup
2016-08-10 09:14:08 -07:00
666d5e6391
guests/bsd: remove darwin matching
2016-08-10 09:10:56 -07:00
4144b45122
Fix RDP connections on OS X
...
Changes introduced in 982af05
2016-08-09 14:04:50 -07:00
d350fd0d28
Resolve whitespace
2016-07-26 13:56:20 +01:00
344fc0ea7b
Implement auto_start_action and auto_stop_action
2016-07-26 13:41:01 +01:00
820607bbf6
Fix `authorized_keys` permissions for BSDs
...
This is an extension of a6760dd8e7#7610
2016-07-25 18:25:58 -03:00
a732b355d2
Merge pull request #7632 from mitchellh/sethvargo/ubuntu_detect
...
guests/ubuntu: Revert detection
2016-07-23 15:18:53 -04:00
00fa49191d
guests/ubuntu: Revert detection
...
- Semi-reverts GH-7524
- Fixes GH-7625
2016-07-23 15:02:11 -04:00
73cc633b02
Detect NFS server by service name on Arch
...
Fixes #7629 .
nfs-server.service seems to load kernel modules it needs itself, while nfsd appears in `/proc/filesystems` only after the kernel module has been loaded, so vagrant fails to detect NFS server until it's started first time after the system has booted. This checks if the NFS service actually exists and hopes that it'll figure the stuff out itself.
`list-unit-files` is utilized rather than `list-units` because systemd seems to not list units that are disabled: https://lists.fedoraproject.org/pipermail/devel/2011-November/159117.html
2016-07-23 13:09:23 +03:00
855643e9a5
s/bsd/linux/
2016-07-19 11:45:03 -06:00
a6760dd8e7
fixes #7610
2016-07-19 11:22:35 -06:00
571747be5e
Ensure space after last arg
2016-07-18 23:39:08 -04:00
b31b240c8c
Support installing synced folder clients on arch
2016-07-18 22:33:04 -04:00
8a5cf3b81a
Merge pull request #7012 from penguincoder/rsync-command-quoting
...
translate windows path
2016-07-18 22:05:39 -04:00
30692fc857
Merge pull request #7524 from nishidayuya/fix_ubuntu_guest_detection
...
A more reliable way to detect Ubuntu
2016-07-18 22:01:11 -04:00
7868421a21
guests/openbsd: Fix hostname setting
2016-07-18 21:13:00 -04:00
1e0d7bb652
guests/ubuntu: Use debians change_host_name functionality
2016-07-18 21:13:00 -04:00
7f1947fec2
folders/rsync: Shellescape guest paths
...
This allows users to have spaces or other special characters in
destination paths on the guest.
2016-07-18 21:13:00 -04:00
1c0d0b8b9d
guests/linux: Style update for choose_addressable_ip
2016-07-18 21:12:59 -04:00
e2becda89d
guests/gentoo: Use shared cap for listing network interfaces
2016-07-18 21:12:59 -04:00
8fe47b79c2
guests/gentoo: Exit on hostname error
2016-07-18 21:12:59 -04:00
72dcf610f7
guests/freebsd: Escape guest path in rsync folders
2016-07-18 21:12:59 -04:00
3b2ffae400
guests/bsd: Print a very descriptive error when mounting vbox folders
...
BSD-based guests do not support VirtualBox shared folders. This is a
common source of confusion in Vagrant. This new error clearly explains
that this is not a bug in Vagrant and provides instructions on how to
disable them.
2016-07-18 21:12:58 -04:00
c4a0a86ee0
guests/debian: Do not restart networking
...
Restarting networking causes Vagrant to disconnect and fail.
2016-07-18 21:12:58 -04:00
d1a071d403
guests/darwin: Shellescape guest path for rsync
2016-07-18 21:12:58 -04:00
619c7a5b26
guests/darwin: Exit on error setting hostname
2016-07-18 21:12:58 -04:00
7e88266999
guests/linux: Properly escape and retry vbox shared folder mounting
2016-07-18 21:12:57 -04:00
4aaa600bd6
guests/linux: Centralize public_key logic
2016-07-18 21:12:57 -04:00
cb2f3a697f
guests/debian: Do not check if rsync is installed before installing
...
This is already done via the rsync_installed capability.
2016-07-18 21:12:57 -04:00
76bab1932e
guests/debian: Use set -e when configuring networks
2016-07-18 21:12:57 -04:00
7a7256b3ab
guests/debian: Exit on error when configuring hostname
2016-07-18 21:12:56 -04:00
9134172ce6
guests/debian: Move NFS into same file
2016-07-18 21:12:56 -04:00
0af02fc78c
guests/atomic: Ensure error exit when setting hostname
2016-07-18 21:12:56 -04:00
ccc40eb19d
guests/arch: compute netmask
...
Arch expects /24 for netmask, but users usually specify as a netmask
block like 255.255.255.0. This automatically converts it.
2016-07-18 21:12:56 -04:00
627091de35
guests/linux: reorg
2016-07-18 21:12:55 -04:00
9ea13105c0
guests/arch: Ensure exit on configure networks fail
2016-07-18 21:12:55 -04:00
e69211ab22
guests/arch: Add NFS capabilities
2016-07-18 21:12:55 -04:00
cf9a8e3c0a
guests/arch: Ensure exit on error setting hostname
2016-07-18 21:12:55 -04:00
084d62b5a6
guests/fedora: Move as a child of redhat
...
Fedora should have been a child of redhat for awhile now...
2016-07-18 21:12:54 -04:00
336cb3319c
guests/rhel: Use FQDN for hostname
...
Refs: https://lukas.zapletalovi.com/2011/12/setting-hostname-properly-in-fedora-and.html
2016-07-18 21:12:54 -04:00
cf91bcf029
guests: Always search for FQDN without sudo
2016-07-18 21:12:54 -04:00
8f3b6511f2
guests/linux: Add shared cap for listing network interfaces
2016-07-18 21:12:54 -04:00
b621cc44fb
guests/rhel: Switch to predicable network interface names
2016-07-18 21:12:53 -04:00
4664930e06
guests/ubuntu: Use short hostname
...
Fixes GH-7488
2016-07-18 21:12:53 -04:00
caafb936f0
guests/gentoo: Use predictable network interface names
2016-07-18 21:12:53 -04:00
ea9b28f9b6
guests/freebsd: Check FQDN for hostname
2016-07-18 21:12:52 -04:00
57774601d9
guests/fedora: Fix indentation on configure hostname
2016-07-18 21:12:52 -04:00
87d2b7fec8
guests/debian: Set hostname to short value
...
Refs GH-7488
2016-07-18 21:12:52 -04:00
5a372a9942
guests/bsd: Do not use -h to shutdown
2016-07-18 21:12:52 -04:00
bbcddb6499
guests/atomic: Search for FQDN hostname
2016-07-18 21:12:51 -04:00
10b12ce393
guests/arch: Search for FQDN hostname
2016-07-18 21:12:51 -04:00
3eebff5bf3
guests/funtoo: Behave like a gentoo guest
2016-07-18 21:12:51 -04:00
b57b0e0d48
Add VirtualBox 5.1 driver
2016-07-13 15:34:25 +03:00
10775a3b4a
More robust Ansible detection for local Ansible provisioner
2016-06-30 12:58:36 +02:00
05782f1d0e
A more reliable way to detect Ubuntu
...
lsb_release command is included in lsb-release package. Sometimes this is
not installed; ex: Docker official Ubuntu image.
/etc/os-release is included in base-files package,
so this is more reliable than lsb_release.
2016-06-28 01:57:35 +09:00
49f2a0e7e9
Merge pull request #7487 from codekaizen/master
...
Fixing version check and catch statement in get_vm_status
2016-06-19 17:15:44 -04:00
bfc951ee20
Merge pull request #7492 from mitchellh/sethvargo/linux_nfs
...
guests/linux: Ensure NFS retries when mounting
2016-06-19 14:39:39 -04:00
851eff1288
guests/linux: Ensure NFS retries when mounting
...
Fixes GH-7443
2016-06-19 14:34:33 -04:00
177b7784dd
guests/darwin: Allow ipv6 static networks
2016-06-19 12:01:52 -04:00
d3859a33aa
Fixing version check and catch statement in get_vm_status
...
Use the version of Hyper-V instead of Powershell to determine which
exception is thrown by Get-VM. Also fixing an invalid catch statement,
since Powershell can not use variables to match thrown exceptions in
catch.
2016-06-18 17:13:24 -07:00
2cbc819298
Merge pull request #7484 from mitchellh/sethvargo/bsd_halt
...
guests/bsd: Centralize logic for halting guests
2016-06-18 15:12:09 -04:00
07e6d0e707
guests/bsd: Centralize logic for halting guests
2016-06-18 15:06:20 -04:00
3f27af7e95
core: Provide a way to globally disable box update checking
...
This adds a new environmental variable `VAGRANT_BOX_UPDATE_CHECK_DISABLE`,
which instructs Vagrant to not check for box updates when running
regular Vagrant commands. This behaves the same as the existing
`config.vm.box_update_check` configuration option, but can be set
globally. Vagrantfile-supplied options will take precedence.
Fixes GH-7479
2016-06-18 14:46:46 -04:00
de9abc8f72
guests/redhat: fix network configuration in CentOS 5
...
ip command is not on PATH by default in CentOS 5 so call it with the full path.
2016-06-18 14:14:25 -04:00
079acb42cd
guests/bsd: Centralize logic for public key management
2016-06-17 21:36:28 -04:00
6284a9ac50
guests/bsd: Move NFS mounting logic into shared
...
A number of the BSD guests used very old mounting options or just
ignored some parameters entirely. This fixes that.
- Closes #7474
- Fixes #7466
2016-06-17 21:04:23 -04:00
0c268f7b3f
guests/bsd: Add shared BSD guest for common behavior
2016-06-17 20:16:36 -04:00
b29864f450
Use symbols for defining guest capabilities
2016-06-17 19:55:04 -04:00
add40534de
Use strip instead of chomp
2016-06-16 15:32:11 -04:00
23b34bb6c0
Merge pull request #7456 from jonnywilliamson/patch-1
...
Append newline to each key added
2016-06-16 21:28:33 +02:00
d1be7ae84a
Better method for string concatenation
...
Never developed in Ruby before. I have only just discovered that apparently `<<` is a better method of string concatenation.
2016-06-16 11:59:11 +01:00
2720ed3d2c
Apply new line before shell to system
...
Having looked at the code again this seems like a more straightforward way of fixing the bug.
2016-06-16 11:47:47 +01:00
358ad8f18f
Use ip instead of deprecated ifconfig for Red Hat/CentOS guests
2016-06-16 10:06:58 +01:00
f7f46ba47d
Append newline to each key added
...
The change to this file 10 days ago removed a newline character at the end of each key added to it. This mean that when another key was added, it continued on the same line as the one before and thus wasn't being detected when an ssh connection came in with a key file.
With regards to https://github.com/mitchellh/vagrant/issues/7455 this is an (ugly) fix.
I'm sure someone knows a better command to concat a file and a string and append it to the `authorized_keys` file. But this does fix the problem.
2016-06-15 23:56:22 +01:00
eaa4e11c62
Add CloudLinux 7 to RHEL 7 flavors.
2016-06-12 16:51:55 +03:00
Bjorn Brala
Chris Roberts
Brian Retford
Jake Ballard
Chris Roberts
Reto Gantenbein
Gilles Cornu
Daniel Gonzalez
Mark Peek
guessi
Theron Boerner
Matt Wrock
Rutger Swarts
Dmitry Vasilets
Rudinei Goi Roecker
AJ
Zack Train
Charlie Sharpsteen
tfanning
Jose Luis Duran
Seth Vargo
Alexander Kurilo
hendrenj
Colin Shea
Indrek Ardel
Hanno Heinrichs
Yuya.Nishida
Rory Plaire
Satoshi Matsumoto
Jonathan
James Wilson
Eugene Zamriy