vagrant-libvirt 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222341781630e6677eb79c302c0d658e9684ff55c9ebc596de959e32186de2d7
-  data.tar.gz: ae974712832e934acf1d696365db7c42b5efb53521f8ebd7227bf9be3891f8cd
+  metadata.gz: c7f252cbd53f8459e02a21e94449e6fef1ce762f1d053433970015fad9d00fef
+  data.tar.gz: 54af8a7a564e8ffdd0f18d3d3eca44367ac7613fb4892af995c5d202d8e429ea
 SHA512:
-  metadata.gz: 7d839a81423674ae57497e45265d839b19477988074f86f98c421fc7da182f5fdfd8f5314fc6282f27a4454bab0979fd0b4b118d660ab6a92a26ad0ee40707a2
-  data.tar.gz: 2c424318fd5c566512f0237a5b00eae03ff0a89dd8186188870a89f82afd0989640f7367fdad3ee45e1d97f331cab20618a27c4bf019c7e7a84cb4f7e628aba9
+  metadata.gz: 00c708fba6fb82cec02b0b68730da87975964584b8b189bfcd77857b3b386ff81609bd135423872dcd04cd7e071f10f1cf7806d97b28565ed27464d2b2021857
+  data.tar.gz: abbbe10ad322fec1a49b9f3463fa7a50c9e46bce93c8c6aa505ca3c4fbd5e6a3b4bfa248e912d0608e5aefdd3427ce819e6bff9f0807da187a187c2e9085d13e

data/README.md

@@ -353,11 +353,11 @@ into_srpm.sh -d c8s
 cd SRPMS
 
 # common commands (make sure to adjust verison accordingly)
-rpm2cpio libssh-0.9.0-5.fc30.src.rpm | cpio -imdV
-tar xf libssh-0.9.0.tar.xz
+rpm2cpio libssh-0.9.4-1c8s.src.rpm | cpio -imdV
+tar xf libssh-0.9.4.tar.xz
 mkdir build
 cd build
-cmake ../libssh-0.9.0 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
+cmake ../libssh-0.9.4 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
 make
 sudo cp lib/libssh* /opt/vagrant/embedded/lib64
 ```
@@ -376,18 +376,21 @@ dnf download --source krb5-libs
 
 # centos 8 stream, doesn't provide source RPMs, so you need to download like so
 git clone https://git.centos.org/centos-git-common
+# make get_sources.sh executable as it is needed in krb5
+chmod +x centos-git-common/get_sources.sh 
 # centos-git-common needs its tools in PATH
 export PATH=$(readlink -f ./centos-git-common):$PATH
 git clone https://git.centos.org/rpms/krb5
 cd krb5
 git checkout imports/c8s/krb5-1.18.2-8.el8
+get_sources.sh
 into_srpm.sh -d c8s
 cd SRPMS
 
 # common commands (make sure to adjust verison accordingly)
-rpm2cpio krb5-1.18-1.fc32.src.rpm | cpio -imdV
-tar xf krb5-1.18.tar.gz
-cd krb5-1.18/src
+rpm2cpio krb5-1.18.2-8c8s.src.rpm | cpio -imdV
+tar xf krb5-1.18.2.tar.gz
+cd krb5-1.18.2/src
 ./configure
 make
 sudo cp -P lib/crypto/libk5crypto.* /opt/vagrant/embedded/lib64/

data/lib/vagrant-libvirt/action.rb

@@ -48,15 +48,12 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join('timed_provision')
       autoload :WaitTillUp, action_root.join('wait_till_up')
 
-      autoload :HandleBox, 'vagrant/action/builtin/handle_box'
       autoload :Package, 'vagrant/action/general/package'
       autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
       autoload :PackageSetupFolders, 'vagrant/action/general/package_setup_folders'
       autoload :ProvisionerCleanup, 'vagrant/action/builtin/provisioner_cleanup'
       autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
       autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
-      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
-      autoload :WaitForCommunicator, 'vagrant/action/builtin/wait_for_communicator'
 
       # Include the built-in & general modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
@@ -93,6 +90,7 @@ module VagrantPlugins
                 b2.use SetupComplete
               else
                 b2.use HandleStoragePool
+                require 'vagrant/action/builtin/handle_box'
                 b2.use HandleBox
                 b2.use HandleBoxImage
                 b2.use CreateDomainVolume
@@ -144,6 +142,7 @@ module VagrantPlugins
                 # VM is not running or suspended.
                 b3.use PrepareNFSValidIds
                 b3.use SyncedFolderCleanup
+                require 'vagrant/action/builtin/synced_folders'
                 b3.use SyncedFolders
                 b3.use PrepareNFSSettings
                 b3.use ShareFolders
@@ -156,6 +155,7 @@ module VagrantPlugins
                 # Machine should gain IP address when comming up,
                 # so wait for dhcp lease and store IP into machines data_dir.
                 b3.use WaitTillUp
+                require 'vagrant/action/builtin/wait_for_communicator'
                 b3.use WaitForCommunicator, [:running]
 
                 b3.use ForwardPorts
@@ -213,6 +213,7 @@ module VagrantPlugins
             end
 
             b2.use ConfigValidate
+            b2.use Provision
             b2.use action_halt
             b2.use action_start
           end
@@ -353,6 +354,7 @@ module VagrantPlugins
               b3.use CreateNetworks
               b3.use ResumeDomain
               b3.use Provision
+              require 'vagrant/action/builtin/wait_for_communicator'
               b3.use WaitForCommunicator, [:running]
             end
           end

data/lib/vagrant-libvirt/config.rb

@@ -528,10 +528,14 @@ module VagrantPlugins
           pci_domain = options[:domain]
         end
 
-        @pcis.push(domain:    pci_domain,
-                   bus:       options[:bus],
-                   slot:      options[:slot],
-                   function:  options[:function])
+        @pcis.push(domain:          pci_domain,
+                   bus:             options[:bus],
+                   slot:            options[:slot],
+                   function:        options[:function],
+                   guest_domain:    options[:guest_domain],
+                   guest_bus:       options[:guest_bus],
+                   guest_slot:      options[:guest_slot],
+                   guest_function:  options[:guest_function])
       end
 
       def watchdog(options = {})

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

@@ -230,15 +230,20 @@
       <backend model='random'>/dev/random</backend>
     </rng>
 <%- end -%>
-<%- @pcis.each do |pci| -%>
+<%-
+  @pcis.each do |pci|
+    pci = pci.reject { |k,v| v.nil? }
+    guest_prefix = "guest_"
+    pci_host = pci.select { |k,_| !k.to_s.start_with?(guest_prefix) }
+    pci_guest = pci.select { |k,_| k.to_s.start_with?(guest_prefix) }
+-%>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-	<address <%= pci.select { |k,_| [:domain, :bus, :slot, :function].include? k }
-	  .reject { |k,v| v.nil? }
-	  .map { |k,v| "#{k.to_s}='#{v}'" }
-	  .join(' ')
-	-%>/>
+        <address <%= pci_host.map { |k,v| "#{k.to_s}='#{v}'" } .join(' ') -%>/>
       </source>
+    <%- if !pci_guest.empty? -%>
+      <address type='pci' <%= pci_guest.map { |k,v| "#{k.to_s[guest_prefix.length..-1]}='#{v}'" } .join(' ') -%>/>
+    <%- end -%>
     </hostdev>
 <%- end -%>
 <%- @usbs.each do |usb| -%>

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.8.1
+0.8.2

data/spec/unit/templates/domain_all_settings.xml

@@ -107,7 +107,7 @@
     </rng>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-	<address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
+        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
@@ -115,6 +115,12 @@
 	<address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
       </source>
     </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <source>
+	<address domain='0x0002' bus='0x04' slot='0x00' function='0x0'/>
+      </source>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
+    </hostdev>
     <hostdev mode='subsystem' type='usb'>
       <source startupPolicy='mandatory'>
 	<vendor id='0x1234'/>

data/spec/unit/templates/domain_spec.rb

@@ -92,6 +92,7 @@ describe 'templates/domain' do
       domain.serial(:type => 'file', :source => {:path => '/var/log/vm_consoles/machine.log'})
       domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
       domain.pci(domain: '0x0001', bus: '0x03', slot: '0x00', function: '0x0')
+      domain.pci(domain: '0x0002', bus: '0x04', slot: '0x00', function: '0x0', guest_domain: '0x0000', guest_bus: '0x01', guest_slot: '0x01', guest_function: '0x0')
       domain.usb_controller(model: 'nec-xhci', ports: '4')
       domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
       domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -75,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -326,10 +326,10 @@ test_files:
 - spec/unit/action/forward_ports_spec.rb
 - spec/unit/templates/tpm/version_1.2.xml
 - spec/unit/templates/tpm/version_2.0.xml
-- spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_cpu_mode_passthrough.xml
 - spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_spec.rb
 - spec/unit/util/byte_number_spec.rb
 - spec/unit/util/resolvers_spec.rb