vagrant-libvirt 0.0.35 → 0.0.36

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

@@ -12,7 +12,7 @@ module VagrantPlugins
         end
 
         def _disk_name(name, disk)
-          "#{name}-#{disk[:device]}.#{disk[:type]}"	# disk name
+          "#{name}-#{disk[:device]}.#{disk[:type]}"  # disk name
         end
 
         def _disks_print(disks)
@@ -37,6 +37,7 @@ module VagrantPlugins
           @cpu_mode = config.cpu_mode
           @cpu_model = config.cpu_model
           @cpu_fallback = config.cpu_fallback
+          @numa_nodes = config.numa_nodes
           @loader = config.loader
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
@@ -88,6 +89,9 @@ module VagrantPlugins
           # USB device passthrough
           @usbs = config.usbs
 
+          # RNG device passthrough
+          @rng =config.rng
+
           config = env[:machine].provider_config
           @domain_type = config.driver
 
@@ -191,7 +195,8 @@ module VagrantPlugins
 
           @disks.each do |disk|
             msg = " -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}"
-            msg += ' (shared. Remove only manually)' if disk[:allow_existing]
+            msg += ' Shared' if disk[:shareable]
+            msg += ' (Remove only manually)' if disk[:allow_existing]
             msg += ' Not created - using existed.' if disk[:preexisting]
             env[:ui].info(msg)
           end
@@ -217,6 +222,10 @@ module VagrantPlugins
             env[:ui].info(" -- PCI passthrough:   #{pci[:bus]}:#{pci[:slot]}.#{pci[:function]}")
           end
 
+          if !@rng[:model].nil?
+            env[:ui].info(" -- RNG device model:  #{@rng[:model]}")
+          end
+
           @usbs.each do |usb|
             usb_dev = []
             usb_dev.push("bus=#{usb[:bus]}") if usb[:bus]

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
           @nic_adapter_count = config.nic_adapter_count
           @app = app
         end
@@ -69,7 +69,7 @@ module VagrantPlugins
             @network_name = iface_configuration[:network_name]
             @mac = iface_configuration.fetch(:mac, false)
             @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
-	    @device_name = iface_configuration.fetch(:iface_name, false)
+            @device_name = iface_configuration.fetch(:iface_name, false)
             template_name = 'interface'
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
@@ -82,6 +82,7 @@ module VagrantPlugins
               template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
               @ovs = iface_configuration.fetch(:ovs, false)
+              @trust_guest_rx_filters = iface_configuration.fetch(:trust_guest_rx_filters, false)
             # configuration for udp or tcp tunnel interfaces (p2p conn btwn guest OSes)
             elsif iface_configuration.fetch(:tunnel_type, nil)
               @type = iface_configuration.fetch(:tunnel_type)

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

@@ -210,10 +210,19 @@ module VagrantPlugins
           network = lookup_network_by_name(@options[:network_name])
           @interface_network = network if network
 
-          # if this interface has a network address, something's wrong.
-          if @interface_network[:network_address]
-            raise Errors::NetworkNotAvailableError,
-                  network_name: @options[:network_name]
+          if @options[:libvirt__forward_mode] == "veryisolated"
+            # if this interface has a network address, something's wrong.
+            if @interface_network[:network_address]
+              raise Errors::NetworkNotAvailableError,
+                    network_name: @options[:network_name]
+            end
+          else
+            if !@interface_network
+              raise Errors::NetworkNotAvailableError,
+                    network_name: @options[:network_name]
+            else
+              verify_dhcp
+            end
           end
 
           # Do we need to create new network?

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

@@ -111,7 +111,7 @@ module VagrantPlugins
               @env[:ui].info 'Requesting sudo for host port(s) <= 1024'
               r = system('sudo -v')
               if r
-                ssh_cmd << 'sudo '	# add sudo prefix
+                ssh_cmd << 'sudo '  # add sudo prefix
               end
             end
           end
@@ -175,7 +175,7 @@ module VagrantPlugins
               kill_cmd = ''
 
               if tag[:port] <= 1024
-                kill_cmd << 'sudo '	# add sudo prefix
+                kill_cmd << 'sudo '  # add sudo prefix
               end
 
               kill_cmd << "kill #{tag[:pid]}"

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

@@ -39,7 +39,7 @@ module VagrantPlugins
         #
         # @param [Machine] machine
         # @return [String]
-	def read_host_ip(ip)
+        def read_host_ip(ip)
           UDPSocket.open do |s|
             if(ip.kind_of?(Array))
               s.connect(ip.last, 1)

data/lib/vagrant-libvirt/config.rb

@@ -62,6 +62,7 @@ module VagrantPlugins
       attr_accessor :cpu_model
       attr_accessor :cpu_fallback
       attr_accessor :cpu_features
+      attr_accessor :numa_nodes
       attr_accessor :loader
       attr_accessor :boot_order
       attr_accessor :machine_type
@@ -110,6 +111,9 @@ module VagrantPlugins
       # PCI device passthrough
       attr_accessor :pcis
 
+      # Random number device passthrough
+      attr_accessor :rng
+
       # USB device passthrough
       attr_accessor :usbs
 
@@ -143,6 +147,7 @@ module VagrantPlugins
         @cpu_model         = UNSET_VALUE
         @cpu_fallback      = UNSET_VALUE
         @cpu_features      = UNSET_VALUE
+        @numa_nodes        = UNSET_VALUE
         @loader            = UNSET_VALUE
         @machine_type      = UNSET_VALUE
         @machine_arch      = UNSET_VALUE
@@ -173,10 +178,10 @@ module VagrantPlugins
         @nic_adapter_count = UNSET_VALUE
 
         # Boot order
-        @boot_order = []
+        @boot_order        = []
         # Storage
         @disks             = []
-        @cdroms			   = []
+        @cdroms            = []
 
         # Inputs
         @inputs            = UNSET_VALUE
@@ -187,6 +192,9 @@ module VagrantPlugins
         # PCI device passthrough
         @pcis              = UNSET_VALUE
 
+        # Random number device passthrough
+        @rng              = UNSET_VALUE
+
         # USB device passthrough
         @usbs              = UNSET_VALUE
 
@@ -198,15 +206,15 @@ module VagrantPlugins
       end
 
       def boot(device)
-        @boot_order << device	# append
+        @boot_order << device  # append
       end
 
       def _get_device(disks)
         # 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...
+        skip = 1  # we're 1 based, not 0 based...
         while true do
-          dev = skip.vdev	# get lettered device
+          dev = skip.vdev  # get lettered device
           if !exist.include?(dev)
             return dev
           end
@@ -232,6 +240,33 @@ module VagrantPlugins
         raise 'Only four cdroms may be attached at a time'
       end
 
+      def _generate_numa
+        if @cpus % @numa_nodes != 0
+          raise 'NUMA nodes must be a factor of CPUs'
+        end
+
+        if @memory % @numa_nodes != 0
+          raise 'NUMA nodes must be a factor of memory'
+        end
+
+        numa = []
+
+        (1..@numa_nodes).each do |node|
+          numa_cpu_start = (@cpus / @numa_nodes) * (node - 1)
+          numa_cpu_end = (@cpus / @numa_nodes) * node - 1
+          numa_cpu = Array(numa_cpu_start..numa_cpu_end).join(',')
+          numa_mem = @memory / @numa_nodes
+
+          numa.push({
+            id: node,
+            cpu: numa_cpu,
+            mem: numa_mem
+          })
+        end
+
+        @numa_nodes = numa
+      end
+
       def cpu_feature(options={})
         if options[:name].nil? || options[:policy].nil?
           raise 'CPU Feature name AND policy must be specified'
@@ -288,6 +323,18 @@ module VagrantPlugins
         })
       end
 
+      def random(options={})
+        if !options[:model].nil? && options[:model] != "random"
+          raise 'The only supported rng backend is "random".'
+        end
+
+        if @rng == UNSET_VALUE
+          @rng = {}
+        end
+
+        @rng[:model] = options[:model]
+      end
+
       def pci(options={})
         if options[:bus].nil? || options[:slot].nil? || options[:function].nil?
           raise 'Bus AND slot AND function must be specified. Check `lspci` for that numbers.'
@@ -363,7 +410,7 @@ module VagrantPlugins
         options = {
           :device => _get_device(@disks),
           :type => 'qcow2',
-          :size => '10G',	# matches the fog default
+          :size => '10G',  # matches the fog default
           :path => nil,
           :bus => 'virtio'
         }.merge(options)
@@ -376,9 +423,10 @@ module VagrantPlugins
           :bus => options[:bus],
           :cache => options[:cache] || 'default',
           :allow_existing => options[:allow_existing],
+          :shareable => options[:shareable],
         }
 
-        @disks << disk	# append
+        @disks << disk  # append
       end
 
       # code to generate URI from a config moved out of the connect action
@@ -397,7 +445,7 @@ module VagrantPlugins
           raise "Require specify driver #{uri}"
         end
         if uri == 'kvm'
-          uri = 'qemu'	# use qemu uri for kvm domain type
+          uri = 'qemu'  # use qemu uri for kvm domain type
         end
 
         if @connect_via_ssh
@@ -457,6 +505,7 @@ module VagrantPlugins
         @cpu_model = 'qemu64' if @cpu_model == UNSET_VALUE
         @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
         @cpu_features = [] if @cpu_features == UNSET_VALUE
+        @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa()
         @loader = nil if @loader == UNSET_VALUE
         @machine_type = nil if @machine_type == UNSET_VALUE
         @machine_arch = nil if @machine_arch == UNSET_VALUE
@@ -504,6 +553,9 @@ module VagrantPlugins
         # PCI device passthrough
         @pcis = [] if @pcis == UNSET_VALUE
 
+        # Random number generator passthrough
+        @rng = {} if @rng == UNSET_VALUE
+
         # USB device passthrough
         @usbs = [] if @usbs == UNSET_VALUE
 

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

@@ -15,6 +15,14 @@
       <% @cpu_features.each do |cpu_feature| %>
         <feature name='<%= cpu_feature[:name] %>' policy='<%= cpu_feature[:policy] %>'/>
       <% end %>
+    <% else %>
+      <% if @numa_nodes %>
+        <numa>
+          <% @numa_nodes.each do |node| %>
+            <cell id='<%= node[:id] %>' cpus='<%= node[:cpu] %>' memory='<%= node[:mem] %>'/>
+          <% end %>
+        </numa>
+      <% end %>
     <% end %>
   </cpu>
 
@@ -75,6 +83,9 @@
       <driver name='qemu' type='<%= d[:type] %>' cache='<%= d[:cache] %>'/>
       <source file='<%= d[:absolute_path] %>'/>
       <target dev='<%= d[:device] %>' bus='<%= d[:bus] %>'/>
+      <% if d[:shareable] %>
+        <shareable/>
+      <% end %>
 <%# this will get auto generated by libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>
@@ -129,6 +140,11 @@
       </video>
       <%#End Video -%>
     <% end %>
+    <% if @rng[:model] == "random"%>
+      <rng model='virtio'>
+        <backend model='random'>/dev/random</backend>
+      </rng>
+    <% end %>
     <% @pcis.each do |pci| %>
       <hostdev mode='subsystem' type='pci' managed='yes'>
         <source>

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

@@ -1,13 +1,13 @@
 <interface type='network'>
   <source network='<%= @network_name %>'/>
-	<% if @mac %>
-  	<mac address='<%= @mac %>'/>
-	<% end %>
-	<% if @device_name %>
-	<target dev='<%= @device_name %>'/>
-	<% else %>
-	<target dev='vnet<%= @iface_number %>'/>
-	<% end %>
+    <% if @mac %>
+      <mac address='<%= @mac %>'/>
+    <% end %>
+    <% if @device_name %>
+      <target dev='<%= @device_name %>'/>
+    <% else %>
+      <target dev='vnet<%= @iface_number %>'/>
+    <% end %>
   <alias name='net<%= @iface_number %>'/>
   <model type='<%=@model_type%>'/>
 </interface>

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

@@ -1,4 +1,4 @@
-<interface type='<%= @type %>'>
+<interface type='<%= @type %>'<% if @trust_guest_rx_filters %> trustGuestRxFilters='yes'<% end %>>
   <% if @mac %>
   <mac address='<%= @mac %>'/>
   <% end %>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.35'
+    VERSION = '0.0.36'
   end
 end

data/tools/prepare_redhat_for_box.sh

@@ -12,17 +12,17 @@
 
 # We need to set a hostname.
 if [ $# -ne 1 ]; then
-	echo "Usage: $0 <hostname>"
-	echo "Hostname should be in format vagrant-[os-name], e.g. vagrant-redhat63."
-	exit 1
+    echo "Usage: $0 <hostname>"
+    echo "Hostname should be in format vagrant-[os-name], e.g. vagrant-redhat63."
+    exit 1
 fi
 
 
 # On which version of RedHet are we running?
 RHEL_MAJOR_VERSION=$(sed 's/.*release \([0-9]\)\..*/\1/' /etc/redhat-release)
 if [ $? -ne 0 ]; then
-	echo "Is this a RedHat distro?"
-	exit 1
+    echo "Is this a RedHat distro?"
+    exit 1
 fi
 echo "* Found RedHat ${RHEL_MAJOR_VERSION} version."
 
@@ -30,9 +30,9 @@ echo "* Found RedHat ${RHEL_MAJOR_VERSION} version."
 # Setup hostname vagrant-something.
 FQDN="$1.vagrantup.com"
 if grep '^HOSTNAME=' /etc/sysconfig/network > /dev/null; then
-	sed -i 's/HOSTNAME=\(.*\)/HOSTNAME='${FQDN}'/' /etc/sysconfig/network
+    sed -i 's/HOSTNAME=\(.*\)/HOSTNAME='${FQDN}'/' /etc/sysconfig/network
 else
-	echo "HOSTNAME=${FQDN}" >> /etc/sysconfig/network
+    echo "HOSTNAME=${FQDN}" >> /etc/sysconfig/network
 fi
 
 
@@ -40,11 +40,11 @@ fi
 yum -y install wget
 cd ~root
 if [ $RHEL_MAJOR_VERSION -eq 5 ]; then
-	wget http://ftp.astral.ro/mirrors/fedora/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-	EPEL_PKG="epel-release-5-4.noarch.rpm"
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+    EPEL_PKG="epel-release-5-4.noarch.rpm"
 else
-	wget http://ftp.astral.ro/mirrors/fedora/pub/epel/6/i386/epel-release-6-8.noarch.rpm
-	EPEL_PKG="epel-release-6-8.noarch.rpm"
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+    EPEL_PKG="epel-release-6-8.noarch.rpm"
 fi
 rpm -i ~root/${EPEL_PKG}
 rm -f ~root/${EPEL_PKG}
@@ -60,9 +60,9 @@ chkconfig sshd on
 echo 'vagrant' | passwd --stdin root
 grep 'vagrant' /etc/passwd > /dev/null
 if [ $? -ne 0 ]; then
-	echo '* Creating user vagrant.'
-	useradd vagrant
-	echo 'vagrant' | passwd --stdin vagrant
+    echo '* Creating user vagrant.'
+    useradd vagrant
+    echo 'vagrant' | passwd --stdin vagrant
 fi
 grep '^admin:' /etc/group > /dev/null || groupadd admin
 usermod -G admin vagrant

data/vagrant-libvirt.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec-expectations", "~> 2.14.0"
   gem.add_development_dependency "rspec-mocks", "~> 2.14.0"
 
-  gem.add_runtime_dependency 'fog-libvirt', '0.0.3'
+  gem.add_runtime_dependency 'fog-libvirt', '>= 0.3.0'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6.0'
 
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -58,16 +58,16 @@ dependencies:
   name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement