vagrant-mutate 0.2.4 → 0.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/CHANGELOG.md +3 -0
  2. data/lib/vagrant-mutate/version.rb +1 -1
  3. data/templates/kvm/box.xml.erb +16 -14
  4. data/test/expected_output/libvirt/kvm/box.xml +15 -9
  5. data/test/expected_output/virtualbox/kvm/box.xml +14 -11
  6. metadata +2 -2
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ # 0.2.5 (2014-02-01)
2
+ * Fix pci id for drives in kvm (#39)
3
+
1
4
  # 0.2.4 (2014-01-23)
2
5
  * Generate new vagrantfiles instead of copying them
3
6
  * Set disk bus when converting to vagrant-libvirt (#41)
data/lib/vagrant-mutate/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module VagrantMutate
2
- VERSION = '0.2.4'
2
+ VERSION = '0.2.5'
3
3
  end
data/templates/kvm/box.xml.erb CHANGED
@@ -25,22 +25,12 @@
25
25
  <driver name='qemu' type='<%= image_type %>'/>
26
26
  <source file='<%= disk %>'/>
27
27
  <target dev='vda' bus='<%= disk_bus %>'/>
28
- <% if disk_bus == 'virtio' %>
29
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
30
- </disk>
31
- <% else %>
28
+ <% if disk_bus == 'virtio' %>
29
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
30
+ <% else %>
32
31
  <address type='drive' controller='0' bus='0' target='0' unit='0'/>
32
+ <% end %>
33
33
  </disk>
34
- <controller type='<%= disk_bus %>' index='0'>
35
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
36
- </controller>
37
- <% end %>
38
- <controller type='usb' index='0'>
39
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
40
- </controller>
41
- <controller type='virtio-serial' index='0'>
42
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
43
- </controller>
44
34
  <interface type='network'>
45
35
  <mac address='<%= mac %>'/>
46
36
  <source network='vagrant'/>
@@ -63,6 +53,18 @@
63
53
  <model type='cirrus' vram='9216' heads='1'/>
64
54
  <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
65
55
  </video>
56
+ <controller type='ide' index='0'>
57
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
58
+ </controller>
59
+ <controller type='usb' index='0'>
60
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
61
+ </controller>
62
+ <controller type='virtio-serial' index='0'>
63
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
64
+ </controller>
65
+ <controller type='sata' index='0'>
66
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
67
+ </controller>
66
68
  <memballoon model='virtio'>
67
69
  <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
68
70
  </memballoon>
data/test/expected_output/libvirt/kvm/box.xml CHANGED
@@ -23,16 +23,10 @@
23
23
  <driver name='qemu' type='qcow2'/>
24
24
  <source file='box-disk1.img'/>
25
25
  <target dev='vda' bus='virtio'/>
26
-
27
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
26
+
27
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
28
+
28
29
  </disk>
29
-
30
- <controller type='usb' index='0'>
31
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
32
- </controller>
33
- <controller type='virtio-serial' index='0'>
34
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
35
- </controller>
36
30
  <interface type='network'>
37
31
  <mac address='52:54:00:cb:b2:80'/>
38
32
  <source network='vagrant'/>
@@ -55,6 +49,18 @@
55
49
  <model type='cirrus' vram='9216' heads='1'/>
56
50
  <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
57
51
  </video>
52
+ <controller type='ide' index='0'>
53
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
54
+ </controller>
55
+ <controller type='usb' index='0'>
56
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
57
+ </controller>
58
+ <controller type='virtio-serial' index='0'>
59
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
60
+ </controller>
61
+ <controller type='sata' index='0'>
62
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
63
+ </controller>
58
64
  <memballoon model='virtio'>
59
65
  <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
60
66
  </memballoon>
data/test/expected_output/virtualbox/kvm/box.xml CHANGED
@@ -23,19 +23,10 @@
23
23
  <driver name='qemu' type='qcow2'/>
24
24
  <source file='box-disk1.img'/>
25
25
  <target dev='vda' bus='sata'/>
26
-
26
+
27
27
  <address type='drive' controller='0' bus='0' target='0' unit='0'/>
28
+
28
29
  </disk>
29
- <controller type='sata' index='0'>
30
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
31
- </controller>
32
-
33
- <controller type='usb' index='0'>
34
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
35
- </controller>
36
- <controller type='virtio-serial' index='0'>
37
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
38
- </controller>
39
30
  <interface type='network'>
40
31
  <mac address='08:00:27:55:B8:8D'/>
41
32
  <source network='vagrant'/>
@@ -58,6 +49,18 @@
58
49
  <model type='cirrus' vram='9216' heads='1'/>
59
50
  <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
60
51
  </video>
52
+ <controller type='ide' index='0'>
53
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
54
+ </controller>
55
+ <controller type='usb' index='0'>
56
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
57
+ </controller>
58
+ <controller type='virtio-serial' index='0'>
59
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
60
+ </controller>
61
+ <controller type='sata' index='0'>
62
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
63
+ </controller>
61
64
  <memballoon model='virtio'>
62
65
  <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
63
66
  </memballoon>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-mutate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-23 00:00:00.000000000 Z
12
+ date: 2014-02-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler