vagrant-libvirt 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a9f2dc33e98d6a6508eef0d5f08104cf021f9f7
-  data.tar.gz: b42c0511ec12193843ebae0bd285598327847810
+  metadata.gz: 8c21fb27cb9d1d69b36af2d3b057639381ad6e2c
+  data.tar.gz: c02977b68b33bab4a2786634e9ba9f3f53ed256a
 SHA512:
-  metadata.gz: f2a7909225e3a571d75c96cfa4221baca176e17c48afc725c6d499f3eb6e63a33983a222492d64c043d7565b0623f3ca87c00d33ca27e0e51b55db0a14c33922
-  data.tar.gz: a997be0c048ea6708a40462074a5468c1f466e2a2cc1fc64b5ca76866b97ecf7909ec10bc29c04eae6fd635ec483a305b7e70b81caae1f5f568893295f0a88a5
+  metadata.gz: 8a41f855485a0a6330d5252ce38bcb0575f2b6c05448109c9be316f884ba2b5a5fa4ea2761e9535f253ef4efc2fff8799a168f9f574825e5d46601251c23b0af
+  data.tar.gz: 4413ab7c72460e77df91097458176ba93e85f1544dd7c86f262abc792d2762cb83e5bebb5a292825b60cfd2ced501868b084116163e5d416678dbf095a2af601

data/Gemfile

@@ -8,6 +8,7 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem 'pry'
 end
 
 group :plugins do

data/README.md

@@ -64,7 +64,7 @@ a `config.vm.provider` block. So first, add Libvirt box using any name you
 want. This is just an example of Libvirt CentOS 6.4 box available:
 
 ```
-$ vagrant box add centos64 http://kwok.cz/centos64.box
+vagrant box add centos64 http://citozin.com/centos64.box
 ```
 
 ### Create Vagrantfile
@@ -92,6 +92,7 @@ $ vagrant up --provider=libvirt
 Vagrant needs to know that we want to use Libvirt and not default VirtualBox.
 That's why there is `--provider=libvirt` option specified. Other way to tell
 Vagrant to use Libvirt provider is to setup environment variable
+
 `export VAGRANT_DEFAULT_PROVIDER=libvirt`.
 
 ### How Project Is Created
@@ -120,7 +121,7 @@ Although it should work without any configuration for most people, this provider
 * `connect_via_ssh` - If use ssh tunnel to connect to Libvirt.
 * `username` - Username and password to access Libvirt.
 * `password` - Password to access Libvirt.
-* `id_ssh_key_file` - The id ssh key file name to access Libvirt (eg: id_dsa or id_rsa or ... in the user .ssh directory)
+* `id_ssh_key_file` - If not nil, uses this ssh private key to access Libvirt. Default is $HOME/.ssh/id_rsa. Prepends $HOME/.ssh/ if no directory.  
 * `socket` - Path to the libvirt unix socket (eg: /var/run/libvirt/libvirt-sock)
 * `uri` - For advanced usage. Directly specifies what libvirt connection URI vagrant-libvirt should use. Overrides all other connection configuration options.
 
@@ -156,7 +157,9 @@ end
 * `graphics_ip` - Sets the IP for the display protocol to bind to.  Defaults to "127.0.0.0.1".
 * `graphics_passwd` - Sets the password for the display protocol. Working for vnc and spice. by default working without passsword.
 * `video_type` - Sets the graphics card type exposed to the guest.  Defaults to "cirrus".  [Possible values](http://libvirt.org/formatdomain.html#elementsVideo) are "vga", "cirrus", "vmvga", "xen", "vbox", or "qxl".
+* `keymap` - Set keymap for vm. default: en-us
 * `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
+* `machine` - Sets machine type. Equivalent to qemu `-machine`. Use `qemu-system-x86_64 -machine help` to get a list of supported machines.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -199,7 +202,10 @@ An examples of network interface definitions:
 
   # Public Network
   config.vm.define :test_vm1 do |test_vm1|
-    test_vm1.vm.network :public_network, :dev => "eth0", :mode => 'bridge'
+    test_vm1.vm.network :public_network,
+          :dev => "virbr0",
+          :mode => "bridge",
+          :type => "bridge"
   end
 ```
 
@@ -235,23 +241,31 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:libvirt__dhcp_enabled` - If DHCP will offer addresses, or not. Used only
   when creating new network. Default is true.
 * `:libvirt__adapter` - Number specifiyng sequence number of interface.
-* `:libvirt__forward_mode` - Specify one of `none`, `nat` or `route` options.
+* `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `nat` or `route` options.
   This option is used only when creating new network. Mode `none` will create
   isolated network without NATing or routing outside. You will want to use
   NATed forwarding typically to reach networks outside of hypervisor. Routed
   forwarding is typically useful to reach other networks within hypervisor.
+  `veryisolated` described [here](https://libvirt.org/formatnetwork.html#examplesNoGateway).
   By default, option `nat` is used.
 * `: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.
-* `model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
+* `:model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
+
+When the option `:libvirt__dhcp_enabled` is to to 'false' it shouldn't matter
+whether the virtual network contains a DHCP server or not and vagrant-libvirt
+should not fail on it. The only situation where vagrant-libvirt should fail
+is when DHCP is requested but isn't configured on a matching already existing
+virtual network.
 
 ### 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'.
+* `:type` - is type of interface.(`<interface type="#{@type}">`)
 * `:mac` - MAC address for the interface.
 * `:ovs` - Support to connect to an open vSwitch bridge device. Default is 'false'.
 
@@ -296,13 +310,33 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## CDROMs
+
+You can attach up to four (4) CDROMs to a VM via `libvirt.storage :file, :device => :cdrom`. Available options are:
+
+* `path` - The path to the iso to be used for the CDROM drive.
+* `dev` - The device to use (`hda`, `hdb`, `hdc`, or `hdd`). This will be automatically determined if unspecified.
+* `bus` - The bus to use for the CDROM drive. Defaults to `ide`
+
+The following example creates three CDROM drives in the VM:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.storage :file, :device => :cdrom, :path => '/path/to/iso1.iso'
+    libvirt.storage :file, :device => :cdrom, :path => '/path/to/iso2.iso'
+    libvirt.storage :file, :device => :cdrom, :path => '/path/to/iso3.iso'
+  end
+end
+```
+
 ## SSH Access To VM
 
 vagrant-libvirt supports vagrant's [standard ssh settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html).
 
 ## Forwarded Ports
 
-vagrant-libvirt supports Forwarded Ports via ssh port forwarding.  Please note that due to a well known limitation only the TCP protocol is supported.  For each `forwarded_port` directive you specify in your Vagrantfile, vagrant-libvirt will maintain an active ssh process for the lifetime of the VM. 
+vagrant-libvirt supports Forwarded Ports via ssh port forwarding.  Please note that due to a well known limitation only the TCP protocol is supported.  For each `forwarded_port` directive you specify in your Vagrantfile, vagrant-libvirt will maintain an active ssh process for the lifetime of the VM.
 
 vagrant-libvirt supports an additional `forwarded_port` option
 `gateway_ports` which defaults to `false`, but can be set to `true` if
@@ -350,6 +384,14 @@ The box is a tarball containing:
 * `metadata.json` file describing box image (provider, virtual_size, format).
 * `Vagrantfile` that does default settings for the provider-specific configuration for this provider.
 
+## Create Box
+This script creates a vagrant-libvirt box from a qcow2 file:
+
+Usage:
+
+```create_box.sh ubuntu14.qcow2```
+Used Packer to create the qcow2 images, templates available at https://github.com/jakobadam/packer-qemu-templates
+
 ## Development
 
 To work on the `vagrant-libvirt` plugin, clone this repository out, and use

data/lib/vagrant-libvirt/action.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
     module Action
       # Include the built-in modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
-      @logger = Log4r::Logger.new('vagrant_libvirt::action') 
+      @logger = Log4r::Logger.new('vagrant_libvirt::action')
 
       # This action is called to bring the box up from nothing.
       def self.action_up
@@ -38,7 +38,7 @@ module VagrantPlugins
               b2.use StartDomain
               b2.use WaitTillUp
 
-              
+
 
 
               b2.use ForwardPorts
@@ -145,6 +145,13 @@ module VagrantPlugins
         end
       end
 
+      # not implemented and looks like not require
+      def self.action_package
+        lambda do |env|
+          raise Errors::PackageNotSupported
+        end
+      end
+
       # This is the action that is primarily responsible for completely
       # freeing the resources of the underlying virtual machine.
       def self.action_destroy
@@ -279,6 +286,14 @@ module VagrantPlugins
         end
       end
 
+      def self.action_read_mac_addresses
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectLibvirt
+          b.use ReadMacAddresses
+        end
+      end
+
       # This is the action that will run a single SSH command.
       def self.action_ssh_run
         Vagrant::Action::Builder.new.tap do |b|
@@ -329,11 +344,12 @@ module VagrantPlugins
       autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
 
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadMacAddresses, action_root.join('read_mac_addresses')
       autoload :ReadState, action_root.join('read_state')
       autoload :ResumeDomain, action_root.join('resume_domain')
       autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
-      
-      # I don't think we need it anymore 
+
+      # I don't think we need it anymore
       autoload :ShareFolders, action_root.join('share_folders')
       autoload :StartDomain, action_root.join('start_domain')
       autoload :SuspendDomain, action_root.join('suspend_domain')

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

@@ -3,7 +3,6 @@ require 'log4r'
 module VagrantPlugins
   module ProviderLibvirt
     module Action
-
       class CreateDomain
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
@@ -13,11 +12,17 @@ module VagrantPlugins
         end
 
         def _disk_name(name, disk)
-          return "#{name}-#{disk[:device]}.#{disk[:type]}"	# disk name
+          "#{name}-#{disk[:device]}.#{disk[:type]}"	# disk name
         end
 
         def _disks_print(disks)
-          return disks.collect{ |x| x[:device]+'('+x[:type]+','+x[:size]+')' }.join(', ')
+          disks.collect do |x|
+            x[:device] + '(' + x[:type] + ',' + x[:size] + ')'
+          end.join(', ')
+        end
+
+        def _cdroms_print(cdroms)
+          cdroms.collect { |x| x[:dev] }.join(', ')
         end
 
         def call(env)
@@ -28,9 +33,10 @@ module VagrantPlugins
           @name = env[:domain_name]
           @cpus = config.cpus.to_i
           @cpu_mode = config.cpu_mode
+          @machine_type = config.machine_type
           @disk_bus = config.disk_bus
           @nested = config.nested
-          @memory_size = config.memory.to_i*1024
+          @memory_size = config.memory.to_i * 1024
           @domain_volume_cache = config.volume_cache
           @kernel = config.kernel
           @cmd_line = config.cmd_line
@@ -46,10 +52,12 @@ module VagrantPlugins
                               end
           @video_type = config.video_type
           @video_vram = config.video_vram
+          @keymap = config.keymap
 
           # Storage
           @storage_pool_name = config.storage_pool_name
           @disks = config.disks
+          @cdroms = config.cdroms
 
           config = env[:machine].provider_config
           @domain_type = config.driver
@@ -63,10 +71,9 @@ module VagrantPlugins
           @domain_volume_path = domain_volume.path
 
           # the default storage prefix is typically: /var/lib/libvirt/images/
-          storage_prefix = File.dirname(@domain_volume_path)+'/'	# steal
+          storage_prefix = File.dirname(@domain_volume_path) + '/'	# steal
 
           @disks.each do |disk|
-
             disk[:path] ||= _disk_name(@name, disk)
 
             # On volume creation, the <path> element inside <target>
@@ -81,15 +88,15 @@ module VagrantPlugins
             # qemu-img create -f qcow2 <path> 5g
             begin
               domain_volume_disk = env[:libvirt_compute].volumes.create(
-                :name => disk[:name],
-                :format_type => disk[:type],
-                :path => disk[:absolute_path],
-                :capacity => disk[:size],
+                name: disk[:name],
+                format_type: disk[:type],
+                path: disk[:absolute_path],
+                capacity: disk[:size],
                 #:allocation => ?,
-                :pool_name => @storage_pool_name)
+                pool_name: @storage_pool_name)
             rescue Fog::Errors::Error => e
               raise Errors::FogDomainVolumeCreateError,
-                :error_message => e.message
+                  error_message:  e.message
             end
           end
 
@@ -98,7 +105,7 @@ module VagrantPlugins
           env[:ui].info(" -- Name:              #{@name}")
           env[:ui].info(" -- Domain type:       #{@domain_type}")
           env[:ui].info(" -- Cpus:              #{@cpus}")
-          env[:ui].info(" -- Memory:            #{@memory_size/1024}M")
+          env[:ui].info(" -- Memory:            #{@memory_size / 1024}M")
           env[:ui].info(" -- Base box:          #{env[:machine].box.name}")
           env[:ui].info(" -- Storage pool:      #{@storage_pool_name}")
           env[:ui].info(" -- Image:             #{@domain_volume_path}")
@@ -108,9 +115,10 @@ module VagrantPlugins
           env[:ui].info(" -- Graphics Type:     #{@graphics_type}")
           env[:ui].info(" -- Graphics Port:     #{@graphics_port}")
           env[:ui].info(" -- Graphics IP:       #{@graphics_ip}")
-          env[:ui].info(" -- Graphics Password: #{@graphics_passwd.empty? ? 'Not defined': 'Defined'}")
+          env[:ui].info(" -- Graphics Password: #{@graphics_passwd.empty? ? 'Not defined' : 'Defined'}")
           env[:ui].info(" -- Video Type:        #{@video_type}")
           env[:ui].info(" -- Video VRAM:        #{@video_vram}")
+          env[:ui].info(" -- Keymap:            #{@keymap}")
 
           if @disks.length > 0
             env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
@@ -118,6 +126,13 @@ module VagrantPlugins
           @disks.each do |disk|
             env[:ui].info(" -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}")
           end
+
+          if @cdroms.length > 0
+            env[:ui].info(" -- CDROMS:            #{_cdroms_print(@cdroms)}")
+          end
+          @cdroms.each do |cdrom|
+            env[:ui].info(" -- CDROM(#{cdrom[:dev]}):        #{cdrom[:path]}")
+          end
           env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.
@@ -125,10 +140,9 @@ module VagrantPlugins
           # existing volume? Use domain creation from template..
           begin
             server = env[:libvirt_compute].servers.create(
-              :xml => to_xml('domain'))
+              xml: to_xml('domain'))
           rescue Fog::Errors::Error => e
-            raise Errors::FogCreateServerError,
-              :error_message => e.message
+            raise Errors::FogCreateServerError, error_message:  e.message
           end
 
           # Immediately save the ID since it is created at this point.
@@ -137,7 +151,6 @@ module VagrantPlugins
           @app.call(env)
         end
       end
-
     end
   end
 end

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

@@ -17,8 +17,8 @@ module VagrantPlugins
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_network_interfaces')
           @management_network_name = env[:machine].provider_config.management_network_name
-	  config = env[:machine].provider_config
-	  @nic_model_type = config.nic_model_type
+	        config = env[:machine].provider_config
+	        @nic_model_type = config.nic_model_type
           @app = app
         end
 
@@ -74,8 +74,8 @@ module VagrantPlugins
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
               @device = iface_configuration.fetch(:dev, 'eth0')
-              @type = iface_configuration.fetch(:type, 'direct')
               @mode = iface_configuration.fetch(:mode, 'bridge')
+              @type = iface_configuration.fetch(:type, 'direct')
               @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
               template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
@@ -156,9 +156,7 @@ module VagrantPlugins
           # Get list of all (active and inactive) libvirt networks.
           available_networks = libvirt_networks(libvirt_client)
 
-          if options[:iface_type] == :public_network
-            return 'public'
-          end
+          return 'public' if options[:iface_type] == :public_network
 
           if options[:ip]
             address = network_address(options[:ip], options[:netmask])

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

@@ -100,8 +100,10 @@ module VagrantPlugins
         # match what was configured in the vagrantfile
         # since we always enable dhcp for the management network
         # this ensures we wont start a vm vagrant cant reach
+        # Allow the situation where DHCP is not requested (:libvirt__dhcp_enabled == false)
+        # but where it is enabled on the virtual network
         def verify_dhcp
-          unless @options[:dhcp_enabled] == @interface_network[:dhcp_enabled]
+          if @interface_network[:dhcp_enabled] == true && @options[:dhcp_enabled] == false
             raise Errors::DHCPMismatch,
                   network_name: @interface_network[:name],
                   requested: @options[:dhcp_enabled] ? 'enabled' : 'disabled'

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

@@ -35,7 +35,7 @@ module VagrantPlugins
           config   = env[:machine].provider_config
           box_image_file = env[:machine].box.directory.join('box.img').to_s
           env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub("/", "-VAGRANTSLASH-")
-          env[:box_volume_name] << '_vagrant_box_image.img'
+          env[:box_volume_name] << "_vagrant_box_image_#{env[:machine].box.version.to_s rescue ''}.img"
 
           @@lock.synchronize do
             # Don't continue if image already exists in storage pool.
@@ -47,6 +47,7 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
 
             # Create new volume in storage pool
+            raise Errors::BoxNotFound if !File.exists?(box_image_file)
             box_image_size = File.size(box_image_file) # B
             message = "Creating volume #{env[:box_volume_name]}"
             message << " in storage pool #{config.storage_pool_name}."

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

@@ -0,0 +1,42 @@
+require "log4r"
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class ReadMacAddresses
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::read_mac_addresses")
+        end
+
+        def call(env)
+          env[:machine_mac_addresses] = read_mac_addresses(env[:libvirt_compute], env[:machine])
+        end
+
+        def read_mac_addresses(libvirt, machine)
+          return nil if machine.id.nil?
+
+          domain = libvirt.client.lookup_domain_by_uuid(machine.id)
+
+          if domain.nil?
+            @logger.info("Machine could not be found, assuming it got destroyed")
+            machine.id = nil
+            return nil
+          end
+
+          xml = Nokogiri::XML(domain.xml_desc)
+          mac = xml.xpath("/domain/devices/interface/mac/@address")
+
+          if mac.length == 0
+            return {}
+          end
+
+          Hash[mac.each_with_index.map do |x,i|
+            @logger.debug("interface[#{i}] = #{x.value}")
+            [i,x.value]
+          end]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/cap/nic_mac_addresses.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module ProviderLibvirt
+    module Cap
+      class NicMacAddresses
+        def self.nic_mac_addresses(machine)
+          machine.provider.mac_addresses
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/config.rb

@@ -55,6 +55,7 @@ module VagrantPlugins
       attr_accessor :memory
       attr_accessor :cpus
       attr_accessor :cpu_mode
+      attr_accessor :machine_type
       attr_accessor :disk_bus
       attr_accessor :nic_model_type
       attr_accessor :nested
@@ -69,9 +70,11 @@ module VagrantPlugins
       attr_accessor :graphics_ip
       attr_accessor :video_type
       attr_accessor :video_vram
+      attr_accessor :keymap
 
       # Storage
       attr_accessor :disks
+  	  attr_accessor :cdroms
 
       def initialize
         @uri               = UNSET_VALUE
@@ -91,6 +94,7 @@ module VagrantPlugins
         @memory            = UNSET_VALUE
         @cpus              = UNSET_VALUE
         @cpu_mode          = UNSET_VALUE
+        @machine_type      = UNSET_VALUE
         @disk_bus          = UNSET_VALUE
         @nic_model_type    = UNSET_VALUE
         @nested            = UNSET_VALUE
@@ -105,13 +109,14 @@ module VagrantPlugins
         @graphics_passwd   = UNSET_VALUE
         @video_type        = UNSET_VALUE
         @video_vram        = UNSET_VALUE
+        @keymap            = UNSET_VALUE
 
         # Storage
-        @disks             = UNSET_VALUE
+        @disks             = []
+        @cdroms			       = []
       end
 
       def _get_device(disks)
-        disks = [] if disks == UNSET_VALUE
         # skip existing devices and also the first one (vda)
         exist = disks.collect {|x| x[:device]}+[1.vdev.to_s]
         skip = 1		# we're 1 based, not 0 based...
@@ -124,8 +129,62 @@ module VagrantPlugins
         end
       end
 
+      def _get_cdrom_dev(cdroms)
+        exist = Hash[cdroms.collect{|x| [x[:dev],true]}]
+        # hda - hdc
+        curr = "a".ord
+        while curr <= "d".ord
+          dev = "hd" + curr.chr
+          if exist[dev]
+            curr += 1
+            next
+          else
+            return dev
+          end
+        end
+
+        # is it better to raise our own error, or let libvirt cause the exception?
+        raise "Only four cdroms may be attached at a time"
+      end
+
       # NOTE: this will run twice for each time it's needed- keep it idempotent
       def storage(storage_type, options={})
+        if storage_type == :file
+          if options[:device] == :cdrom
+            _handle_cdrom_storage(options)
+          else
+            _handle_disk_storage(options)
+          end
+        end
+      end
+
+      def _handle_cdrom_storage(options={})
+        # <disk type="file" device="cdrom">
+        #   <source file="/home/user/virtio-win-0.1-100.iso"/>
+        #   <target dev="hdc"/>
+        #   <readonly/>
+        #   <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+        # </disk>
+        #
+        # note the target dev will need to be changed with each cdrom drive (hdc, hdd, etc),
+        # as will the address unit number (unit=0, unit=1, etc)
+
+        options = {
+          :dev => self._get_cdrom_dev(@cdroms),
+          :bus => "ide",
+          :path => nil,
+        }.merge(options)
+
+        cdrom = {
+          :dev => options[:dev],
+          :bus => options[:bus],
+          :path => options[:path]
+        }
+
+        @cdroms << cdrom
+      end
+
+      def _handle_disk_storage(options={})
         options = {
           :device => _get_device(@disks),
           :type => 'qcow2',
@@ -134,9 +193,6 @@ module VagrantPlugins
           :bus => 'virtio'
         }.merge(options)
 
-        #puts "storage(#{storage_type} --- #{options.to_s})"
-        @disks = [] if @disks == UNSET_VALUE
-
         disk = {
           :device => options[:device],
           :type => options[:type],
@@ -146,9 +202,7 @@ module VagrantPlugins
           :cache => options[:cache] || 'default',
         }
 
-        if storage_type == :file
-          @disks << disk	# append
-        end
+        @disks << disk	# append
       end
 
       # code to generate URI from a config moved out of the connect action
@@ -191,8 +245,10 @@ module VagrantPlugins
 
         if @id_ssh_key_file
           # set ssh key for access to libvirt host
-          home_dir = `echo ${HOME}`.chomp
-          uri << "\&keyfile=#{home_dir}/.ssh/"+@id_ssh_key_file
+          uri << "\&keyfile="
+          # if no slash, prepend $HOME/.ssh/
+          uri << "#{`echo ${HOME}`.chomp}/.ssh/" if @id_ssh_key_file !~ /\A\//
+          uri << @id_ssh_key_file
         end
         # set path to libvirt socket
         uri << "\&socket="+@socket if @socket
@@ -219,6 +275,7 @@ module VagrantPlugins
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
+        @machine_type = nil if @machine_type == UNSET_VALUE
         @disk_bus = 'virtio' if @disk_bus == UNSET_VALUE
         @nic_model_type = 'virtio' if @nic_model_type == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
@@ -237,9 +294,11 @@ module VagrantPlugins
         @graphics_ip = '127.0.0.1' if @graphics_ip == UNSET_VALUE
         @video_type = 'cirrus' if @video_type == UNSET_VALUE
         @video_vram = 9216 if @video_vram == UNSET_VALUE
+        @keymap = 'en-us' if @keymap == UNSET_VALUE
 
         # Storage
         @disks = [] if @disks == UNSET_VALUE
+        @cdroms = [] if @cdroms == UNSET_VALUE
       end
 
       def validate(machine)
@@ -254,7 +313,13 @@ module VagrantPlugins
          { "Libvirt Provider" => errors }
       end
 
+      def merge(other)
+        super.tap do |result|
+          c = disks.dup
+          c += other.disks
+          result.disks = c
+        end
+      end
     end
   end
 end
-

data/lib/vagrant-libvirt/errors.rb

@@ -7,6 +7,11 @@ module VagrantPlugins
         error_namespace('vagrant_libvirt.errors')
       end
 
+      # package not supported
+      class PackageNotSupported < VagrantLibvirtError
+        error_key(:package_not_supported)
+      end
+
       # Storage pools and volumes exceptions
       class NoStoragePool < VagrantLibvirtError
         error_key(:no_storage_pool)

data/lib/vagrant-libvirt/plugin.rb

@@ -37,6 +37,11 @@ module VagrantPlugins
         Cap::MountP9
       end
 
+      provider_capability(:libvirt, :nic_mac_addresses) do
+        require_relative "cap/nic_mac_addresses"
+        Cap::NicMacAddresses
+      end
+
       # lower priority than nfs or rsync
       # https://github.com/pradels/vagrant-libvirt/pull/170
       synced_folder("9p", 4) do

data/lib/vagrant-libvirt/provider.rb

@@ -49,6 +49,18 @@ module VagrantPlugins
         env[:machine_ssh_info]
       end
 
+      def mac_addresses
+        # Run a custom action called "read_mac_addresses" which will return
+        # a list of mac addresses used by the machine. The returned data will
+        # be in the following format:
+        #
+        # {
+        #   <ADAPTER_ID>: <MAC>
+        # }
+        env = @machine.action('read_mac_addresses')
+        env[:machine_mac_addresses]
+      end
+
       # This should return the state of the machine within this provider.
       # The state must be an instance of {MachineState}.
       def state

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

@@ -14,7 +14,11 @@
   <% end %>
 
   <os>
+  <% if @machine_type %>
+    <type machine='<%= @machine_type %>'>hvm</type>
+  <% else %>
     <type>hvm</type>
+  <% end %>
     <boot dev='hd'/>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
@@ -44,6 +48,15 @@
 -%>
     </disk>
 <% end -%>
+
+<% @cdroms.each do |c| %>
+    <disk type='file' device='cdrom'>
+      <source file='<%= c[:path] %>'/>
+      <target dev='<%= c[:dev] %>' bus='<%= c[:bus] %>'/>
+      <readonly/>
+    </disk>
+<% end %>
+
     <serial type='pty'>
       <target port='0'/>
     </serial>
@@ -52,7 +65,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <%# Video device -%>
-    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='en-us' <%= @graphics_passwd%> />
+    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='<%= @keymap %>' <%= @graphics_passwd%> />
       <video>
           <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
       </video>

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

@@ -2,7 +2,7 @@
   <name><%= @network_name %></name>
   <bridge name="<%= @network_bridge_name %>" />
 
-  <% if @network_forward_mode != 'none' %>
+  <% if (@network_forward_mode != 'none' && @network_forward_mode != 'veryisolated') %>
     <% if @network_forward_device %>
       <forward mode="<%= @network_forward_mode %>" dev="<%= @network_forward_device %>" />
     <% else %>
@@ -10,12 +10,14 @@
     <% end %>
   <% end %>
 
-  <ip address="<%= @network_address %>" netmask="<%= @network_netmask %>">
-  <% if @network_dhcp_enabled  %>
-    <dhcp>
-      <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
-    </dhcp>
+  <% if @network_forward_mode != 'veryisolated' %>
+    <ip address="<%= @network_address %>" netmask="<%= @network_netmask %>">
+    <% if @network_dhcp_enabled  %>
+      <dhcp>
+        <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
+      </dhcp>
+    <% end %>
+    </ip>
   <% end %>
-  </ip>
 
 </network>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.25'
+    VERSION = '0.0.26'
   end
 end

data/locales/en.yml

@@ -46,6 +46,7 @@ en:
       Machine is booted and ready for use!
 
     errors:
+      package_not_supported: Not support package for libvirt. Create box manualy.
       fog_error: |-
         There was an error talking to Libvirt. The error message is shown
         below:

data/spec/support/environment_helper.rb

@@ -11,6 +11,20 @@ class EnvironmentHelper
     self.send(value.to_sym)
   end
 
+  def cpus
+    4
+  end
+
+  def memory
+    1024
+  end
+
+  %w(cpus cpu_mode machine_type disk_bus nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
+    define_method(name.to_sym) do
+      nil
+    end
+  end
+
   def machine
     self
   end

data/spec/vagrant-libvirt/action/set_name_of_domain_spec.rb

@@ -10,12 +10,12 @@ describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
     dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
     first  = dmn.build_domain_name(@env)
     second = dmn.build_domain_name(@env)
-    first.should_not eq(second) 
+    first.should_not eq(second)
   end
 
   it "builds simple domain name" do
     @env.default_prefix= 'pre'
     dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
-    dmn.build_domain_name(@env).should eq('pre_') 
+    dmn.build_domain_name(@env).should eq('pre_')
   end
 end

data/tools/create_box.sh

@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+#set -xu
+
+error() {
+    local msg="${1}"
+    echo "==> ${msg}"
+    exit 1
+}
+
+usage() {
+    echo "Usage: ${0} IMAGE [BOX]"
+    echo
+    echo "Package a qcow2 image into a vagrant-libvirt reusable box"
+}
+
+# Print the image's backing file
+backing(){
+    local img=${1}
+    qemu-img info "$img" | grep 'backing file:' | cut -d ':' -f2
+}
+
+# Rebase the image
+rebase(){
+    local img=${1}
+    qemu-img rebase -p -b "" "$img"
+    [[ "$?" -ne 0 ]] && error "Error during rebase"
+}
+
+# Is absolute path
+isabspath(){
+    local path=${1}
+    [[ "$path" =~ ^/.* ]]
+}
+
+if [ -z "$1" ]; then
+    usage
+    exit 1
+fi
+
+IMG=$(readlink -e "$1")
+[[ "$?" -ne 0 ]] && error "'$1': No such image"
+
+IMG_DIR=$(dirname "$IMG")
+IMG_BASENAME=$(basename "$IMG")
+
+BOX=${2:-}
+# If no box name is supplied infer one from image name
+if [[ -z "$BOX" ]]; then
+    BOX_NAME=${IMG_BASENAME%.*}
+    BOX=$BOX_NAME.box
+else
+    BOX_NAME=$(basename "${BOX%.*}")
+fi
+
+[[ -f "$BOX" ]] && error "'$BOX': Already exists"
+
+CWD=$(pwd)
+TMP_DIR="$CWD/_tmp_package"
+TMP_IMG="$TMP_DIR/box.img"
+
+mkdir -p "$TMP_DIR"
+
+[[ ! -w "$IMG" ]] && error "'$IMG': Permission denied"
+
+# We move / copy (when the image has master) the image to the tempdir
+# ensure that it's moved back / removed again
+if [[ -n $(backing "$IMG") ]]; then
+    echo "==> Image has backing image, copying image and rebasing ..."
+    trap "rm -rf $TMP_DIR" EXIT
+    cp "$IMG" "$TMP_IMG"
+    rebase "$TMP_IMG"
+else
+    # move the image to get a speed-up and use less space on disk
+    trap 'mv "$TMP_IMG" "$IMG"; rm -rf "$TMP_DIR"' EXIT
+    mv "$IMG" "$TMP_IMG"
+fi
+
+cd "$TMP_DIR"
+
+IMG_SIZE=$(qemu-img info "$TMP_IMG" | grep 'virtual size' | awk '{print $3;}' | tr -d 'G')
+
+cat > metadata.json <<EOF
+{
+    "provider": "libvirt",
+    "format": "qcow2",
+    "virtual_size": ${IMG_SIZE}
+}
+EOF
+
+cat > Vagrantfile <<EOF
+Vagrant.configure("2") do |config|
+
+  config.vm.provider :libvirt do |libvirt|
+
+    libvirt.driver = "kvm"
+    libvirt.host = ""
+    libvirt.connect_via_ssh = false
+    libvirt.storage_pool_name = "default"
+
+  end
+end
+EOF
+
+echo "==> Creating box, tarring and gzipping"
+
+tar cvzf "$BOX" --totals ./metadata.json ./Vagrantfile ./box.img
+
+# if box is in tmpdir move it to CWD before removing tmpdir
+if ! isabspath "$BOX"; then
+    mv "$BOX" "$CWD"
+fi
+
+echo "==> ${BOX} created"
+echo "==> You can now add the box:"
+echo "==>   'vagrant box add ${BOX} --name ${BOX_NAME}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -151,6 +151,7 @@ files:
 - lib/vagrant-libvirt/action/prepare_nfs_settings.rb
 - lib/vagrant-libvirt/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-libvirt/action/prune_nfs_exports.rb
+- lib/vagrant-libvirt/action/read_mac_addresses.rb
 - lib/vagrant-libvirt/action/read_ssh_info.rb
 - lib/vagrant-libvirt/action/read_state.rb
 - lib/vagrant-libvirt/action/resume_domain.rb
@@ -160,6 +161,7 @@ files:
 - lib/vagrant-libvirt/action/suspend_domain.rb
 - lib/vagrant-libvirt/action/wait_till_up.rb
 - lib/vagrant-libvirt/cap/mount_p9.rb
+- lib/vagrant-libvirt/cap/nic_mac_addresses.rb
 - lib/vagrant-libvirt/cap/synced_folder.rb
 - lib/vagrant-libvirt/config.rb
 - lib/vagrant-libvirt/errors.rb
@@ -183,6 +185,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
 - spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
+- tools/create_box.sh
 - tools/prepare_redhat_for_box.sh
 - vagrant-libvirt.gemspec
 homepage: https://github.com/pradels/vagrant-libvirt
@@ -205,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.