vagrant-libvirt 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cef6e96e357a1191f1b10a513d7a58154f6ed60
-  data.tar.gz: 8829ceb3cb02ff4034a7a04db4bdff058a30c500
+  metadata.gz: 82b8df833b98cd137bfccda94b2544f25ae7d533
+  data.tar.gz: 40ddebef29dac353a3b1a50a2a7f1b732aa9edbb
 SHA512:
-  metadata.gz: ec1a305e16d78c78cca37084ff07cf0f840ad5c502530ef255e63894f9178c48a34a9f544e125694358bbb870a5ed3e4e67d287187823400b1e8a84ac59392c9
-  data.tar.gz: c8226c363be4311b61d0b9d1cbcf14ff08e6776790e4a016824fb727dc6db05b39588163bd5e99b0904ee11bdbd7f2dcc738f279af25738a702cdfb9a8282728
+  metadata.gz: 7b57a1a6d97c1b3135a3bde03708ab1f31ab0e40841bcbd2316719d4022604ac742294aed1600993c58beddcf3b013f2bc51f13fef7251caed6ab6504b9384a8
+  data.tar.gz: 0cad0fec5c4cb8c657505acb2d166b28cd4d1096fc9117be9887101d01920dbaa57f1146aaaeac98814058b94df8113d5318d1eb253bb4117ad76039b87d46f7

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

@@ -102,9 +102,6 @@ module VagrantPlugins
           # smartcard device
           @smartcard_dev = config.smartcard_dev
 
-          # qemuargs
-          @qemuargs = config.qemuargs
-
           # RNG device passthrough
           @rng = config.rng
 
@@ -283,15 +280,16 @@ module VagrantPlugins
             env[:ui].info(" -- smartcard device:  mode=#{@smartcard_dev[:mode]}, type=#{@smartcard_dev[:type]}")
           end
 
-          unless @qemuargs.empty?
+          @qargs = config.qemu_args
+          if not @qargs.empty?
             env[:ui].info(' -- Command line args: ')
-            @qemuargs.each do |arg|
+            @qargs.each do |arg|
               msg = "    -> value=#{arg[:value]}, "
               env[:ui].info(msg)
             end
           end
 
-          env[:ui].info(" -- Command line : #{@cmd_line}")
+          env[:ui].info(" -- Command line : #{@cmd_line}") unless @cmd_line.empty?
 
           # Create libvirt domain.
           # Is there a way to tell fog to create new domain with already

data/lib/vagrant-libvirt/config.rb

@@ -142,7 +142,7 @@ module VagrantPlugins
       attr_accessor :mgmt_attach
 
       # Additional qemuargs arguments
-      attr_accessor :qemuargs
+      attr_accessor :qemu_args
 
       def initialize
         @uri               = UNSET_VALUE
@@ -242,7 +242,7 @@ module VagrantPlugins
         # Attach mgmt network
         @mgmt_attach       = UNSET_VALUE
 
-        @qemuargs  = UNSET_VALUE
+        @qemu_args  = []
       end
 
       def boot(device)
@@ -495,8 +495,7 @@ module VagrantPlugins
       end
 
       def qemuargs(options = {})
-        @qemuargs = [] if @qemuargs == UNSET_VALUE
-        @qemuargs.push(value: options[:value])
+        @qemu_args << options if options[:value]
       end
 
       # code to generate URI from a config moved out of the connect action
@@ -662,7 +661,7 @@ module VagrantPlugins
         # Attach mgmt network
         @mgmt_attach = true if @mgmt_attach == UNSET_VALUE
 
-        @qemuargs = [] if @qemuargs == UNSET_VALUE
+        @qemu_args = [] if @qemu_args == UNSET_VALUE
       end
 
       def validate(machine)
@@ -692,10 +691,6 @@ module VagrantPlugins
           c = cdroms.dup
           c += other.cdroms
           result.cdroms = c
-
-          c = qemuargs.dup
-          c += other.qemuargs
-          result.qemuargs = c
         end
       end
     end

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

@@ -219,9 +219,9 @@
     <% end -%>
   </devices>
 
-  <% unless @qemuargs.empty? %>
+  <% unless @qargs.empty? %>
   <qemu:commandline>
-    <% @qemuargs.each do |arg| %>
+    <% @qargs.each do |arg| %>
     <qemu:arg value='<%= arg[:value] %>'/>
     <% end %>
   </qemu:commandline>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.39'.freeze
+    VERSION = '0.0.40'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Lukas Stanek