vagrant-libvirt 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83974c73aa002ac05b8add5ba4b4e3adff53c729
-  data.tar.gz: 00d6184e958b478752de82b38150b98d5328eafd
+  metadata.gz: 3fdf8fd6ca4373ada92ce1485825e511b1fdd31c
+  data.tar.gz: ec35f9ff56aedd836339cde2f3a1d6e387ef03d3
 SHA512:
-  metadata.gz: 846e3a40da1e4223aaada5eed447656c339127da0b81a47a27009b338c7f9a3bde75108ea8ed2070b71c06b03ce0ca9779e6f592bd12c81da1456bc2d2e34430
-  data.tar.gz: 6f38f979224bbeed6f37fee8ffc54c6f8f2fc7d4c51a3bbd9cd2b1b416bda942d3b02f53eb776378b12621e37da566433c0751b5638769456dbf823e8a552faf
+  metadata.gz: db2d803e5384f118a5380c18536ebd190a397aacdb4e3cacbd09365100210b681737bdbd7a4be8ac085d724f10777a42963bd5023e0b57919e4e43ca47780eea
+  data.tar.gz: a5243fd03b92a76e0a921ed93a061bd5b0161568a60905f074d5c37a5f6a8706db98d94d0273b91162817c1cf98ec609f5d3ec331605891b67a98f64c089763d

data/README.md

@@ -141,6 +141,7 @@ end
 ### Domain Specific Options
 
 * `disk_bus` - The type of disk device to emulate. Defaults to virtio if not set. Possible values are documented in libvirt's [description for _target_](http://libvirt.org/formatdomain.html#elementsDisks).
+* `nic_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
 * `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.
@@ -238,6 +239,7 @@ starts with 'libvirt__' string. Here is a list of those options:
   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
 
 ### Public Network Options
 * `:dev` - Physical device that the public interface should use. Default is 'eth0'.
@@ -309,6 +311,12 @@ 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 an additional `forwarded_port` option
+`gateway_ports` which defaults to `false`, but can be set to `true` if
+you want the forwarded port to be accessible from outside the Vagrant
+host.  In this case you should also set the `host_ip` option to `'*'`
+since it defaults to `'localhost'`.
+
 ## Synced Folders
 
 vagrant-libvirt supports bidirectional synced folders via nfs or 9p and

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

@@ -17,6 +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
           @app = app
         end
 
@@ -66,6 +68,7 @@ module VagrantPlugins
             @iface_number = slot_number
             @network_name = iface_configuration[:network_name]
             @mac = iface_configuration.fetch(:mac, false)
+            @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
             template_name = 'interface'
 
             # Configuration for public interfaces which use the macvtap driver
@@ -73,7 +76,7 @@ module VagrantPlugins
               @device = iface_configuration.fetch(:dev, 'eth0')
               @type = iface_configuration.fetch(:type, 'direct')
               @mode = iface_configuration.fetch(:mode, 'bridge')
-              @model_type = iface_configuration.fetch(:model_type, 'e1000')
+              @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}")
             end

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

@@ -53,7 +53,8 @@ module VagrantPlugins
               fp[:host_ip] || 'localhost',
               fp[:host],
               fp[:guest_ip] || @env[:machine].provider.ssh_info[:host],
-              fp[:guest]
+              fp[:guest],
+              fp[:gateway_ports] || false
             )
             store_ssh_pid(fp[:host], ssh_pid)
           end
@@ -78,13 +79,15 @@ module VagrantPlugins
           mappings.values
         end
 
-        def redirect_port(machine, host_ip, host_port, guest_ip, guest_port)
+        def redirect_port(machine, host_ip, host_port, guest_ip, guest_port,
+                          gateway_ports)
           ssh_info = machine.ssh_info
           params = %W(
             "-L #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}"
             -N
             #{ssh_info[:host]}
           ).join(' ')
+          params += ' -g' if gateway_ports
 
           options = (%W(
             User=#{ssh_info[:username]}

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

@@ -6,7 +6,7 @@ module VagrantPlugins
       class MountP9
         extend Vagrant::Util::Retryable
 
-        def self.mount_p9_shared_folder(machine, folders, options)
+        def self.mount_p9_shared_folder(machine, folders)
           folders.each do |name, opts|
             # Expand the guest path so we can handle things like "~/vagrant"
             expanded_guest_path = machine.guest.capability(
@@ -19,9 +19,9 @@ module VagrantPlugins
             mount_tag = name.dup
 
             mount_opts="-o trans=virtio"
-            mount_opts += ",access=#{options[:owner]}" if options[:owner]
-            mount_opts += ",version=#{options[:version]}" if options[:version]
-            mount_opts += ",#{opts[:mount_options]}" if opts[:mount_options]
+            mount_opts += ",access=#{opts[:owner]}" if opts[:owner]
+            mount_opts += ",version=#{opts[:version]}" if opts[:version]
+            mount_opts += ",#{opts[:mount_opts]}" if opts[:mount_opts]
 
             mount_command = "mount -t 9p #{mount_opts} '#{mount_tag}' #{expanded_guest_path}"
             retryable(:on => Vagrant::Errors::LinuxMountFailed,

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

@@ -44,7 +44,7 @@ module VagrantPlugins
           # loop through folders
           folders.each do |id, folder_opts|
             folder_opts.merge!({ :accessmode => "passthrough",
-                                :readonly => nil })
+                                 :readonly => nil }) { |_k, ov, _nv| ov }
             machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{folder_opts}"
 
             xml =  to_xml('filesystem', folder_opts )
@@ -67,13 +67,12 @@ module VagrantPlugins
         mount_folders = {}
         folders.each do |id, opts|
           mount_folders[id] = opts.dup if opts[:guestpath]
+          # merge common options if not given
+          mount_folders[id].merge!(:version => '9p2000.L') { |_k, ov, _nv| ov }
         end
-        common_opts = {
-          :version => '9p2000.L',
-        }
         # Mount the actual folder
         machine.guest.capability(
-            :mount_p9_shared_folder, mount_folders, common_opts)
+            :mount_p9_shared_folder, mount_folders)
       end
 
       def cleanup(machine, _opts)

data/lib/vagrant-libvirt/config.rb

@@ -55,6 +55,7 @@ module VagrantPlugins
       attr_accessor :cpus
       attr_accessor :cpu_mode
       attr_accessor :disk_bus
+      attr_accessor :nic_model_type
       attr_accessor :nested
       attr_accessor :volume_cache
       attr_accessor :kernel
@@ -82,6 +83,7 @@ module VagrantPlugins
         @cpus              = UNSET_VALUE
         @cpu_mode          = UNSET_VALUE
         @disk_bus          = UNSET_VALUE
+        @nic_model_type    = UNSET_VALUE
         @nested            = UNSET_VALUE
         @volume_cache      = UNSET_VALUE
         @kernel            = UNSET_VALUE
@@ -198,6 +200,7 @@ module VagrantPlugins
         @cpus = 1 if @cpus == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == 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
         @volume_cache = 'default' if @volume_cache == UNSET_VALUE
         @kernel = nil if @kernel == UNSET_VALUE

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

@@ -5,6 +5,6 @@
 	<% end %>
   <target dev='vnet<%= @iface_number %>'/>
   <alias name='net<%= @iface_number %>'/>
-  <model type='virtio'/>
+  <model type='<%=@model_type%>'/>
 </interface>
 

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.20'
+    VERSION = '0.0.21'
   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.}
+  gem.description   = %q{Vagrant provider for libvirt. support a lot options}
   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 'nokogiri', '~> 1.6'
+  gem.add_runtime_dependency 'fog', '1.15'
+  gem.add_runtime_dependency 'ruby-libvirt', '0.4.0'
+  gem.add_runtime_dependency 'nokogiri', '1.6'
 
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '10.1.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,107 +10,107 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-17 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-description: Vagrant provider for libvirt.
+        version: 10.1.0
+description: Vagrant provider for libvirt. support a lot options
 email:
 - ls@elostech.cz
 - pronix.service@gmail.com