vmpooler 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7f388dd31646303d099ae2d96085531bf9b3c024b90334d0fc2d22fed5233e
-  data.tar.gz: 058e336a33e6bad6bcfa8c60df21b94a4c5d65badb53c7e98ac59feaeb29a31b
+  metadata.gz: 25f8f02e82db016ae0294993ad97c205d9560fce8fa12358022114866e92bf08
+  data.tar.gz: c9f2c79541bd7f04084608c000f09dce9b7b2db4a4d983c473207a1e1f001374
 SHA512:
-  metadata.gz: 189df7bd4366010e43c43f6e5e6f031a02e4671a98a7e6ae49f6260253411e56c0fce1d0440fc3b8c9bd8881c5c259667b50df95d10a58de242dc170c25e0556
-  data.tar.gz: 230eaf359d9a14414c175c89bd43e5bb415422d641dca967bc0a2266fb5779a1f9092dcf3c1e63761cc2c0ce86c565f3a40e01809ff240e3e31498521d44ef68
+  metadata.gz: 5366548250b651add0e834b094a8397556ee8912620dd6d334de5131473a0dafa420e4df43a6f805455df5de062bc00ad36eb2991aa80f2afd039a2b9a0eb6ba
+  data.tar.gz: 2e2cd9e4cfd83152221c4c96defdc784a4332fee4c36349615b7d21697d622cef89be8bab52ce48c2acc5c8dd5216bc051cc3c28097747bd74f841568aa6232b

data/lib/vmpooler/api/helpers.rb

@@ -114,11 +114,13 @@ module Vmpooler
       end
 
       def export_tags(backend, hostname, tags)
-        tags.each_pair do |tag, value|
-          next if value.nil? or value.empty?
+        backend.pipelined do
+          tags.each_pair do |tag, value|
+            next if value.nil? or value.empty?
 
-          backend.hset('vmpooler__vm__' + hostname, 'tag:' + tag, value)
-          backend.hset('vmpooler__tag__' + Date.today.to_s, hostname + ':' + tag, value)
+            backend.hset('vmpooler__vm__' + hostname, 'tag:' + tag, value)
+            backend.hset('vmpooler__tag__' + Date.today.to_s, hostname + ':' + tag, value)
+          end
         end
       end
 

data/lib/vmpooler/pool_manager.rb

@@ -289,19 +289,15 @@ module Vmpooler
                 move_vm_queue(pool, vm, 'running', 'completed', redis, "reached end of TTL after #{ttl} hours")
                 throw :stop_checking
               end
+            else
+              move_vm_queue(pool, vm, 'running', 'completed', redis, 'is listed as running, but has no checkouttime data. Removing from running')
             end
 
-            if provider.vm_ready?(pool, vm)
-              throw :stop_checking
-            else
-              host = provider.get_vm(pool, vm)
+            throw :stop_checking if provider.vm_ready?(pool, vm)
 
-              if host
-                throw :stop_checking
-              else
-                move_vm_queue(pool, vm, 'running', 'completed', redis, 'is no longer in inventory, removing from running')
-              end
-            end
+            throw :stop_checking if provider.get_vm(pool, vm)
+
+            move_vm_queue(pool, vm, 'running', 'completed', redis, 'is no longer in inventory, removing from running')
           end
         end
       end

data/lib/vmpooler/providers/vsphere.rb

@@ -306,19 +306,26 @@ module Vmpooler
 
             template_vm_object = find_template_vm(pool, connection)
 
+            extra_config = [
+              { key: 'guestinfo.hostname', value: new_vmname }
+            ]
+
+            if pool.key?('snapshot_mainMem_ioBlockPages')
+              ioblockpages = pool['snapshot_mainMem_ioBlockPages']
+              extra_config.push(
+                { key: 'mainMem.ioBlockPages', value: ioblockpages }
+              )
+            end
+            if pool.key?('snapshot_mainMem_iowait')
+              iowait = pool['snapshot_mainMem_iowait']
+              extra_config.push(
+                { key: 'mainMem.iowait', value: iowait }
+              )
+            end
+
             # Annotate with creation time, origin template, etc.
             # Add extraconfig options that can be queried by vmtools
-            config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
-              annotation: JSON.pretty_generate(
-                name: new_vmname,
-                created_by: provider_config['username'],
-                base_template: template_path,
-                creation_timestamp: Time.now.utc
-              ),
-              extraConfig: [
-                { key: 'guestinfo.hostname', value: new_vmname }
-              ]
-            )
+            config_spec = create_config_spec(new_vmname, template_path, extra_config)
 
             # Check if alternate network configuration is specified and add configuration
             if pool.key?('network')
@@ -358,6 +365,18 @@ module Vmpooler
           vm_hash
         end
 
+        def create_config_spec(vm_name, template_name, extra_config)
+          RbVmomi::VIM.VirtualMachineConfigSpec(
+            annotation: JSON.pretty_generate(
+              name: vm_name,
+              created_by: provider_config['username'],
+              base_template: template_name,
+              creation_timestamp: Time.now.utc
+            ),
+            extraConfig: extra_config
+          )
+        end
+
         def create_relocate_spec(target_datastore, target_datacenter_name, pool_name, connection)
           pool = pool_config(pool_name)
           target_cluster_name = get_target_cluster_from_config(pool_name)

data/lib/vmpooler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '0.16.0'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: opentelemetry-resource_detectors
   requirement: !ruby/object:Gem::Requirement
@@ -384,16 +384,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement