Commit Graph

436 Commits

Author SHA1 Message Date
Josef Stribny
749b431bc8 Depend on new extracted fog-libvirt gem
And depend on ruby-libvirt library through fog-libvirt.
2015-04-17 14:56:31 +02:00
Dmitry Vasilets
bc491d8818 Merge pull request #341 from matt8754/dhcp_bootp
support dhcp bootp settings
2015-04-17 09:17:16 +02:00
Matt Jia
80f8c6b65c support dhcp bootp settings 2015-04-17 16:59:16 +10:00
dima
5c9a712d42 fix detroying order 2015-04-17 08:24:25 +02:00
dima
5ee914a2ef shared volumes creation 2015-04-16 09:27:11 +02:00
dima
a941ddc962 remove volumes logic for shared volumes 2015-04-16 09:12:19 +02:00
dima
17616c2836 Merge branch 'preexisting-disks' of github.com:aspiers/vagrant-libvirt
Conflicts:
	lib/vagrant-libvirt/action/create_domain.rb
2015-04-16 08:16:46 +02:00
dima
d154582c5d 0.0.26 2015-04-15 21:58:12 +02:00
dima
807005afc3 more strict patern for full path 2015-04-15 21:48:29 +02:00
Dmitry Vasilets
ad29a9c788 Merge pull request #337 from jcsalem/ssh_key_path_fix
Fixes for id_ssh_key_file
2015-04-15 21:46:07 +02:00
Jim Salem
e8d1b94ad9 Improve doc for id_ssh_key_file. Do not prepend ~/.ssh/ if the pathname includes a directory 2015-04-15 14:26:21 -04:00
Dmitry Vasilets
f9b799f64b Merge pull request #336 from d0c-s4vage/feature-nic_mac_addresses
implemented nic_mac_addresses capability
2015-04-15 18:28:48 +02:00
dima
0e2c26a33f cleaning,tests preparation 2015-04-15 09:45:29 +02:00
Dmitry Vasilets
c80841943c typo 2015-04-14 22:23:44 +02:00
dima
fa261e79b2 improve format 2015-04-13 17:30:01 +02:00
James Johnson
57c860e884 fixed whitespace nonconformity 2015-04-13 04:18:59 -05:00
James Johnson
c4c8c8afc7 implemented nic_mac_addresses capability 2015-04-13 04:13:12 -05:00
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