vmpooler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b32e5280b92e461243bc99e275e1637fe3c644
-  data.tar.gz: 702ee61515185102a99cecc1d1475b84f2c19ada
+  metadata.gz: fac55ca73f864661e71a9e8d8af43f747193807d
+  data.tar.gz: ed7b26990937da7030df493d36be4ad0e067d719
 SHA512:
-  metadata.gz: 9566067bbaee8024bdcd05d715082e158a61503de81e9d35a7600ba9567e4f033638350718143c86c17db0e912a1fb42f42032b465350afba666a7f3856c8acb
-  data.tar.gz: 415ebd0a8bbbd125ec0a0972be930197f88ac1d927f41683e526aec4465406fe0a6954750892b0b1991b16046686ad64420bb103821620e68e8a017a9b37f208
+  metadata.gz: ffd7935fb89be6df345bb8514d7c61dacb2ea9b87d6c7015471af31936553a574556908e14cd36ad7151fd22c8888170d358bcb1ba5878c3881e2b46f75c5f6b
+  data.tar.gz: e17bf98032ee7b939c52a94eb7d6cf7f058e621f82045dc73c38e9b130d62db90874900d01e4410458232de33943f0d96eaec2d22a0eb5075b36d11e6a97e9fc

data/lib/vmpooler/api/v1.rb

@@ -67,9 +67,9 @@ module Vmpooler
 
       template_backends.each do |t|
         vm = backend.spop('vmpooler__ready__' + t)
-        return [vm, t] if vm
+        return [vm, t, template] if vm
       end
-      [nil, nil]
+      [nil, nil, nil]
     end
 
     def return_vm_to_ready_state(template, vm)
@@ -113,27 +113,27 @@ module Vmpooler
 
       payload.each do |requested, count|
         count.to_i.times do |_i|
-          vm, name = fetch_single_vm(requested)
-          if !vm
+          vmname, vmpool, vmtemplate = fetch_single_vm(requested)
+          if !vmname
             failed = true
             metrics.increment('checkout.empty.' + requested)
             break
           else
-            vms << [ name, vm ]
-            metrics.increment('checkout.success.' + name)
+            vms << [ vmpool, vmname, vmtemplate ]
+            metrics.increment('checkout.success.' + vmtemplate)
           end
         end
       end
 
       if failed
-        vms.each do |(name, vm)|
-          return_vm_to_ready_state(name, vm)
+        vms.each do |(vmpool, vmname, vmtemplate)|
+          return_vm_to_ready_state(vmpool, vmname)
         end
         status 503
       else
-        vms.each do |(name, vm)|
-          account_for_starting_vm(name, vm)
-          update_result_hosts(result, name, vm)
+        vms.each do |(vmpool, vmname, vmtemplate)|
+          account_for_starting_vm(vmpool, vmname)
+          update_result_hosts(result, vmtemplate, vmname)
         end
 
         result['ok'] = true

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup