Commit Graph

693 Commits

Author SHA1 Message Date
dima
e45e31fc12 check image file close #320 2015-04-01 09:42:43 +02:00
Dmitry Vasilets
47950170bb Merge pull request #319 from ldx/os-type-attrs
Add 'machine_type' parameter.
2015-03-26 08:15:26 +01:00
dima
c881f98079 support keymap settings close #326 2015-03-26 08:07:27 +01:00
Vilmos Nebehaj
94fb320cc3 Add machine domain option to README.md. 2015-03-21 19:32:01 +01:00
sathlan
ea5d474e0d Multiple disks in different provider call fails.
This

```ruby
Vagrant.configure("2") do |c|
  c.vm.box = "centos-7.0"
  c.vm.hostname = "default-centos-70.vagrantup.com"
  c.vm.provider :libvirt do |p|
    p.storage :file, :size => "5M", :path => "vagrant_vdb.qcow2", :device => "vdb"
    p.storage :file, :size => "5M", :path => "vagrant_vdc.qcow2", :device => "vdc"
  end
end
```

works.

But this fails:

```ruby
def add_block_device(node, port, size)
  node.vm.provider 'libvirt' do |lv|
    port_name = ('b'..'z').to_a[port-1]
    lv.storage :file, :size => "#{size}M", :path => "vagrant_#{node.vm.hostname}_vd#{port_name}.qcow2", :device => "vd#{port_name}"
  end
end

Vagrant.configure("2") do |c|
  c.vm.box = "centos-7.0"
  c.vm.hostname = "default-centos-70.vagrantup.com"
  add_block_device(c, 1, 5)
  add_block_device(c, 2, 5)
end
```

In the second case only the last disk is added:

```
==> default:  -- Disks:         vdc(qcow2,5M)
==> default:  -- Disk(vdc):     /var/lib/libvirt/images/vagrant_default-centos-70.vagrantup.com_vdc.qcow2
```

This patch corrects this.  It is done as the `customize` configuration
is the vagrant code.
2015-03-20 19:50:10 -04:00
Jakob Aarøe Dam
e7c7d70c3a Check for write permission to image before boxing. 2015-03-17 10:27:04 +01:00
Brian Pitts
ac3582ae53 Update version to 0.0.25 2015-03-03 21:44:42 -06:00
Vilmos Nebehaj
b51b563c46 Add 'machine_type' parameter.
This parameter will be used by libvirt to set the machine type qemu will
use.  For example, setting it to `pc-1.0` will generate this `os`
definition:

    <os>
      <type arch='x86_64' machine='pc-1.0'>hvm</type>
    </os>
2015-03-02 17:44:01 +01:00
Jakob Aarøe Dam
88991f0c1c Support spaces in paths, by quoting all variables. 2015-02-26 09:46:04 +01:00
Brian Pitts
52e79ca4d1 Merge pull request #314 from facastagnini/patch-3
Sanitize memory and cpu parameters
2015-02-25 21:02:37 -06:00
Brian Pitts
b2b72b1365 Merge pull request #309 from facastagnini/patch-2
Update README: Only TCP port forwarding supported
2015-02-23 21:12:24 -06:00
Brian Pitts
1486f49707 Merge pull request #308 from facastagnini/patch-1
Improving example Vagrantfile
2015-02-23 21:11:52 -06:00
Federico Castagnini
34095882db Sanitize memory and cpu (Fix #313) 2015-02-23 12:36:11 -05:00
Jakob Aarøe Dam
d84efc301a Print proper paths to user when using a absolute BOX path. 2015-02-19 10:24:42 +01:00
Federico Castagnini
34a8fe1d15 Only TCP port forwarding supported
Documenting the inability to forward protocols other than TCP. 
See  #260
2015-02-18 12:40:03 -05: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
Jakob Aarøe Dam
a1c3ffafb8 Script to create a box out of a qcow2 file. 2015-02-18 11:22:43 +01: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
Dennis Klein
d0ea35fc88 honor the vagrant box version
As discussed in #85 vagrant-libvirt's image management could
be better. This is only addressing a small aspect of the topic,
but due to its simplicity it could improve vagrant-libvirt in the
meantime until #85 is fully resolved.
2015-01-16 20:15:00 +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