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

9455 Commits

Author SHA1 Message Date
Chris Roberts e54bcbb769 Update CHANGELOG 2016-10-11 12:59:20 -07:00
Chris Roberts 1f988b53ce Merge pull request #7889 from chrisroberts/fix/einval-bundler 
core: Rescue EINVAL exceptions when loading bundler
 2016-10-11 12:58:15 -07:00
Chris Roberts cc06644cd0 Update CHANGELOG 2016-10-11 12:57:13 -07:00
Chris Roberts b9ea9a2ac2 Merge pull request #7887 from chrisroberts/guests/linux-detection 
Guests/linux detection
 2016-10-11 12:55:52 -07:00
Chris Roberts 3e46e8bcb7 core: Rescue EINVAL exceptions when loading bundler 2016-10-11 10:47:08 -07:00
Chris Roberts 2c9c458e42 Update CHANGELOG 2016-10-11 10:36:26 -07:00
Chris Roberts 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
Chris Roberts 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
Reto Gantenbein 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
Gilles Cornu 29b033390f
Update CHANGELOG 
[ci skip]
 2016-10-10 23:39:18 +02:00
Gilles Cornu 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
Gilles Cornu 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
Gilles Cornu 26e8bdc1f1
Merge pull request #7536 2016-10-10 23:03:00 +02:00
Chris Roberts c867a01ebb Update CHANGELOG 2016-10-10 11:02:23 -07:00
Chris Roberts 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
Chris Roberts 7784d3dab8 Update CHANGELOG 2016-10-10 10:58:57 -07:00
Chris Roberts 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
Chris Roberts 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
Daniel Gonzalez 79a3cb8a14 Add unit test and documentation for playbook_command option 2016-10-10 16:56:36 +02:00
Bjorn Brala 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
Daniel Gonzalez 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
Bjorn Brala 8744caebcf Small typo in options 2016-10-09 20:39:17 +02:00
Igor Vuk c12101b2f8 Fix a typo in configuration.html.md 2016-10-08 18:37:43 +02:00
Bjorn Brala 7b03bf335b Whitespace 2016-10-08 16:44:24 +02:00
Bjorn Brala 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
Chris Roberts d178631ff9 Generic white space strip from command strings 2016-10-07 17:30:27 -07:00
Chris Roberts c6a32042c8 Update CHANGELOG 2016-10-07 17:16:33 -07:00
Chris Roberts 28f2ed56cf Merge pull request #7756 from alexoj/master 
Fix Vagrant not prioritizing configured providers correctly
 2016-10-07 17:14:54 -07:00
Chris Roberts 71b078b79f Update CHANGELOG 2016-10-07 16:51:05 -07:00
Chris Roberts 703513bd0f Revert "Fix incorrect ssh-config output when '--host' is defined" 
This reverts commit c77326438b.
 2016-10-07 16:50:12 -07:00
Chris Roberts 037de8bd6b Update CHANGELOG 2016-10-07 15:20:45 -07:00
Chris Roberts 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
Chris Roberts 3c0162b239 Update CHANGELOG 2016-10-07 15:17:08 -07:00
Chris Roberts 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
Mark Peek 4bf32e3f6d Fix typo (netmast => netmask) for Photon guest #7808 2016-10-07 12:32:21 -07:00
Bjorn Brala 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
guessi 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
Björn Brala 6ed612e93b Move package_setup_files to general lib to minimize code duplication 2016-10-07 17:31:15 +02:00
Chris Roberts 8dd44a02da Merge pull request #7679 from jeveleth/patch-1 
Use comma to set off nonrestrictive clause.
 2016-10-06 16:27:07 -07:00
Chris Roberts 4ddc9b0804 Merge pull request #7674 from voxik/fix-permissions 
Remove executable permissions.
 2016-10-06 16:25:53 -07:00
Chris Roberts 26b3a303d2 config/vm: cast box version to string before string operations 2016-10-06 16:16:59 -07:00
Chris Roberts 7db6379d44 Update CHANGELOG 2016-10-06 15:43:57 -07:00
Chris Roberts 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
Chris Roberts 9b8c8dad8c Update CHANGELOG 2016-10-06 13:01:34 -07:00
Chris Roberts 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
Björn Brala a4d41d0a0e Move code for set-folders for packing VirtualBox to general 2016-10-06 15:07:13 +02:00
Bjorn Brala 5877e8fe22 Sart refactor duplicate classes 2016-10-06 08:55:59 +02:00
Bjorn Brala 8619267cd9 Fix getting mac address from the driver. 2016-10-06 08:29:05 +02:00
Bjorn Brala 5d0de9486e Remove some logging from the package action. 2016-10-06 08:28:52 +02:00
Theron Boerner 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