vagrant-libvirt 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.7
+
+* Fixed namespace collision with ruby-libvirt library which used by
+  vagrant-kvm provider.(by Hiroshi Miura)
+
 # 0.0.6 (Jul 24, 2013)
 
 * Synced folder via NFS support.

data/README.md

@@ -103,6 +103,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
 * `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false.
+* `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks).
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -116,6 +117,7 @@ Vagrant.configure("2") do |config|
       domain.memory = 2048
       domain.cpus = 2
       domain.nested = true
+	  domain.volume_cache = 'none'
     end
   end
 
@@ -152,14 +154,25 @@ Vagrant goes through steps below when creating new project:
 ## Networks
 
 Networking features in the form of `config.vm.network` support private networks
-concept. No public network or port forwarding are supported in current version
-of provider.
+concept. Port Forwarding is currently not supported.
+
+Public Network interfaces are currently implemented using the macvtap driver. The macvtap
+driver is only available with the Linux Kernel version >= 2.6.24. See the following libvirt
+documentation for the details of the macvtap usage.
+
+http://www.libvirt.org/formatdomain.html#elementsNICSDirect
 
 An examples of network interface definitions:
 
 ```ruby
+  # Private network
   config.vm.define :test_vm1 do |test_vm1|
-    test_vm1.vm.network :private_network, :ip => "10.20.30.40",
+    test_vm1.vm.network :private_network, :ip => "10.20.30.40"
+  end
+
+  # Public Network
+  config.vm.define :test_vm1 do |test_vm1|
+    test_vm1.vm.network :public_network, :dev => "eth0", :mode => 'bridge'
   end
 ```
 
@@ -174,8 +187,16 @@ created networks are NATed to outside world, so your VM will be able to connect
 to the internet (if hypervisor can). And by default, DHCP is offering addresses
 on newly created networks.
 
+The second interface is created and bridged into the physical device 'eth0'.
+This mechanism uses the macvtap Kernel driver and therefore does not require
+an existing bridge device. This configuration assumes that DHCP and DNS services
+are being provided by the public network. This public interface should be reachable
+by anyone with access to the public network.
+
 ### Private Network Options
 
+*Note: These options are not applicable to public network interfaces.*
+
 There is a way to pass specific options for libvirt provider when using
 `config.vm.network` to configure new network interface. Each parameter name
 starts with 'libvirt__' string. Here is a list of those options:
@@ -196,6 +217,14 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:libvirt__forward_device` - Name of interface/device, where network should
   be forwarded (NATed or routed). Used only when creating new network. By
   default, all physical interfaces are used.
+* `:mac` - MAC address for the interface.
+
+### Public Network Options
+* `:dev` - Physical device that the public interface should use. Default is 'eth0'
+* `:mode` - The mode in which the public interface should operate in. Supported
+  modes are available from the [libvirt documentation](http://www.libvirt.org/formatdomain.html#elementsNICSDirect).
+  Default mode is 'bridge'.
+* `:mac` - MAC address for the interface.
 
 ## Obtaining Domain IP Address
 

data/lib/vagrant-libvirt.rb

@@ -2,7 +2,7 @@ require 'pathname'
 require 'vagrant-libvirt/plugin'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     lib_path = Pathname.new(File.expand_path("../vagrant-libvirt", __FILE__))
     autoload :Action, lib_path.join("action")
     autoload :Errors, lib_path.join("errors")

data/lib/vagrant-libvirt/action.rb

@@ -1,7 +1,7 @@
 require 'vagrant/action/builder'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Include the built-in modules so we can use them as top-level things.
       include Vagrant::Action::Builtin

data/lib/vagrant-libvirt/action/connect_libvirt.rb

@@ -2,11 +2,11 @@ require 'fog'
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class ConnectLibvirt
         def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::connect_libvirt")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::connect_libvirt')
           @app = app
         end
 
@@ -14,8 +14,8 @@ module VagrantPlugins
 
           # If already connected to libvirt, just use it and don't connect
           # again.
-          if Libvirt.libvirt_connection
-            env[:libvirt_compute] = Libvirt.libvirt_connection
+          if ProviderLibvirt.libvirt_connection
+            env[:libvirt_compute] = ProviderLibvirt.libvirt_connection
             return @app.call(env)
           end
 
@@ -39,7 +39,11 @@ module VagrantPlugins
             uri << '://'
             uri << config.host if config.host
           end
+
           uri << '/system?no_verify=1'
+          # set ssh key for access to libvirt host
+          home_dir = `echo ${HOME}`.chomp
+          uri << "&keyfile=#{home_dir}/.ssh/id_rsa"
 
           conn_attr = {}
           conn_attr[:provider] = 'libvirt'
@@ -64,7 +68,7 @@ module VagrantPlugins
             raise Errors::FogLibvirtConnectionError,
               :error_message => e.message
           end
-          Libvirt.libvirt_connection = env[:libvirt_compute]
+          ProviderLibvirt.libvirt_connection = env[:libvirt_compute]
 
           @app.call(env)
         end

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -1,11 +1,11 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       class CreateDomain
-        include VagrantPlugins::Libvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::create_domain")
@@ -21,6 +21,7 @@ module VagrantPlugins
           @cpus = config.cpus
           @nested = config.nested
           @memory_size = config.memory*1024
+          @domain_volume_cache = config.volume_cache
 
           # TODO get type from driver config option
           @domain_type = 'kvm'
@@ -28,7 +29,7 @@ module VagrantPlugins
           @os_type = 'hvm'
 
           # Get path to domain image.
-          domain_volume = Libvirt::Util::Collection.find_matching(
+          domain_volume = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].volumes.all, "#{@name}.img")
           raise Errors::DomainVolumeExists if domain_volume == nil
           @domain_volume_path = domain_volume.path
@@ -42,6 +43,7 @@ module VagrantPlugins
           env[:ui].info(" -- Base box:      #{env[:machine].box.name}")
           env[:ui].info(" -- Storage pool:  #{env[:machine].provider_config.storage_pool_name}")
           env[:ui].info(" -- Image:         #{@domain_volume_path}")
+          env[:ui].info(" -- Volume Cache:  #{@domain_volume_cache}")
 
           # Create libvirt domain.
           # Is there a way to tell fog to create new domain with already

data/lib/vagrant-libvirt/action/create_domain_volume.rb

@@ -1,14 +1,14 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       # Create a snapshot of base box image. This new snapshot is just new
       # cow image with backing storage pointing to base box image. Use this
       # image as new domain volume.
       class CreateDomainVolume
-        include VagrantPlugins::Libvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::create_domain_volume")
@@ -25,12 +25,12 @@ module VagrantPlugins
           @name = "#{env[:domain_name]}.img"
 
           # Verify the volume doesn't exist already.
-          domain_volume = Libvirt::Util::Collection.find_matching(
+          domain_volume = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].volumes.all, @name)
           raise Errors::DomainVolumeExists if domain_volume
 
           # Get path to backing image - box volume.
-          box_volume = Libvirt::Util::Collection.find_matching(
+          box_volume = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].volumes.all, env[:box_volume_name])
           @backing_file = box_volume.path
 

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -3,14 +3,14 @@ require 'vagrant/util/network_ip'
 require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       # Create network interfaces for domain, before domain is running.
       # Networks for connecting those interfaces should be already prepared.
       class CreateNetworkInterfaces
-        include VagrantPlugins::Libvirt::Util::ErbTemplate
-        include VagrantPlugins::Libvirt::Util::LibvirtUtil
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
 
@@ -32,28 +32,16 @@ module VagrantPlugins
           # Setup list of interfaces before creating them.
           adapters = []
 
-          # Assign main interface for provisioning to first slot.
-          # Use network 'default' as network for ssh connecting and
-          # machine provisioning.
-          #
-          # TODO Network name with DHCP for first interface should be
-          # configurable.
-          adapters[0] = {
-            :network_name => 'default'
-          }
+          # Vagrant gives you adapter 0 by default
 
           # Assign interfaces to slots.
           env[:machine].config.vm.networks.each do |type, options|
-            # Only private network is supported now. Port forwarding and public
-            # network are not supported via libvirt API, so they are not
-            # implemented in this provider.
-            next if type != :private_network
 
             # Get options for this interface. Options can be specified in
             # Vagrantfile in short format (:ip => ...), or provider format
             # (:libvirt__network_name => ...).
             options = scoped_hash_override(options, :libvirt)
-            options = { :netmask => '255.255.255.0' }.merge(options)
+            options = { :netmask => '255.255.255.0', :iface_type => type }.merge(options)
 
             # TODO fill first ifaces with adapter option specified.
             if options[:adapter]
@@ -63,7 +51,7 @@ module VagrantPlugins
 
               free_slot = options[:adapter].to_i
             else
-              free_slot = find_empty(adapters, start=1)
+              free_slot = find_empty(adapters)
               raise Errors::InterfaceSlotNotAvailable if free_slot == nil
             end
 
@@ -77,13 +65,26 @@ module VagrantPlugins
           adapters.each_with_index do |iface_configuration, slot_number|
             @iface_number = slot_number
             @network_name = iface_configuration[:network_name]
+            @mac = iface_configuration.fetch(:mac, false)
+            template_name = 'interface'
+
+            # Configuration for public interfaces which use the macvtap driver
+            if iface_configuration[:iface_type] == :public_network
+              template_name = 'public_interface'
+              @device = iface_configuration.fetch(:dev, 'eth0')
+              @mode = iface_configuration.fetch(:mode, 'bridge')
+              @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
+            end
 
             message = "Creating network interface eth#{@iface_number}"
             message << " connected to network #{@network_name}."
+            if @mac
+              message << " Using MAC address: #{@mac}"
+            end
             @logger.info(message)
 
             begin
-              domain.attach_device(to_xml('interface'))
+              domain.attach_device(to_xml(template_name))
             rescue => e
               raise Errors::AttachDeviceError,
                 :error_message => e.message

data/lib/vagrant-libvirt/action/create_networks.rb

@@ -4,14 +4,14 @@ require 'vagrant/util/scoped_hash_override'
 require 'ipaddr'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Prepare all networks needed for domain connections.
       class CreateNetworks
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
-        include VagrantPlugins::Libvirt::Util::ErbTemplate
-        include VagrantPlugins::Libvirt::Util::LibvirtUtil
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::create_networks")

data/lib/vagrant-libvirt/action/destroy_domain.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class DestroyDomain
         def initialize(app, env)

data/lib/vagrant-libvirt/action/destroy_networks.rb

@@ -2,7 +2,7 @@ require 'log4r'
 require 'nokogiri'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Destroy all networks created for this specific domain. Skip
       # removing if network has still active connections.

data/lib/vagrant-libvirt/action/halt_domain.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Halt the domain.
       class HaltDomain

data/lib/vagrant-libvirt/action/handle_box_image.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class HandleBoxImage
         def initialize(app, env)
@@ -35,7 +35,7 @@ module VagrantPlugins
           env[:box_volume_name] << '_vagrant_box_image.img'
 
           # Don't continue if image already exists in storage pool.
-          return @app.call(env) if Libvirt::Util::Collection.find_matching(
+          return @app.call(env) if ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].volumes.all, env[:box_volume_name])
 
           # Box is not available as a storage pool volume. Create and upload
@@ -97,7 +97,7 @@ module VagrantPlugins
             stream = env[:libvirt_compute].client.stream
             volume.upload(stream, offset=0, length=image_size)
 
-            # Exception Libvirt::RetrieveError can be raised if buffer is
+            # Exception ProviderLibvirt::RetrieveError can be raised if buffer is
             # longer than length accepted by API send function.
             # 
             # TODO: How to find out if buffer is too large and what is the

data/lib/vagrant-libvirt/action/handle_storage_pool.rb

@@ -1,10 +1,10 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class HandleStoragePool
-        include VagrantPlugins::Libvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::handle_storage_pool")
@@ -16,7 +16,7 @@ module VagrantPlugins
           config = env[:machine].provider_config
 
           # Check for storage pool, where box image should be created
-          fog_pool = Libvirt::Util::Collection.find_matching(
+          fog_pool = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].pools.all, config.storage_pool_name)
           return @app.call(env) if fog_pool
 

data/lib/vagrant-libvirt/action/is_created.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This can be used with "Call" built-in to check if the machine
       # is created and branch in the middleware.

data/lib/vagrant-libvirt/action/is_running.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This can be used with "Call" built-in to check if the machine
       # is running and branch in the middleware.

data/lib/vagrant-libvirt/action/is_suspended.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This can be used with "Call" built-in to check if the machine
       # is suspended and branch in the middleware.

data/lib/vagrant-libvirt/action/message_already_created.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class MessageAlreadyCreated
         def initialize(app, env)

data/lib/vagrant-libvirt/action/message_not_created.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class MessageNotCreated
         def initialize(app, env)

data/lib/vagrant-libvirt/action/message_not_running.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class MessageNotRunning
         def initialize(app, env)

data/lib/vagrant-libvirt/action/message_not_suspended.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class MessageNotSuspended
         def initialize(app, env)

data/lib/vagrant-libvirt/action/prepare_nfs_settings.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class PrepareNFSSettings
         def initialize(app,env)

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

@@ -1,6 +1,6 @@
 require 'yaml'
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class PruneNFSExports
 

data/lib/vagrant-libvirt/action/read_ssh_info.rb

@@ -1,7 +1,7 @@
 require "log4r"
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This action reads the SSH info for the machine and puts it into the
       # `:machine_ssh_info` key in the environment.
@@ -12,8 +12,8 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(
-            env[:libvirt_compute], env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:libvirt_compute],
+                                                 env[:machine])
 
           @app.call(env)
         end
@@ -53,7 +53,7 @@ module VagrantPlugins
           end
 
           ssh_info
-        end 
+        end
       end
     end
   end

data/lib/vagrant-libvirt/action/read_state.rb

@@ -1,7 +1,7 @@
 require "log4r"
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This action reads the state of the machine and puts it in the
       # `:machine_state_id` key in the environment.

data/lib/vagrant-libvirt/action/resume_domain.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Resume suspended domain.
       class ResumeDomain

data/lib/vagrant-libvirt/action/set_name_of_domain.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       # Setup name for domain and domain volumes.
@@ -14,7 +14,7 @@ module VagrantPlugins
           env[:domain_name] << "_#{Time.now.to_i}"
 
           # Check if the domain name is not already taken
-          domain = Libvirt::Util::Collection.find_matching(
+          domain = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].servers.all, env[:domain_name])
           if domain != nil
             raise Vagrant::Errors::DomainNameExists,

data/lib/vagrant-libvirt/action/share_folders.rb

@@ -3,7 +3,7 @@ require "pathname"
 require "log4r"
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       class ShareFolders
         def initialize(app, env)

data/lib/vagrant-libvirt/action/start_domain.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       # Just start the domain.

data/lib/vagrant-libvirt/action/suspend_domain.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # Suspend domain.
       class SuspendDomain

data/lib/vagrant-libvirt/action/sync_folders.rb

@@ -2,7 +2,7 @@ require "log4r"
 require "vagrant/util/subprocess"
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This middleware uses `rsync` to sync the folders over to the
       # libvirt domain.

data/lib/vagrant-libvirt/action/timed_provision.rb

@@ -1,7 +1,7 @@
 require "vagrant-libvirt/util/timer"
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
       # This is the same as the builtin provision except it times the
       # provisioner runs.

data/lib/vagrant-libvirt/action/wait_till_up.rb

@@ -3,7 +3,7 @@ require 'vagrant-libvirt/util/timer'
 require 'vagrant/util/retryable'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Action
 
       # Wait till domain is started, till it obtains an IP address and is

data/lib/vagrant-libvirt/config.rb

@@ -1,7 +1,7 @@
 require 'vagrant'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     class Config < Vagrant.plugin('2', :config)
       # A hypervisor name to access via Libvirt.
       attr_accessor :driver
@@ -26,6 +26,7 @@ module VagrantPlugins
       attr_accessor :memory
       attr_accessor :cpus
       attr_accessor :nested
+      attr_accessor :volume_cache
 
       def initialize
         @driver            = UNSET_VALUE
@@ -39,6 +40,7 @@ module VagrantPlugins
         @memory            = UNSET_VALUE
         @cpus              = UNSET_VALUE
         @nested            = UNSET_VALUE
+        @volume_cache      = UNSET_VALUE
       end
 
       def finalize!
@@ -53,6 +55,7 @@ module VagrantPlugins
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
+        @volume_cache = 'default' if @volume_cache == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-libvirt/errors.rb

@@ -1,7 +1,7 @@
 require 'vagrant'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Errors
       class VagrantLibvirtError < Vagrant::Errors::VagrantError
         error_namespace("vagrant_libvirt.errors")

data/lib/vagrant-libvirt/plugin.rb

@@ -12,16 +12,16 @@ if Vagrant::VERSION < '1.1.0'
 end
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     class Plugin < Vagrant.plugin('2')
-      name "libvirt"
+      name 'libvirt'
       description <<-DESC
       Vagrant plugin to manage VMs in libvirt.
       DESC
 
 
-      config("libvirt", :provider) do
-        require_relative "config"
+      config('libvirt', :provider) do
+        require_relative 'config'
         Config
       end
 
@@ -37,7 +37,7 @@ module VagrantPlugins
 
       # This initializes the internationalization strings.
       def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", Libvirt.source_root)
+        I18n.load_path << File.expand_path("locales/en.yml", ProviderLibvirt.source_root)
         I18n.reload!
       end
 

data/lib/vagrant-libvirt/provider.rb

@@ -1,7 +1,7 @@
 require 'vagrant'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
 
     # This is the base class for a provider for the V2 API. A provider
     # is responsible for creating compute resources to match the
@@ -45,7 +45,7 @@ module VagrantPlugins
         #  :username => "mitchellh",
         #  :private_key_path => "/path/to/my/key"
         #}
-        env = @machine.action("read_ssh_info")
+        env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
@@ -55,7 +55,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action("read_state")
+        env = @machine.action('read_state')
 
         state_id = env[:machine_state_id]
 

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -4,9 +4,10 @@
   <vcpu><%= @cpus %></vcpu>
 
   <% if @nested %>
-    <cpu match='exact'>
-      <model>core2duo</model>
-      <feature policy='require' name='vmx'/>
+    <cpu mode='host-passthrough'>
+      <model fallback='allow'>qemu64</model>
+      <feature policy='optional' name='vmx'/>
+      <feature policy='optional' name='svm'/>
     </cpu>
   <% end %>
 
@@ -22,7 +23,7 @@
   <clock offset='utc'/>
   <devices>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
+      <driver name='qemu' type='qcow2' cache='<%= @domain_volume_cache %>'/>
       <source file='<%= @domain_volume_path %>'/>
       <%# we need to ensure a unique target dev -%>
       <target dev='vda' bus='virtio'/>

data/lib/vagrant-libvirt/templates/interface.xml.erb

@@ -1,5 +1,8 @@
 <interface type='network'>
   <source network='<%= @network_name %>'/>
+	<% if @mac %>
+  	<mac address='<%= @mac %>'/>
+	<% end %>
   <target dev='vnet<%= @iface_number %>'/>
   <alias name='net<%= @iface_number %>'/>
   <model type='virtio'/>

data/lib/vagrant-libvirt/templates/public_interface.xml.erb

@@ -0,0 +1,7 @@
+<interface type='direct'>
+	<% if @mac %>
+  	<mac address='<%= @mac %>'/>
+  <% end %>
+  <source dev='<%= @device %>' mode='<%= @mode %>'/>
+</interface>
+

data/lib/vagrant-libvirt/util.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Util
       autoload :ErbTemplate, 'vagrant-libvirt/util/erb_template'
       autoload :Collection,  'vagrant-libvirt/util/collection'

data/lib/vagrant-libvirt/util/collection.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Util
       module Collection
 

data/lib/vagrant-libvirt/util/erb_template.rb

@@ -1,7 +1,7 @@
 require 'erb'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Util
       module ErbTemplate
 

data/lib/vagrant-libvirt/util/libvirt_util.rb

@@ -2,7 +2,7 @@ require 'nokogiri'
 require 'vagrant/util/network_ip'
 
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Util
       module LibvirtUtil
         include Vagrant::Util::NetworkIP

data/lib/vagrant-libvirt/util/timer.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
+  module ProviderLibvirt
     module Util
       class Timer
         # A basic utility method that times the execution of the given

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Libvirt
-    VERSION = "0.0.6"
+  module ProviderLibvirt
+    VERSION = "0.0.7"
   end
 end

data/vagrant-libvirt.gemspec

@@ -2,8 +2,9 @@
 require File.expand_path('../lib/vagrant-libvirt/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Lukas Stanek"]
-  gem.email         = ["ls@elostech.cz"]
+  gem.authors       = ['Lukas Stanek','Dima Vasilets']
+  gem.email         = ['ls@elostech.cz','pronix.service@gmail.com']
+  gem.license       = 'MIT'
   gem.description   = %q{Vagrant provider for libvirt.}
   gem.summary       = %q{Vagrant provider for libvirt.}
   gem.homepage      = "https://github.com/pradels/vagrant-libvirt"
@@ -13,9 +14,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "vagrant-libvirt"
   gem.require_paths = ["lib"]
-  gem.version       = VagrantPlugins::Libvirt::VERSION
+  gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
-  gem.add_runtime_dependency "fog", "~> 1.10.0"
+  gem.add_runtime_dependency "fog", "1.10.0"
   gem.add_runtime_dependency "ruby-libvirt", "~> 0.4.0"
 
   gem.add_development_dependency "rake"

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
 - Lukas Stanek
+- Dima Vasilets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
@@ -24,7 +25,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.10.0
 - !ruby/object:Gem::Dependency
@@ -62,6 +63,7 @@ dependencies:
 description: Vagrant provider for libvirt.
 email:
 - ls@elostech.cz
+- pronix.service@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -114,6 +116,7 @@ files:
 - lib/vagrant-libvirt/templates/domain.xml.erb
 - lib/vagrant-libvirt/templates/interface.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
+- lib/vagrant-libvirt/templates/public_interface.xml.erb
 - lib/vagrant-libvirt/templates/volume_snapshot.xml.erb
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/collection.rb
@@ -125,7 +128,8 @@ files:
 - tools/prepare_redhat_for_box.sh
 - vagrant-libvirt.gemspec
 homepage: https://github.com/pradels/vagrant-libvirt
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -149,3 +153,4 @@ signing_key:
 specification_version: 3
 summary: Vagrant provider for libvirt.
 test_files: []
+has_rdoc: