Commit Graph

669 Commits

Author SHA1 Message Date
dima
6bde5222c4 Merge branch 'master' of github.com:pradels/vagrant-libvirt 2015-04-11 10:26:48 +02:00
Dmitry Vasilets
5b1f8a85a6 Merge pull request #334 from d0c-s4vage/hotfix-cdrom_readme
Update the README to show the cdrom syntax
2015-04-10 22:47:56 +02:00
James Johnson
b5f267143e invalid syntax in an inline code sample 2015-04-10 15:45:55 -05:00
James Johnson
10ebbfaf71 updated the README to reflect changes in pradels/vagrant-libvirt#333 2015-04-10 15:42:35 -05:00
James Johnson
4ddeb77ad5 Pull request was merged into vagrant-libvirt
Merge branch 'feature-libvirt_cdrom'
2015-04-10 15:27:24 -05:00
dima
2c11fc41a1 Merge branch 'master' of github.com:pradels/vagrant-libvirt 2015-04-10 22:23:58 +02:00
Dmitry Vasilets
06624cad1d Merge pull request #333 from d0c-s4vage/feature-libvirt_cdrom
Support for local cdrom storage in vagrant-libvirt
2015-04-10 22:23:22 +02:00
James Johnson
ca6a8cbcf4 use matching indentation when showing CDROM info 2015-04-10 15:09:24 -05:00
James Johnson
e6a4bd4ae0 * fixed indentation (hopefully did not introduce more indentation problems)
* undid extra refactoring
* supports up to four cdroms (hda-hdd)
2015-04-10 15:02:42 -05:00
dima
56cfb971a4 remove not useful link 2015-04-10 18:31:24 +02:00
James Johnson
b31bfb7056 can now add local cdrom storage to a box 2015-04-10 10:24:38 -05:00
dima
5b102cfa34 add short description for box creation script 2015-04-09 08:24:42 +02:00
Dmitry Vasilets
86bc89ee72 Merge pull request #306 from jakobadam/master
Script to create a box out of a qcow2 file.
2015-04-09 08:22:58 +02:00
dima
13fc61b24b add veryisolated option for network. close #324 2015-04-09 08:19:31 +02:00
dima
e0e0da3827 :) 2015-04-09 08:14:08 +02:00
John Beredimas
b7a9abfc16 Allow isolated networks 2015-04-09 08:12:51 +02:00
dima
1d15017381 add information and correct example for bridge. close #330 2015-04-09 07:50:28 +02:00
dima
7f48fca699 typo 2015-04-07 10:07:45 +02:00
Dmitry Vasilets
b4a5f2c039 rescue if version of box not defined 2015-04-06 09:15:17 +02:00
Dmitry Vasilets
605498ce2e Merge pull request #294 from dennisklein/honor_box_version
honor the vagrant box version
2015-04-06 09:13:35 +02:00
dima
7a7844f773 close #291 2015-04-04 22:29:21 +02:00
dima
cacdd0503a add alternative link to box close #329 2015-04-04 22:13:33 +02:00
dima
348e66d6f3 Merge branch 'bug/multiple-disks-in-different-provider-calls'
Conflicts:
	lib/vagrant-libvirt/config.rb
2015-04-02 13:30:07 +02:00
Dmitry Vasilets
39837bbbaf Merge pull request #328 from epienbroek/master
Allow the situation where DHCP is not requested but where it is enabled on the virtual network
2015-04-02 13:20:21 +02:00
Erik van Pienbroek
ce75b9a02e Allow the situation where DHCP is not requested but where it is enabled on the virtual network 2015-04-02 13:12:05 +02:00
dima
3f52dac06d Merge branch 'master' of github.com:pradels/vagrant-libvirt 2015-04-01 09:42:59 +02:00
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