Commit Graph

376 Commits

Author SHA1 Message Date
Brian Pitts
1486f49707 Merge pull request #308 from facastagnini/patch-1
Improving example Vagrantfile
2015-02-23 21:11:52 -06:00
Federico Castagnini
668a9b3ead Improving example Vagrantfile
According to the [README](https://github.com/pradels/vagrant-libvirt#public-network-options) Public networks are supported.
2015-02-18 12:24:14 -05:00
Brian Pitts
8f60ed404b Merge pull request #303 from facastagnini/patch-1
Improving documentation aftert #302
2015-02-14 18:33:05 -08:00
Federico Castagnini
839d4ec049 Improving documentation aftert #302
According to @tkrille vagrant 1.7 is supported.
2015-02-13 15:49:33 -05:00
Brian Pitts
69714b3514 Merge pull request #298 from kshlm/fix-ip_command
Vagrant-libvirt fails to get IP with libvirt-1.2.11
2015-02-04 10:00:41 -06:00
Kaushal M
06515b87f3 Use just awk to parse /proc/net/arp 2015-02-04 21:05:40 +05:30
Kaushal M
d7da89db92 Use grep /proc/net/arp instead of the arp command ...
... and use awk instead of cut
2015-02-02 08:58:58 +05:30
Kaushal M
267de056bf Use a version agnostic ip_command
With libvirt-1.2.11, libvirt no longer uses lease files for dnsmasq,
which makes the existing method of fetching the ip of a vm incorrect.

This change introduces a version agnostic method to get the IP of VM
using arp cache instead.

Fixes #298
2015-01-28 11:33:15 +05:30
Brian Pitts
c865b2514b Merge pull request #296 from voxik/patch-1
Update summary and description.
2015-01-26 10:14:36 -06:00
Vít Ondruch
33295eb6f8 Update summary and description. 2015-01-26 14:44:39 +01:00
Brian Pitts
47c19cdb4f Merge pull request #295 from obnoxxx/master
Remove shebang from non-executable Rakefile.
2015-01-23 10:21:42 -06:00
Michael Adam
598173904c Remove shebang from non-executable Rakefile.
Signed-off-by: Michael Adam <obnox@samba.org>
2015-01-23 16:48:42 +01:00
Brian Pitts
317e1608e4 Merge pull request #287 from bpradipt/multi-arch-support
Add multi-arch support
2014-12-27 09:40:13 -05:00
Pradipta Kr. Banerjee
540d0a2ee5 Add multi-arch support
Currently the domain template as defined in domain.xml.erb hard-codes the arch
attribute under OS tag to x86_64. This is really not required since the
'arch' attribute is automatically populated by libvirt

<type arch='x86_64'>hvm</type>

This prevents using this plugin to manage non-x86_64 architecture like
Power(ppc64) and Arm.

This patch removes the 'arch' attribute from the domain template
2014-12-15 22:48:30 +05:30
Brian Pitts
338c486862 Merge pull request #281 from sciurus/fix/lock-pool-creation
Fixes for storage pool creation and base box uploads
2014-12-15 10:20:17 -06:00
Brian Pitts
d50ff049f8 Merge pull request #283 from tkrille/use_dhcp_assigned_default_route
support for use_dhcp_assigned_default_route
2014-12-11 18:37:20 -06:00
Thomas Krille
db7b056931 support use_dhcp_assigned_default_route
Closes #230
2014-12-11 23:03:40 +01:00
Brian Pitts
0da3b232b3 Add lock around base box upload
I'm not entirely happy with this, because we only really need a lock
when multiple VMs are using the same base box. If they are using
different boxes, we could safely upload in parallel. I did not see an
obvious way to implement that, so this will work. Parallel uploads are
likely not a performance improvement, anyway.
2014-12-07 16:30:35 -06:00
Brian Pitts
8df13baade Change libvirt method for creating storage pool
We should use define_storage pool_xml instead of create_storage_pool_xml
so that

* the pool is permanent
* pool creation succeeds if the directory does not already exist
2014-12-07 14:25:54 -06:00
Brian Pitts
47a21433a5 Add lock around storage pool creation; closes #278 2014-12-07 12:16:05 -06:00
Brian Pitts
916ec6798f Fix indendation 2014-12-07 12:15:46 -06:00
dima
5a73bc075d update version to 0.0.24 2014-12-04 11:11:59 +01:00
dima
64ff6d7b41 Merge branch 'master' of github.com:pradels/vagrant-libvirt 2014-12-04 11:11:22 +01:00
Dmitry Vasilets
8c731352a9 Merge pull request #275 from sciurus/disk-path
honour path parameter of storage directive and handle errors
2014-12-04 11:11:09 +01:00
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