vagrant-libvirt 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 163bfaa2d6099827892e25c54b696ae99be739a4
-  data.tar.gz: fa6669dc8ad9ffbfa81bd36d04ed07b886a77964
+  metadata.gz: 67a89ffdbbe10d25e43c0029df99b9755cc32480
+  data.tar.gz: 7fb86a0a3312d4fe0c1851486188cf90644015c6
 SHA512:
-  metadata.gz: 5c9c79db505309da293ae7919bf843ef4650b620a45cffa1a3dd81952d13569b7a2d2dbcc77d771fdc5d50fdf557364316518254c905b276cc5f098faa66c0d6
-  data.tar.gz: 8db3d0bea7fc78083c403b78ff1b7b20bb22cefdd90ef31ce3fe4757082e16c2a144a237b4fa13a563ff804ce5f85192084252baa1278aa461b4a41b3df14cac
+  metadata.gz: 74f6ddbd5fb0f41421e43ada6671af768ec770ddf06125c961b5df6a3fd06c4585c53bd0f459612310f3ece6b2c587d2d860daa7d5a467043cbc12a3cc84a649
+  data.tar.gz: a0ba44421fabc6ba09ed061352b1cf9cadbc488094991d8326585d169b6eb574c932d11a5721b38fe978dad0c06cd5191cec38fffae7a6b3f7710b8e0be2d527

data/README.md

@@ -155,7 +155,7 @@ end
 * `graphics_port` - Sets the port for the display protocol to bind to.  Defaults to 5900.
 * `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 are "cirrus", "std", "vmware", "qxl", "tcx", "cg3", or "none".
+* `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".
 * `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
 
 
@@ -253,6 +253,7 @@ starts with 'libvirt__' string. Here is a list of those options:
   modes are available from the [libvirt documentation](http://www.libvirt.org/formatdomain.html#elementsNICSDirect).
   Default mode is 'bridge'.
 * `:mac` - MAC address for the interface.
+* `:ovs` - Support to connect to an open vSwitch bridge device. Default is 'false'.
 
 ### Management Network
 
@@ -281,6 +282,8 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`.
 * `device` - Name of the device node the disk image will have in the VM, e.g. *vdb*. If unspecified, the next available device is chosen.
 * `size` - Size of the disk image. If unspecified, defaults to 10G.
 * `type` - Type of disk image to create. Defaults to *qcow2*.
+* `bus` - Type of bus to connect device to. Defaults to *virtio*.
+* `cache` - Cache mode to use, e.g. `none`, `writeback`, `writethrough` (see the [libvirt documentation for possible values](http://libvirt.org/formatdomain.html#elementsDisks) or [here](https://www.suse.com/documentation/sles11/book_kvm/data/sect1_chapter_book_kvm.html) for a fuller explanation). Defaults to *default*.
 
 The following example creates two additional disks.
 

data/lib/vagrant-libvirt.rb

@@ -27,13 +27,3 @@ module VagrantPlugins
     end
   end
 end
-
-# set provider by bash env
-# export VAGRANT_DEFAULT_PROVIDER=libvirt
-Vagrant::Environment.class_eval do
-  def default_provider
-    (ENV['VAGRANT_DEFAULT_PROVIDER'] || :virtualbox).to_sym
-  end
-end
-
-

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

@@ -66,19 +66,24 @@ module VagrantPlugins
           storage_prefix = File.dirname(@domain_volume_path)+'/'	# steal
 
           @disks.each do |disk|
-            disk[:name] = _disk_name(@name, disk)
-            if disk[:path].nil?
-              disk[:path] = "#{storage_prefix}#{_disk_name(@name, disk)}"	# automatically chosen!
-            end
+
+            disk[:path] ||= _disk_name(@name, disk)
+
+            # On volume creation, the <path> element inside <target>
+            # is oddly ignored; instead the path is taken from the
+            # <name> element:
+            # http://www.redhat.com/archives/libvir-list/2008-August/msg00329.html
+            disk[:name] = disk[:path]
+
+            disk[:absolute_path] = storage_prefix + disk[:path]
 
             # make the disk. equivalent to:
             # qemu-img create -f qcow2 <path> 5g
             begin
-              #puts "Making disk: #{d}, #{t}, #{p}"
               domain_volume_disk = env[:libvirt_compute].volumes.create(
                 :name => disk[:name],
                 :format_type => disk[:type],
-                :path => disk[:path],
+                :path => disk[:absolute_path],
                 :capacity => disk[:size],
                 #:allocation => ?,
                 :pool_name => @storage_pool_name)
@@ -111,7 +116,7 @@ module VagrantPlugins
             env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
           end
           @disks.each do |disk|
-            env[:ui].info(" -- Disk(#{disk[:device]}):     #{disk[:path]}")
+            env[:ui].info(" -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}")
           end
           env[:ui].info(" -- Command line : #{@cmd_line}")
 

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

@@ -79,6 +79,7 @@ module VagrantPlugins
               @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}")
+              @ovs = iface_configuration.fetch(:ovs, false)
             end
 
             message = "Creating network interface eth#{@iface_number}"

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

@@ -83,7 +83,8 @@ module VagrantPlugins
                           gateway_ports)
           ssh_info = machine.ssh_info
           params = %W(
-            "-L #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}"
+            -L
+            #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}
             -N
             #{ssh_info[:host]}
           ).join(' ')
@@ -118,7 +119,20 @@ module VagrantPlugins
           ssh_cmd << "ssh #{options} #{params}"
 
           @logger.debug "Forwarding port with `#{ssh_cmd}`"
-          spawn(ssh_cmd,  [:out, :err] => '/dev/null')
+          log_file = ssh_forward_log_file(host_ip, host_port,
+                                          guest_ip, guest_port)
+          @logger.info "Logging to #{log_file}"
+          spawn(ssh_cmd,  [:out, :err] => [log_file, 'w'])
+        end
+
+        def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port)
+          log_dir = @env[:machine].data_dir.join('logs')
+          log_dir.mkdir unless log_dir.directory?
+          File.join(
+            log_dir,
+            'ssh-forwarding-%s_%s-%s_%s.log' %
+              [ host_ip, host_port, guest_ip, guest_port ]
+          )
         end
 
         def store_ssh_pid(host_port, ssh_pid)

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

@@ -44,7 +44,7 @@ module VagrantPlugins
             domain = env[:libvirt_compute].servers.get(machine.id.to_s)
             xml=Nokogiri::XML(domain.to_xml)
             networkname = xml.xpath('/domain/devices/interface/source').first.attributes['network'].value.to_s
-            puts "network name = #{networkname}"
+            @logger.info("Using network named #{networkname}")
             net = env[:libvirt_compute].list_networks.find {|netw| netw[:name] == networkname}
           end
           # FIXME better implement by libvirt xml parsing

data/lib/vagrant-libvirt/config.rb

@@ -131,11 +131,10 @@ module VagrantPlugins
           :type => 'qcow2',
           :size => '10G',	# matches the fog default
           :path => nil,
+          :bus => 'virtio'
         }.merge(options)
 
         #puts "storage(#{storage_type} --- #{options.to_s})"
-        require 'pry'
-        binding.pry
         @disks = [] if @disks == UNSET_VALUE
 
         disk = {
@@ -143,6 +142,8 @@ module VagrantPlugins
           :type => options[:type],
           :size => options[:size],
           :path => options[:path],
+          :bus => options[:bus],
+          :cache => options[:cache] || 'default',
         }
 
         if storage_type == :file
@@ -242,7 +243,17 @@ module VagrantPlugins
       end
 
       def validate(machine)
+        errors = _detected_errors
+
+        machine.provider_config.disks.each do |disk|
+          if disk[:path] and disk[:path][0] == '/'
+            errors << "absolute volume paths like '#{disk[:path]}' not yet supported"
+          end
+        end
+
+         { "Libvirt Provider" => errors }
       end
+
     end
   end
 end

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

@@ -36,9 +36,9 @@
 <%# additional disks -%>
 <% @disks.each do |d| -%>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='<%= d[:type] %>'/>
-      <source file='<%= d[:path] %>'/>
-      <target dev='<%= d[:device] %>' bus='virtio'/>
+      <driver name='qemu' type='<%= d[:type] %>' cache='<%= d[:cache] %>'/>
+      <source file='<%= d[:absolute_path] %>'/>
+      <target dev='<%= d[:device] %>' bus='<%= d[:bus] %>'/>
 <%# this will get auto generated by libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>

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

@@ -1,6 +1,6 @@
 <interface type='<%= @type %>'>
-	<% if @mac %>
-  	<mac address='<%= @mac %>'/>
+  <% if @mac %>
+  <mac address='<%= @mac %>'/>
   <% end %>
   <%if @type == 'direct'%>
   <source dev='<%= @device %>' mode='<%= @mode %>'/>
@@ -8,6 +8,7 @@
   <source bridge='<%=@device%>'/>
   <% end %>
   <model type='<%=@model_type%>'/>
+  <% if @ovs %>
+  <virtualport type='openvswitch'/>
+  <% end %>
 </interface>
-
-

data/lib/vagrant-libvirt/version.rb

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

data/vagrant-libvirt.gemspec

@@ -5,7 +5,7 @@ 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. support a lot options}
+  gem.description   = %q{Vagrant provider for libvirt.}
   gem.summary       = %q{Vagrant provider for libvirt.}
   gem.homepage      = 'https://github.com/pradels/vagrant-libvirt'
 
@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
-  gem.add_development_dependency 'rspec-core', '2.12.2'
-  gem.add_development_dependency 'rspec-expectations', '2.12.1'
-  gem.add_development_dependency 'rspec-mocks', '2.12.1'
+  gem.add_development_dependency "rspec-core", "~> 2.12.2"
+  gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
 
-  gem.add_runtime_dependency 'fog', '1.15'
-  gem.add_runtime_dependency 'ruby-libvirt', '0.4.0'
+  gem.add_runtime_dependency 'fog', '~> 1.15'
+  gem.add_runtime_dependency 'ruby-libvirt', '~> 0.4'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6.0'
 
-  gem.add_development_dependency 'rake', '10.1.0'
+  gem.add_development_dependency 'rake'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,78 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-12-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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -100,17 +100,17 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
-description: Vagrant provider for libvirt. support a lot options
+        version: '0'
+description: Vagrant provider for libvirt.
 email:
 - ls@elostech.cz
 - pronix.service@gmail.com
@@ -213,3 +213,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
 - spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
+has_rdoc: