vagrant-kvm 0.1.7 → 0.1.8

data/spec/vagrant-kvm/util/vm_definition_spec.rb

@@ -20,7 +20,10 @@ describe VagrantPlugins::ProviderKvm::Util::VmDefinition do
           vnc_autoport: false,
           vnc_password: 'abc123'
 
-        subject.should include("<graphics type='vnc' port='1234' autoport='false'")
+        subject.should include("<graphics")
+        subject.should include("type='vnc'")
+        subject.should include("port='1234'")
+        subject.should include("autoport='false'")
 
         new_definition = VagrantPlugins::ProviderKvm::Util::VmDefinition.new(subject)
         new_definition.get(:gui).should be_true
@@ -45,13 +48,6 @@ describe VagrantPlugins::ProviderKvm::Util::VmDefinition do
         should_set(:network_model, "ne2k_pci")
       end
 
-      it "doesn't set the network driver if network_mode=:default" do
-        should_set(:network_model, :default) do |xml|
-          doc = REXML::Document.new(xml)
-          doc.elements["//devices/interface/model"].should be_nil
-        end
-      end
-
       it "sets the video type" do
         should_default(:video_model, "cirrus")
         should_set(:video_model, "vga")

data/templates/libvirt_domain.erb

@@ -3,6 +3,13 @@
   <% if uuid %>
   <uuid><%= uuid %></uuid>
   <% end %>
+  <% if secmodel == 'selinux' %>
+  <seclabel type='dynamic' model='selinux'/>
+  <% elsif secmodel == 'apparmor' %>
+  <seclabel type='dynamic' model='apparmor'/>
+  <% elsif secmodel == 'dac' %>
+  <seclabel type='dynamic' model='dac'/>
+  <% end %>
   <memory unit='<%= memory_unit %>'><%= memory_size %></memory>
   <currentMemory unit='<%= memory_unit %>'><%= memory_size %></currentMemory>
   <vcpu placement='static'><%= cpus %></vcpu>
@@ -52,10 +59,9 @@
     </controller>
     <interface type='network'>
       <mac address='<%= mac %>'/>
-      <source network='vagrant'/>
-      <% unless network_model == :default %>
+      <source network='<%= network %>'/>
       <model type='<%= network_model %>'/>
-      <% end %>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' />
     </interface>
     <serial type='pty'>
       <target port='0'/>
@@ -65,9 +71,11 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='tablet' bus='usb'/>
+    <% if sound %>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <% end %>
     <% if gui %>
     <graphics type='vnc' port='<%= vnc_port || -1 %>' autoport='<%= vnc_autoport %>' listen='0.0.0.0' passwd='<%= vnc_password %>'>
       <listen type='address' address='0.0.0.0'/>
@@ -80,5 +88,23 @@
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>
+   <% if p9 %>
+     <% p9.each_with_index do |p, index| %>
+     <%- # slot should be in 1..31 -%>
+     <% break if index > 30 %>
+     <filesystem type='mount' accessmode='<%= p[:accessmode] %>'>
+       <source dir='<%= p[:hostpath] %>'/>
+       <target dir='<%= p[:mount_tag] %>'/>
+       <%- # WARN: bus 0x01 is reserved in vm_definition.rb:inject_nics() -%>
+       <address type='pci' domain='0x0000' bus='0x02' slot='<%= "0x%02x"%(1 + index) %>' function='0x0' />
+     </filesystem>
+     <% end %>
+   <% end %>
+   <% if virtio_rng %>
+    <rng model='virtio'>
+      <rate period="2000" bytes="1234"/>
+      <backend model='random'>/dev/random</backend>
+    </rng>
+   <% end %>
   </devices>
 </domain>

data/vagrant-kvm.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Alex Drahon", "Hiroshi Miura"]
   s.email         = "adrahon@gmail.com"
-  s.homepage      = "http://www.vagrantup.com"
+  s.homepage      = "https://github.com/adrahon/vagrant-kvm"
   s.summary       = "Enables Vagrant to use KVM instead of VirtualBox."
-  s.description   = "Enables Vagrant to use KVM instead of VirtualBox."
+  s.description   = "A Vagrant 1.4+ plugin that adds a KVM provider to Vagrant, allowing Vagrant to control and provision KVM/QEMU VM."
   s.license       = 'MIT'
 
   s.required_rubygems_version = ">= 1.3.6"
   s.requirements << 'KVM/QEMU, v1.1.0 or greater'
 
-  s.add_runtime_dependency "ruby-libvirt", "~> 0.4.0"
+  s.add_runtime_dependency "ruby-libvirt", "~> 0.5", ">= 0.5.2"
 
   s.add_development_dependency "pry"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-kvm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Alex Drahon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -95,9 +101,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
-description: Enables Vagrant to use KVM instead of VirtualBox.
+description: A Vagrant 1.4+ plugin that adds a KVM provider to Vagrant, allowing Vagrant
+  to control and provision KVM/QEMU VM.
 email: adrahon@gmail.com
-executables: []
+executables:
+- package.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -121,12 +129,14 @@ files:
 - templates/libvirt_network.erb
 - templates/package_Vagrantfile.erb
 - templates/libvirt_domain.erb
+- bin/package.sh
 - example_box/metadata.json
 - example_box/box.xml
 - example_box/README.md
 - CHANGELOG.md
 - locales/en.yml
 - locales/ja.yml
+- lib/vagrant-kvm/cap/mount_p9.rb
 - lib/vagrant-kvm/version.rb
 - lib/vagrant-kvm/util/disk_info.rb
 - lib/vagrant-kvm/util/commands.rb
@@ -137,7 +147,6 @@ files:
 - lib/vagrant-kvm/plugin.rb
 - lib/vagrant-kvm/action.rb
 - lib/vagrant-kvm/action/resume_network.rb
-- lib/vagrant-kvm/action/prepare_gui.rb
 - lib/vagrant-kvm/action/package.rb
 - lib/vagrant-kvm/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-kvm/action/match_mac_address.rb
@@ -153,7 +162,6 @@ files:
 - lib/vagrant-kvm/action/init_storage_pool.rb
 - lib/vagrant-kvm/action/message_not_running.rb
 - lib/vagrant-kvm/action/is_paused.rb
-- lib/vagrant-kvm/action/prune_nfs_exports.rb
 - lib/vagrant-kvm/action/created.rb
 - lib/vagrant-kvm/action/network.rb
 - lib/vagrant-kvm/action/setup_package_files.rb
@@ -165,25 +173,29 @@ files:
 - lib/vagrant-kvm/action/export.rb
 - lib/vagrant-kvm/action/destroy_confirm.rb
 - lib/vagrant-kvm/action/forward_ports.rb
+- lib/vagrant-kvm/action/prepare_kvmconfig.rb
 - lib/vagrant-kvm/action/check_running.rb
 - lib/vagrant-kvm/action/check_kvm.rb
 - lib/vagrant-kvm/action/is_saved.rb
 - lib/vagrant-kvm/action/is_running.rb
 - lib/vagrant-kvm/action/message_not_created.rb
 - lib/vagrant-kvm/action/boot.rb
+- lib/vagrant-kvm/action/customize.rb
 - lib/vagrant-kvm/config.rb
 - lib/vagrant-kvm/util.rb
 - lib/vagrant-kvm/provider.rb
+- lib/vagrant-kvm/synced_folder.rb
 - lib/vagrant-kvm/errors.rb
 - lib/vagrant-kvm/driver/driver.rb
 - lib/vagrant-kvm.rb
 - LICENSE
 - Rakefile
 - README.md
+- install.rb
 - .travis.yml
 - .rspec
 - .gitignore
-homepage: http://www.vagrantup.com
+homepage: https://github.com/adrahon/vagrant-kvm
 licenses:
 - MIT
 metadata: {}

data/lib/vagrant-kvm/action/prune_nfs_exports.rb

@@ -1,20 +0,0 @@
-module VagrantPlugins
-  module ProviderKvm
-    module Action
-      class PruneNFSExports
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:host]
-            uuid = env[:machine].provider.driver.uuid
-            env[:host].nfs_prune(uuid)
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end