inprovise-vbox 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDc3MTU3NDE3N2ZjYjZmYzQzNWIxZTlkOGVkZTNiZWE0MjIyZGZjZA==
+    NjlhOWU5MzNiNDQ5MThlNTIyNDg0OTI1YzdiYWIxN2RlNTg1MTU2Yw==
   data.tar.gz: !binary |-
-    MzNiNDZhNzQ5NjI1OTMyNDY5MTA2MzhiYmM2YzBmZTY5YTQwYjk4Mw==
+    YjY3M2IzM2RkYjcyYTNlN2M5MmViYzQ5ZDNiZTljYzhmZjIxNTA4OQ==
 SHA512:
   metadata.gz: !binary |-
-    MTA2ZTk2MGFiNWMzMGFmZWEyYzI5YzE5NmQ2ZDA1NzUwZDg2ZGI1NTM4YTA0
-    NzA2YzdhYWQxNzQ5ZDFjNzc3OTIzYmI2MTQ0ZGU1MDQyNDE2YTE5NmEzZGY2
-    ZjViZjA5MjMwNGY3YTE0MzZkN2NhODFiYjNiODIwY2RiNDQ3ZDM=
+    ZDE4OWIyN2M2ODU1Njc5ZDIxODRlZjIwNGEwMDYwN2JiN2E2NDY5YjA2NzVk
+    OWFhZjYxYzg0NTRkN2ZhZTQ2YTdkNTQ2YzliZmJmZjc4NWExYWU5MzJjMGQw
+    MzA4Y2VhMzkzNGQ0YmUwOWJiYzIzYzA1OWE3MTY4NzkxYmYyMWE=
   data.tar.gz: !binary |-
-    ZmEwNjUxMzdiYjk0OTVjYjljMjhmYjQwZmY3NDAxMmJiZjk0ODFjZjFhYWMz
-    NDFkMGZlYjcxODQyYjE1YjYzOWY0N2I3ZWNkNzJlMDk2NzBmYzk0NDYyZDI0
-    MmY1M2U5MjkwYmYzMmFlMThiODk5YzI1YzMyOGMzM2QzNGY4ZDY=
+    NGUxYzI3Y2NmMDUyM2QwMTU4NWQzNTE2ZjEwOTIwZjU2YzcwZmYxZDg5OGI1
+    NzZjYTZmNDcxMDM2ZWNmMmQwODQzYTI4NTVlOTdjMmQ1YWYyNzNmN2ZlN2I2
+    YTg3YjIyZGI1ODA4YTU4YmUyOGQxN2UzNDRiNjUzZDNhZGMyOTc=

data/lib/inprovise/vbox/vbox.rb

@@ -42,13 +42,20 @@ module Inprovise::VBox
       cmdline << "--arch #{cfg[:arch]} "
       cmdline << '--autostart ' if cfg[:autostart]
       cmdline << "--name #{vboxname} --memory #{cfg[:memory]} --vcpus #{cfg[:cpus]} "
-      cmdline << "--os-variant #{cfg[:os]} " if cfg[:os]
+      # check if os variant defined on this host
+      if cfg[:os]
+        os_variant = sudo("osinfo-query --fields=short-id os | grep #{cfg[:os]}").strip
+        cmdline << "--os-variant #{cfg[:os]} " unless os_variant.empty?
+      end
+      cmdline << '--network '
       cmdline << case cfg[:network]
                  when :hostnet
-                   "--network network=#{cfg[:netname] || 'default'} "
+                   "network=#{cfg[:netname] || 'default'}"
                  when :bridge
-                   "--network bridge=#{cfg[:netname] || 'virbr0' } "
+                   "bridge=#{cfg[:netname] || 'virbr0' }"
                  end
+      cmdline << ",model=#{cfg[:nic]}" if cfg[:nic]
+      cmdline << ' '
       cmdline << "--graphics #{cfg[:graphics] || 'spice'} "
       cmdline << "--disk path=#{cfg[:image]},device=disk,boot_order=1"
       cmdline << ",bus=#{cfg[:diskbus]}" if cfg[:diskbus]
@@ -76,6 +83,7 @@ module Inprovise::VBox
     #     :os
     #     :network
     #     :netname
+    #     :nic
     #     :autostart
     #     :kernel
     #     :kernel_args
@@ -131,6 +139,7 @@ module Inprovise::VBox
               :os => vbs.vbox_os(self),
               :network => vbs.vbox_network(self) || :hostnet,
               :netname => vbs.vbox_netname(self),
+              :nic => vbs.vbox_nic(self),
               :graphics => vbs.vbox_graphics(self),
               :image => vbs.vbox_image(self),
               :diskbus => vbs.vbox_diskbus(self),
@@ -174,12 +183,16 @@ module Inprovise::VBox
       @node_script = Inprovise::DSL.script "#{name}#vbox_node" do
 
         validate do
-          vmname = vbs.vbox_name(self)
-          if tgt = Inprovise::Infrastructure.find(vmname)
-            raise ArgumentError, "VBox #{vmname} clashes with existing group" if Inprovise::Infrastructure::Group === tgt
-            true
+          if vbs.vbox_no_node(self)
+            config.command != :revert
           else
-            false
+            vmname = vbs.vbox_name(self)
+            if tgt = Inprovise::Infrastructure.find(vmname)
+              raise ArgumentError, "VBox #{vmname} clashes with existing group" if Inprovise::Infrastructure::Group === tgt
+              true
+            else
+              false
+            end
           end
         end
 
@@ -221,7 +234,13 @@ module Inprovise::VBox
             Inprovise::Infrastructure.save unless node_group.empty?
             unless vbs.vbox_no_sniff(self)
               # retry on (comm) failure
-              Inprovise::Sniffer.run_sniffers_for(node) rescue Inprovise::Sniffer.run_sniffers_for(node)
+              begin
+                Inprovise::Sniffer.run_sniffers_for(node)
+              rescue
+                sleep(5)  # maybe VM needs more time to start up SSH
+                node.disconnect!
+                Inprovise::Sniffer.run_sniffers_for(node)
+              end
               Inprovise::Infrastructure.save
             end
             log("Added new node #{node}", :bold)
@@ -296,6 +315,10 @@ module Inprovise::VBox
       value_for context, context.config[name.to_sym][:netname]
     end
 
+    def vbox_nic(context)
+      value_for context, context.config[name.to_sym][:nic]
+    end
+
     def vbox_graphics(context)
       value_for context, context.config[name.to_sym][:graphics]
     end

data/lib/inprovise/vbox/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise; module VBox
 
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 
 end; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inprovise-vbox
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Martin Corino