Commit Graph

352 Commits

Author SHA1 Message Date
dima
8c10fd1a21 Merge branch 'disk-path' of git://github.com/sciurus/vagrant-libvirt 2014-12-04 10:10:56 +01:00
Brian Pitts
712b9190a3 Merge pull request #276 from leoh0/master
Support open vSwitch bridge device
2014-11-19 18:23:51 -06:00
Eohyung Lee
9958e9b915 Support open vSwitch bridge device 2014-11-19 14:22:41 +09:00
Brian Pitts
a5b5e3e800 Do not chance disk path
Mutating path caused vagrant to constatnyl spew errors from #validate
while waiting for ssh to be available. Instead, create a new key.
2014-11-17 22:47:32 -06:00
Brian Pitts
f39797fa6a Check for absolute disk path in #validate 2014-11-17 22:29:29 -06:00
Brian Pitts
086f66dcb2 Merge branch 'master' into bp-disk-path 2014-11-17 21:21:06 -06:00
Brian Pitts
3a576c022e Merge pull request #273 from crocket/master
README.md : Fix `video_type` documentation.
2014-11-10 10:59:33 -06:00
crocket
ab9cd259ff README.md : Fix video_type documentation. 2014-11-09 08:58:24 +09:00
Brian Pitts
dc198fa68a Merge pull request #271 from sciurus/ssh-without-sh
Fix port forwarding ssh process cleanup
2014-11-01 19:00:52 -05:00
Brian Pitts
803719d3f6 Fix port forwarding ssh process cleanup
The presence of quotes in the command to spawn caused ruby to run it via
a shell instead of running it directly. This broke our code for
killing the ssh processes when the VM is halted.

Closes #265
2014-11-01 18:54:37 -05:00
Brian Pitts
9e0f0de35e Merge pull request #264 from aspiers/ssh-forward-logging
fix redirection of STDOUT/ERR of ssh port forwarding process (#226)
2014-11-01 18:19:58 -05:00
Brian Pitts
678b770924 Merge pull request #270 from sciurus/additional_disks_bus
Additional disks bus
2014-11-01 17:46:50 -05:00
Brian Pitts
42b9a6364e Merge remote-tracking branch 'upstream/master' into additional_disks_bus
Conflicts:
	README.md
	lib/vagrant-libvirt/config.rb
2014-11-01 17:41:52 -05:00
Brian Pitts
5be5faf294 Merge pull request #263 from aspiers/extra-storage-cache-mode
allow cache mode to be set for additional disks
2014-11-01 17:24:16 -05:00
Brian Pitts
ee28f709a3 Merge pull request #262 from aspiers/allow-newer-ruby-libvirt
allow newer ruby-libvirt (#158)
2014-11-01 16:13:49 -05:00
Brian Pitts
045b843333 Merge pull request #261 from aspiers/remove-default-provider
don't monkey-patch #default_provider
2014-11-01 12:55:15 -05:00
Adam Spiers
8f6e2326c8 honour path parameter of storage directive
Fix use of the `:path` parameter to the `storage` directive:

    config.vm.provider :libvirt do |libvirt|
      libvirt.storage :file, :path => 'my-disk.qcow2'
    end

The value of the `:path` parameter was being correctly used in
`domain.xml.erb` for defining the VM, but it was not passed to libvirt
via fog's volume creation mechanism:

    lib/fog/libvirt/models/compute/templates/volume.xml.erb

Instead, libvirt determines the backing file from the `<name>` element,
so we ensure that the `:name` parameter contains the correct filename.
2014-11-01 17:52:46 +00:00
Vil Surkin
6659f4c687 added ability to specify bus for additional disks 2014-10-28 21:31:06 +02:00
Adam Spiers
1f9c7a70ce fix redirection of STDOUT/ERR of ssh port forwarding process (#226)
The existing invocation fails to spawn correctly, and even if that
were the case, redirecting STDOUT/STDERR to /dev/null risks losing
valuable debug, as seen in #225.

Closes #226.

https://github.com/pradels/vagrant-libvirt/issues/226
2014-10-27 10:44:18 +00:00
Adam Spiers
7b38af568c allow cache mode to be set for additional disks 2014-10-26 23:57:11 +00:00
Adam Spiers
773a4f48d6 allow newer ruby-libvirt (#158)
As per #158, vagrant-libvirt depends on ruby-libvirt transitively
through fog.  Since fog/fog#2706 was resolved, fog now requires
ruby-libvirt ~> 0.5.0, therefore vagrant-libvirt should allow both 0.4.x
and 0.5.x.  Furthermore, according to semantic versioning, we currently
have no good reason to reject anything newer below 1.x.  If such a
restriction is required in the future (e.g. < 0.7.0) then it is likely
that fog's .gemspec will take care of that on our behalf anyway.

Closes #158.
2014-10-26 23:22:10 +00:00
Adam Spiers
e693b017dd don't monkey-patch #default_provider
This monkey-patching of Vagrant::Environment#default_provider breaks
with Vagrant 1.7.0, since the method's signature changed.  In any case
Vagrant should do the right thing without "help" from vagrant-libvirt.
2014-10-25 14:36:46 +01:00
Brian Pitts
e410100baa Merge pull request #254 from aspiers/loosen-deps
make gem dependencies reasonably optimistic again (fixes #253)
2014-10-15 21:56:09 -05:00
Brian Pitts
ec9f592d6a Merge pull request #255 from aspiers/remove-debug
remove pry debug
2014-10-15 21:54:52 -05:00
Adam Spiers
78d033d6c7 remove pry debug 2014-10-16 01:59:46 +01:00
Adam Spiers
138bea1077 make gem dependencies reasonably optimistic again (fixes #253)
This reverts the vagrant-libvirt.gemspec changes in commit
19cd8be193.
2014-10-16 01:42:29 +01:00
Dmitry Vasilets
4a34a308df Merge pull request #248 from tboerger/feature/log-instead-puts
Replaced a puts with logger
2014-10-08 09:51:29 +02:00
Thomas Boerger
e2fe68768f Replaced a puts with logger 2014-10-08 09:43:21 +02:00
dima
7ec27dd121 0.0.23 2014-10-07 14:40:28 +02:00
Dmitry Vasilets
913ccda838 Merge pull request #243 from dennisklein/management_network_mode_typo
condition for setting default value was wrong
2014-10-01 16:58:20 +02:00
Dennis Klein
0dcef5c312 condition for setting default value was wrong
This caused an error:
Error occured while creating new network: Call to virNetworkDefineXML failed: (network_definition):5: Unescaped '<' not allowed in attributes values
  <forward mode="#<Object:0x000000020bb1a0>" />
2014-09-30 20:15:41 +02:00
dima
94a2c675f7 add graphics password 2014-09-29 08:31:23 +02:00
dima
fea98293c2 0.0.22 2014-09-28 22:58:59 +02:00
Dmitry Vasilets
6fb2e6f661 Merge pull request #242 from sciurus/no_username
No username
2014-09-28 21:59:21 +02:00
Brian Pitts
62dc614099 Refer users to vagrant's docs for ssh settings 2014-09-28 14:51:33 -05:00
Brian Pitts
e693e82ed2 Provider does not need to set username
If the user sets this themselves, vagrant will pick it up. If the user
does not set it, vagrant will set a default. All this works without any
code on our end.
2014-09-28 14:49:37 -05:00
Dmitry Vasilets
4a0cd19ec5 Merge pull request #241 from sciurus/nokogiri-version
Accept any version of Nokogiri 1.6
2014-09-28 18:18:06 +02:00
Brian Pitts
ea2c3ea8bf Accept any version of Nokogiri 1.6 2014-09-28 10:48:28 -05:00
Dmitry Vasilets
bb383e7921 Merge pull request #239 from theonewolf/custom-vnc-ports
templatized handling of graphics and video libvirt XML
2014-09-28 17:07:04 +02:00
Wolfgang Richter
3835c93b0d README.md: oops, we default to the normal port 5900 not 5901 2014-09-28 11:04:46 -04:00
Wolfgang Richter
17d9850684 automatically set autoport to properly support legacy behavior 2014-09-28 11:00:39 -04:00
Wolfgang Richter
9a95f8a7d0 README.md: adding documentation for customizing graphics/display 2014-09-28 10:29:04 -04:00
Dmitry Vasilets
44951a1f17 Merge pull request #217 from sstrato/add_management_network_mode
add management network mode selection
2014-09-28 16:19:57 +02:00
dima
f8c69ea4f9 typo 2014-09-28 16:17:35 +02:00
dima
a5f5eaace5 Merge branch 'master' of github.com:pradels/vagrant-libvirt 2014-09-28 16:16:54 +02:00
Dmitry Vasilets
bec37b78fa Merge pull request #220 from jordant/master
Do not include features/model when cpu_mode = host-passthrough
2014-09-28 16:16:43 +02:00
Wolfgang Richter
a926607615 templatized handling of graphics and video libvirt XML 2014-09-28 02:36:24 -04:00
Dmitry Vasilets
a6faf0a384 Merge pull request #237 from smerrill/patch-1
Add provisioner shared folders after first boot.
2014-09-24 14:39:16 +02:00
Steven Merrill
58fe35051a Add provisioner shared folders after first boot.
Without this change, the shared folders for provisioners like Puppet will not be created on the second and subsequent boots.
2014-09-24 08:36:03 -04:00
dima
19cd8be193 version 0.0.21 2014-09-17 10:57:34 +02:00