vagrant-libvirt 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67a89ffdbbe10d25e43c0029df99b9755cc32480
-  data.tar.gz: 7fb86a0a3312d4fe0c1851486188cf90644015c6
+  metadata.gz: 6a9f2dc33e98d6a6508eef0d5f08104cf021f9f7
+  data.tar.gz: b42c0511ec12193843ebae0bd285598327847810
 SHA512:
-  metadata.gz: 74f6ddbd5fb0f41421e43ada6671af768ec770ddf06125c961b5df6a3fd06c4585c53bd0f459612310f3ece6b2c587d2d860daa7d5a467043cbc12a3cc84a649
-  data.tar.gz: a0ba44421fabc6ba09ed061352b1cf9cadbc488094991d8326585d169b6eb574c932d11a5721b38fe978dad0c06cd5191cec38fffae7a6b3f7710b8e0be2d527
+  metadata.gz: f2a7909225e3a571d75c96cfa4221baca176e17c48afc725c6d499f3eb6e63a33983a222492d64c043d7565b0623f3ca87c00d33ca27e0e51b55db0a14c33922
+  data.tar.gz: a997be0c048ea6708a40462074a5468c1f466e2a2cc1fc64b5ca76866b97ecf7909ec10bc29c04eae6fd635ec483a305b7e70b81caae1f5f568893295f0a88a5

data/README.md

@@ -31,7 +31,7 @@ welcome and can help a lot :-)
 
 First, you should have libvirt installed if you plan to run VMs on your local system. For instructions, refer to your linux distribution's documentation,
 
-Next, you must have [Vagrant installed](http://docs.vagrantup.com/v2/installation/index.html). Vagrant-libvirt supports Vagrant 1.5 and 1.6.
+Next, you must have [Vagrant installed](http://docs.vagrantup.com/v2/installation/index.html). Vagrant-libvirt supports Vagrant 1.5, 1.6 and 1.7.
 
  Now you're ready to install vagrant-libvirt using standard [Vagrant plugin](http://docs.vagrantup.com/v2/plugins/usage.html) installation methods.
 
@@ -302,9 +302,7 @@ vagrant-libvirt supports vagrant's [standard ssh settings](https://docs.vagrantu
 
 ## Forwarded Ports
 
-vagrant-libvirt supports Forwarded Ports via ssh port forwarding.  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

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env rake
-
 #require 'rubygems'
 #require 'bundler/setup'
 require 'bundler/gem_tasks'

data/example_box/Vagrantfile

@@ -21,11 +21,10 @@ Vagrant.configure("2") do |config|
 
     # Interfaces for VM
     # 
-    # 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. See README for more info. 
+    # Networking features in the form of `config.vm.network`
     #
     #test_vm.vm.network :private_network, :ip => '10.20.30.40'
+    #test_vm.vm.network :public_network, :ip => '10.20.30.41'
   #end
 
   # Options for libvirt vagrant provider.

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

@@ -30,7 +30,7 @@ module VagrantPlugins
 
           # Setup command for retrieving IP address for newly created machine
           # with some MAC address. Get it from dnsmasq leases table
-          ip_command = %q[ find /var/lib/libvirt/dnsmasq/ /var/lib/misc/ -name '*leases' -exec grep $mac {} \; | cut -d' ' -f3 ]
+          ip_command = %q[ awk "/$mac/ {print \$1}" /proc/net/arp ]
           conn_attr[:libvirt_ip_command] = ip_command
 
           @logger.info("Connecting to Libvirt (#{uri}) ...")

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

@@ -26,11 +26,11 @@ module VagrantPlugins
 
           # Gather some info about domain
           @name = env[:domain_name]
-          @cpus = config.cpus
+          @cpus = config.cpus.to_i
           @cpu_mode = config.cpu_mode
           @disk_bus = config.disk_bus
           @nested = config.nested
-          @memory_size = config.memory*1024
+          @memory_size = config.memory.to_i*1024
           @domain_volume_cache = config.volume_cache
           @kernel = config.kernel
           @cmd_line = config.cmd_line

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

@@ -114,7 +114,8 @@ module VagrantPlugins
             @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
             network = {
-              :interface => slot_number,
+              :interface                       => slot_number,
+              :use_dhcp_assigned_default_route => options[:use_dhcp_assigned_default_route],
               #:mac => ...,
             }
 

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

@@ -70,8 +70,8 @@ module VagrantPlugins
 
               autostart_network if !@interface_network[:autostart]
               activate_network if !@interface_network[:active]
+            end
           end
-        end
 
           @app.call(env)
         end

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

@@ -4,6 +4,9 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class HandleBoxImage
+
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::handle_box_image')
           @app = app
@@ -34,49 +37,51 @@ module VagrantPlugins
           env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub("/", "-VAGRANTSLASH-")
           env[:box_volume_name] << '_vagrant_box_image.img'
 
-          # Don't continue if image already exists in storage pool.
-          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
-          # it as a copy of local box image.
-          env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
+          @@lock.synchronize do
+            # Don't continue if image already exists in storage pool.
+            return @app.call(env) if ProviderLibvirt::Util::Collection.find_matching(
+              env[:libvirt_compute].volumes.all, env[:box_volume_name])
 
-          # Create new volume in storage pool
-          box_image_size = File.size(box_image_file) # B
-          message = "Creating volume #{env[:box_volume_name]}"
-          message << " in storage pool #{config.storage_pool_name}."
-          @logger.info(message)
-          begin
-            fog_volume = env[:libvirt_compute].volumes.create(
-              name:         env[:box_volume_name],
-              allocation:   "#{box_image_size/1024/1024}M",
-              capacity:     "#{box_virtual_size}G",
-              format_type:  box_format,
-              pool_name:    config.storage_pool_name)
-          rescue Fog::Errors::Error => e
-            raise Errors::FogCreateVolumeError,
-              :error_message => e.message
-          end
+            # Box is not available as a storage pool volume. Create and upload
+            # it as a copy of local box image.
+            env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
 
-          # Upload box image to storage pool
-          ret = upload_image(box_image_file, config.storage_pool_name,
-            env[:box_volume_name], env) do |progress|
-              env[:ui].clear_line
-              env[:ui].report_progress(progress, box_image_size, false)
-          end
+            # Create new volume in storage pool
+            box_image_size = File.size(box_image_file) # B
+            message = "Creating volume #{env[:box_volume_name]}"
+            message << " in storage pool #{config.storage_pool_name}."
+            @logger.info(message)
+            begin
+              fog_volume = env[:libvirt_compute].volumes.create(
+                name:         env[:box_volume_name],
+                allocation:   "#{box_image_size/1024/1024}M",
+                capacity:     "#{box_virtual_size}G",
+                format_type:  box_format,
+                pool_name:    config.storage_pool_name)
+            rescue Fog::Errors::Error => e
+              raise Errors::FogCreateVolumeError,
+                :error_message => e.message
+            end
 
-          # Clear the line one last time since the progress meter doesn't
-          # disappear immediately.
-          env[:ui].clear_line
+            # Upload box image to storage pool
+            ret = upload_image(box_image_file, config.storage_pool_name,
+              env[:box_volume_name], env) do |progress|
+                env[:ui].clear_line
+                env[:ui].report_progress(progress, box_image_size, false)
+            end
 
-          # If upload failed or was interrupted, remove created volume from
-          # storage pool.
-          if env[:interrupted] || !ret
-            begin
-              fog_volume.destroy
-            rescue
-              nil
+            # Clear the line one last time since the progress meter doesn't
+            # disappear immediately.
+            env[:ui].clear_line
+
+            # If upload failed or was interrupted, remove created volume from
+            # storage pool.
+            if env[:interrupted] || !ret
+              begin
+                fog_volume.destroy
+              rescue
+                nil
+              end
             end
           end
 

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

@@ -6,38 +6,44 @@ module VagrantPlugins
       class HandleStoragePool
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::handle_storage_pool")
           @app = app
         end
 
         def call(env)
-          # Get config options.
-          config = env[:machine].provider_config
-
-          # Check for storage pool, where box image should be created
-          fog_pool = ProviderLibvirt::Util::Collection.find_matching(
-            env[:libvirt_compute].pools.all, config.storage_pool_name)
-          return @app.call(env) if fog_pool
-
-          @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
-
-          # If user specified other pool than default, don't create default
-          # storage pool, just write error message.
-          raise Errors::NoStoragePool if config.storage_pool_name != 'default'
-
-          @logger.info("Creating storage pool 'default'")
-
-          # Fog libvirt currently doesn't support creating pools. Use
-          # ruby-libvirt client directly.
-          begin
-            libvirt_pool = env[:libvirt_compute].client.create_storage_pool_xml(
-              to_xml('default_storage_pool'))
-          rescue => e
-            raise Errors::CreatingStoragePoolError,
-              :error_message => e.message
+          @@lock.synchronize do
+            # Get config options.
+            config = env[:machine].provider_config
+
+            # Check for storage pool, where box image should be created
+            fog_pool = ProviderLibvirt::Util::Collection.find_matching(
+              env[:libvirt_compute].pools.all, config.storage_pool_name)
+            return @app.call(env) if fog_pool
+
+            @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
+
+            # If user specified other pool than default, don't create default
+            # storage pool, just write error message.
+            raise Errors::NoStoragePool if config.storage_pool_name != 'default'
+
+            @logger.info("Creating storage pool 'default'")
+
+            # Fog libvirt currently doesn't support creating pools. Use
+            # ruby-libvirt client directly.
+            begin
+              libvirt_pool = env[:libvirt_compute].client.define_storage_pool_xml(
+                to_xml('default_storage_pool'))
+              libvirt_pool.build
+              libvirt_pool.create
+            rescue => e
+              raise Errors::CreatingStoragePoolError,
+                :error_message => e.message
+            end
+            raise Errors::NoStoragePool if !libvirt_pool
           end
-          raise Errors::NoStoragePool if !libvirt_pool
 
           @app.call(env)
         end

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

@@ -14,7 +14,7 @@
   <% end %>
 
   <os>
-    <type arch='x86_64'>hvm</type>
+    <type>hvm</type>
     <boot dev='hd'/>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>

data/lib/vagrant-libvirt/version.rb

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

data/vagrant-libvirt.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |gem|
   gem.authors       = ['Lukas Stanek','Dima Vasilets','Brian Pitts']
   gem.email         = ['ls@elostech.cz','pronix.service@gmail.com','brian@polibyte.com']
   gem.license       = 'MIT'
-  gem.description   = %q{Vagrant provider for libvirt.}
-  gem.summary       = %q{Vagrant provider for libvirt.}
+  gem.description   = %q{libvirt provider for Vagrant.}
+  gem.summary       = %q{libvirt provider for Vagrant.}
   gem.homepage      = 'https://github.com/pradels/vagrant-libvirt'
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -110,7 +110,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Vagrant provider for libvirt.
+description: libvirt provider for Vagrant.
 email:
 - ls@elostech.cz
 - pronix.service@gmail.com
@@ -205,12 +205,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Vagrant provider for libvirt.
+summary: libvirt provider for Vagrant.
 test_files:
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
 - spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
-has_rdoc: