vagrant-libvirt 0.0.29 → 0.0.30

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWQxNDI3NzdkZmM1ZTBlNjZjOWQyODk4MmU1Mjk3YzEwOWNjYjhkOQ==
-  data.tar.gz: !binary |-
-    NGEzYjM1YTYyZjE1ZGUxNDlhYzIzMDZhMDRjN2VhNjFlN2FjZjA5Yg==
+SHA1:
+  metadata.gz: 354aaf9e080970fc3b9b0c6c2896f0a84bfc5c97
+  data.tar.gz: 7aca0e64a6714b9ef17456cda7ac91677fe6c9b1
 SHA512:
-  metadata.gz: !binary |-
-    Nzc4ZTMyODA1ZmFjNjNiZTU5ODU1MzBlN2FiODQ2YmFmMDRmMTViN2VjY2Vl
-    NTNjZDkxYTE0NjdjOGNhMWIxNjUxN2Y5YzQ0MzZmN2I0ZThmMTVkMTNmNTI2
-    YzgyOTQ3ZWVkYTNiZjhiYTVlMzVjMjI0NDA2NmZkMWQ5MDQ5MTY=
-  data.tar.gz: !binary |-
-    NmYzNWExNWI2NjdkNGM4ZjliMTc4YzFmOWU0N2UyYjY0YjkyZGRlN2EzYmMw
-    NGI5Yjk4NjY5YTVhYzQ2NjhlYmNhYzhiZmQwMGE5ZDY2ZDc4ODNmOTAyMGQx
-    MGFlNjE4ZDgxM2ZlOGIzOWU5ODZiOGI2NjAyOWVmYTJiMTU0ZWI=
+  metadata.gz: a9e8b0f86701dd6ddfe6d060ce4c6c90c0e0a8ac78e3128f964c31a8bec2d44dc73ed56e0e6d6b114988fbe40c67953ee30b46cbf7e90ec3651d1c0637d7a365
+  data.tar.gz: 8b8b59bc7eb122a2d56fa72d1ea412fd59974152d76a00652a8782456dae65b229fbfc9c8a21775f10d1b8fd1115db1f9a5cf948d425c0fe386bf1d758590373

data/Gemfile

@@ -7,11 +7,11 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # 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 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
   gem 'pry'
 end
 
 group :plugins do
-  gem "vagrant-libvirt", :path => '.'
+  gem 'vagrant-libvirt', :path => '.'
 end
 

data/README.md

@@ -170,6 +170,7 @@ end
 * `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.
 * `machine_arch` - Sets machine architecture. This helps libvirt to determine the correct emulator type. Possible values depend on your version of qemu. For possible values, see which emulator executable `qemu-system-*` your system provides. Common examples are `aarch64`, `alpha`, `arm`, `cris`, `i386`, `lm32`, `m68k`, `microblaze`, `microblazeel`, `mips`, `mips64`, `mips64el`, `mipsel`, `moxie`, `or32`, `ppc`, `ppc64`, `ppcemb`, `s390x`, `sh4`, `sh4eb`, `sparc`, `sparc64`, `tricore`, `unicore32`, `x86_64`, `xtensa`, `xtensaeb`.
+* `boot` - Change the boot order and enables the boot menu. Possible options are "hd" or "network". Defaults to "hd" with boot menu disabled.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -191,6 +192,23 @@ Vagrant.configure("2") do |config|
   # ...
 ```
 
+The following example shows part of a Vagrantfile that enables the VM to
+boot from a network interface first and a hard disk second. This could be
+used to run VMs that are meant to be a PXE booted machines.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :pxeclient do |pxeclient|
+    pxeclient.vm.box = "centos64"
+    pxeclient.vm.provider :libvirt do |domain|
+      domain.boot 'network'
+      domain.boot 'hd'
+    end
+  end
+
+  # ...
+```
+
 ## Networks
 
 Networking features in the form of `config.vm.network` support private networks

data/lib/vagrant-libvirt/action.rb

@@ -156,7 +156,14 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             if !env[:result]
-              b2.use MessageNotCreated
+              # Try to remove stale volumes anyway
+              b2.use ConnectLibvirt
+              b2.use SetNameOfDomain
+              b2.use RemoveStaleVolume
+              if !env[:result]
+                b2.use MessageNotCreated
+              end
+
               next
             end
 
@@ -338,6 +345,8 @@ module VagrantPlugins
       autoload :MessageNotRunning, action_root.join('message_not_running')
       autoload :MessageNotSuspended, action_root.join('message_not_suspended')
 
+      autoload :RemoveStaleVolume, action_root.join('remove_stale_volume')
+
       autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
       autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
       autoload :PruneNFSExports, action_root.join('prune_nfs_exports')

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

@@ -54,6 +54,9 @@ module VagrantPlugins
           @video_type = config.video_type
           @video_vram = config.video_vram
           @keymap = config.keymap
+          
+          # Boot order
+          @boot_order = config.boot_order
 
           # Storage
           @storage_pool_name = config.storage_pool_name
@@ -124,6 +127,10 @@ module VagrantPlugins
           env[:ui].info(" -- Video Type:        #{@video_type}")
           env[:ui].info(" -- Video VRAM:        #{@video_vram}")
           env[:ui].info(" -- Keymap:            #{@keymap}")
+          
+          @boot_order.each do |device|
+            env[:ui].info(" -- Boot device:        #{device}")
+          end
 
           if @disks.length > 0
             env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")

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

@@ -19,8 +19,8 @@ module VagrantPlugins
 
           if using_nfs?
             @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
-            env[:nfs_host_ip]    = read_host_ip(env[:machine])
             env[:nfs_machine_ip] = read_machine_ip(env[:machine])
+            env[:nfs_host_ip]    = read_host_ip(env[:nfs_machine_ip])
 
             @logger.info("host IP: #{env[:nfs_host_ip]} machine IP: #{env[:nfs_machine_ip]}")
 
@@ -39,9 +39,9 @@ module VagrantPlugins
         #
         # @param [Machine] machine
         # @return [String]
-        def read_host_ip(machine)
+        def read_host_ip(ip)
           UDPSocket.open do |s|
-            s.connect(machine.ssh_info[:host], 1)
+            s.connect(ip, 1)
             s.addr.last
           end
         end

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

@@ -20,6 +20,7 @@ module VagrantPlugins
 
         def read_ssh_info(libvirt, machine)
           return nil if machine.id.nil?
+          return nil if machine.state.id != :running
 
           # Find the machine
           domain = libvirt.servers.get(machine.id)
@@ -32,15 +33,23 @@ module VagrantPlugins
 
           # Get IP address from dnsmasq lease file.
           ip_address = nil
-          domain.wait_for(2) {
-            addresses.each_pair do |type, ip|
-              # Multiple leases are separated with a newline, return only
-              # the most recent address
-              ip_address = ip[0].split("\n").first if ip[0] != nil
+          begin
+            domain.wait_for(2) do
+              addresses.each_pair do |type, ip|
+                # Multiple leases are separated with a newline, return only
+                # the most recent address
+                ip_address = ip[0].split("\n").first if ip[0] != nil
+              end
+              ip_address != nil
             end
-            ip_address != nil
-          }
-          raise Errors::NoIpAddressError if not ip_address
+          rescue Fog::Errors::TimeoutError
+            @logger.info("Timeout at waiting for an ip address for machine %s" % machine.name)
+          end
+
+          if not ip_address
+            @logger.info("No lease found for machine %s" % machine.name)
+            return nil
+          end
 
           ssh_info = {
             :host          => ip_address,

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

@@ -0,0 +1,49 @@
+require 'log4r'
+#require 'log4r/yamlconfigurator'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class RemoveStaleVolume
+        def initialize(app, _env)
+
+#          log4r_config= YAML.load_file(File.join(File.dirname(__FILE__),"log4r.yaml"))
+#          log_cfg = Log4r::YamlConfigurator
+#          log_cfg.decode_yaml( log4r_config['log4r_config'] )
+
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::remove_stale_volume')
+          @app = app
+        end
+
+        def call(env)
+          # Remove stale server volume
+          env[:ui].info(I18n.t('vagrant_libvirt.remove_stale_volume'))
+
+          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)
+          @logger.debug("**** Pool #{fog_pool.name}")
+
+          # This is name of newly created image for vm.
+          name = "#{env[:domain_name]}.img"
+          @logger.debug("**** Volume name #{name}")
+
+          # remove root storage
+          box_volume = ProviderLibvirt::Util::Collection.find_matching(
+            env[:libvirt_compute].volumes.all, name)
+          if box_volume && box_volume.pool_name == fog_pool.name
+            @logger.info("Deleting volume #{box_volume.key}")
+            box_volume.destroy
+            env[:result] = box_volume
+          else
+            env[:result] = nil
+          end
+
+          # Continue the middleware chain.
+          @app.call(env)
+        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 :boot_order
       attr_accessor :machine_type
       attr_accessor :machine_arch
       attr_accessor :disk_bus
@@ -113,10 +114,16 @@ module VagrantPlugins
         @video_vram        = UNSET_VALUE
         @keymap            = UNSET_VALUE
 
+        # Boot order
+        @boot_order = []
         # Storage
         @disks             = []
         @cdroms			       = []
       end
+      
+      def boot(device)
+        @boot_order << device	# append
+      end
 
       def _get_device(disks)
         # skip existing devices and also the first one (vda)
@@ -299,6 +306,9 @@ module VagrantPlugins
         @video_type = 'cirrus' if @video_type == UNSET_VALUE
         @video_vram = 9216 if @video_vram == UNSET_VALUE
         @keymap = 'en-us' if @keymap == UNSET_VALUE
+        
+        # Boot order
+        @boot_order = [] if @boot_order == UNSET_VALUE
 
         # Storage
         @disks = [] if @disks == UNSET_VALUE

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

@@ -27,7 +27,14 @@
         <type>hvm</type>
       <% end %>
     <% end %>
-    <boot dev='hd'/>
+    <% if @boot_order.count >= 1 %>
+      <% @boot_order.each do |b| %>
+        <boot dev='<%= b %>'/>
+      <% end %> 
+      <bootmenu enable='yes'/>
+    <% else %>
+      <boot dev='hd' />
+    <% end %>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
     <cmdline><%= @cmd_line %></cmdline>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.29'
+    VERSION = '0.0.30'
   end
 end

data/locales/en.yml

@@ -44,6 +44,8 @@ en:
       Rsyncing folder: %{hostpath} => %{guestpath}
     ready: |-
       Machine is booted and ready for use!
+    remove_stale_volume: |-
+      Remove stale volume...
 
     errors:
       package_not_supported: Not support package for libvirt. Create box manualy.

data/spec/support/environment_helper.rb

@@ -19,7 +19,7 @@ class EnvironmentHelper
     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|
+  %w(cpus cpu_mode boot_order 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: libvirt provider for Vagrant.
@@ -105,7 +105,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -142,6 +142,7 @@ files:
 - lib/vagrant-libvirt/action/read_ssh_info.rb
 - lib/vagrant-libvirt/action/read_state.rb
 - lib/vagrant-libvirt/action/remove_libvirt_image.rb
+- lib/vagrant-libvirt/action/remove_stale_volume.rb
 - lib/vagrant-libvirt/action/resume_domain.rb
 - lib/vagrant-libvirt/action/set_name_of_domain.rb
 - lib/vagrant-libvirt/action/share_folders.rb
@@ -186,12 +187,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []