kitchen-qemu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b384b431d25be6af9629e25257b22aae196b6ee
-  data.tar.gz: a357e929445b2ed642d3afe3e1c6b2dfa09c65c6
+  metadata.gz: 1029f7e678c666e950af682e6efa5ef223f2fc21
+  data.tar.gz: 3bb85ec743a685a5a4e9adf9b166b21117a1caf5
 SHA512:
-  metadata.gz: c2528d3868e9d8f30466636577dc0c8e4823be92243171ae1e31c6be6db00b298f7629b93361f9a776f265953db9f89d7f8eaa3d5589c2d67109736644901a62
-  data.tar.gz: 3c6efcde7a3193201f4f2aaafd2cdf063da363ca3b0f80a6c0bdc613b0febe778c72030dd1a11e8f79584f125cc0dfa111cbf85a61d4d77e4255d9097fca0734
+  metadata.gz: 28214283a12ec0d94a6b59551a438de3eaa4804dbdd2fe5c53d0be3fa33b70eaf054184e43f44d324e24eeaeef9b80565168a6273d42d652596cb31a0c013797
+  data.tar.gz: cee503538175132530f22439bf3259556fbbcbb0af878a0444199b5cbb35e9f400abb8d45bc8e87913e0780d6f0458767f085c5f9345a1fe0502f8ba97c74433

data/lib/kitchen/driver/qemu.rb

@@ -37,6 +37,7 @@ module Kitchen
       default_config :username,  'kitchen'
       default_config :password,  'kitchen'
       default_config :port,      2222
+      default_config :display,   'none'
       default_config :memory,    '512'
       default_config :nic_model, 'virtio'
 
@@ -59,9 +60,7 @@ module Kitchen
           config[:binary] = @@archbinary[config[:arch]] or
             raise UserError, "Unknown architecture '#{config[:arch]}'"
         end
-        if not config[:vnc] and not config[:spice]
-          config[:spice] = "addr=#{spice_path},unix"
-        end
+        config[:vga] = 'qxl' if config[:spice] && !config[:vga]
         self
       end
 
@@ -75,6 +74,7 @@ module Kitchen
           begin
             mon = UNIXSocket.new(monitor)
           rescue Errno::ECONNREFUSED
+            info 'Stale monitor socket detected. Assuming old QEMU already quit.'
             cleanup!
           else
             mon.close
@@ -94,9 +94,10 @@ module Kitchen
 
         cmd = [
           config[:binary], '-daemonize',
+          '-display', config[:display].to_s,
           '-chardev', "socket,id=monitor,path=#{monitor},server,nowait",
           '-mon', 'chardev=monitor,mode=control,default',
-          '-m', config[:memory],
+          '-m', config[:memory].to_s,
           '-net', "nic,model=#{config[:nic_model]}",
           '-net', "user,net=192.168.1.0/24,hostname=#{hostname},hostfwd=tcp::#{state[:port]}-:22",
           '-device', 'virtio-scsi-pci,id=scsi',
@@ -124,15 +125,13 @@ module Kitchen
           info 'KVM disabled'
         end
 
-        if config[:spice]
-          cmd.push('-vga', 'qxl', '-spice', config[:spice])
-        elsif config[:vnc]
-          cmd.push('-vnc', config[:vnc])
-        end
+        cmd.push('-vga',   config[:vga].to_s)   if config[:vga]
+        cmd.push('-spice', config[:spice].to_s) if config[:spice]
+        cmd.push('-vnc',   config[:vnc].to_s)   if config[:vnc]
 
         info 'Spawning QEMU..'
         error = nil
-        Open3.popen3({ 'QEMU_AUDIO_DRV' => 'none' }, *cmd, :unsetenv_others=>true ) do |_, _, err, thr|
+        Open3.popen3({ 'QEMU_AUDIO_DRV' => 'none' }, *cmd) do |_, _, err, thr|
           if not thr.value.success?
             error = err.read.strip
           end
@@ -213,9 +212,9 @@ jxl4Yo9wNmkVrWMkOUn1BRWTEVLnx88EaIOu3CJyJDsaSufbyENCtCXhjVEV4Eqp
 kc9GOsm4n+EVnWyhUVjwxEExaCRuFa4aJ/ekLZYtepNnd9Nsoknqd1SVW163QjrY
 tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
 -----END RSA PRIVATE KEY-----
-}
+}.freeze
 
-      @@pubkey = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIboBIvdtZLruuwDksO8qd90IFqArrUHksiv4292MrehEqEKqpGzto1I86oy7Y1sqi3j8G0PSFaKkXsICwyor7bjVygxTDFFOWq+h78vvFnbgq1qOubWST/E1QY/m9bIryxh9icNS4tLKlFpn9l9a4pmBAsN07DYVaocVUugkOxeCxr/KLUXdvmXj4Xfq837ultL1ggyaN2YqeDwn+GxM8RNm51rIRa4DL6Y1rPgztm3FL+A9MglzEjELbs8s6EDVewAG6do1HwS3LqCGxlfZgRieelzIHkyaqLRU4mzqbkhmfaR/U/fHQppRDYWb3CoCSBilJxxYfjLK1VDyXOWkH kitchen-qemu'
+      @@pubkey = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIboBIvdtZLruuwDksO8qd90IFqArrUHksiv4292MrehEqEKqpGzto1I86oy7Y1sqi3j8G0PSFaKkXsICwyor7bjVygxTDFFOWq+h78vvFnbgq1qOubWST/E1QY/m9bIryxh9icNS4tLKlFpn9l9a4pmBAsN07DYVaocVUugkOxeCxr/KLUXdvmXj4Xfq837ultL1ggyaN2YqeDwn+GxM8RNm51rIRa4DL6Y1rPgztm3FL+A9MglzEjELbs8s6EDVewAG6do1HwS3LqCGxlfZgRieelzIHkyaqLRU4mzqbkhmfaR/U/fHQppRDYWb3CoCSBilJxxYfjLK1VDyXOWkH kitchen-qemu'.freeze
 
       @@archbinary = {
         'i386'   => 'qemu-system-i386',
@@ -224,7 +223,7 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         'x86_64' => 'qemu-system-x86_64',
         '32bit'  => 'qemu-system-i386',
         '64bit'  => 'qemu-system-x86_64',
-      }
+      }.freeze
 
       def privkey_path
         File.join(config[:kitchen_root], '.kitchen', 'kitchen-qemu.key')
@@ -234,10 +233,6 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.mon")
       end
 
-      def spice_path
-        File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.spice")
-      end
-
       def create_privkey
         path = privkey_path
         return true if File.file?(path)
@@ -245,12 +240,10 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
       end
 
       def cleanup!
-        [ spice_path, monitor_path ].each do |path|
-          begin
-            File.delete(path)
-          rescue Errno::ENOENT
-            # do nothing
-          end
+        begin
+          File.delete(monitor_path)
+        rescue Errno::ENOENT
+          # do nothing
         end
       end
 

data/lib/kitchen/driver/qemu_version.rb

@@ -17,6 +17,6 @@
 module Kitchen
   module Driver
     # Version string for the QEMU Kitchen driver
-    QEMU_VERSION = '0.1.1'
+    QEMU_VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Emil Renner Berthing