vmpooler 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae2494365a5cecad598897da93f73c7ba874e17
-  data.tar.gz: 5a9d13f8e6e4ca78c7e0a9f3375fa5f11ada986b
+  metadata.gz: c403c53a6038b04983f7e569db7fa023342a122e
+  data.tar.gz: d2963647b75462426fdcd06fb72ddace3a9ddc49
 SHA512:
-  metadata.gz: 4401a2f81fca41982af4b800f0be09174f1a154ab0a655d0c8386c04ac27b93e222697b317b8e06344743b05f750207c3470a93bac5976ee8489c25eab1fb45b
-  data.tar.gz: 8d862b2a402fb285bf5a7343db1618a9344df340b1b8abb7e6baf4e5fbe47505bff4cb6df879d6b0ac04be9caca6fd5d1fefc76b793ddc8b5069ac477343f54a
+  metadata.gz: 779e193b7410a7eeb3ac7b260cb0f152be63f9331b2be1355d05fdc3051f7c31b5d3f96bd3a445ae82ab52a0e5fd78a3d70090b09adb21942f8ef20dfec782f0
+  data.tar.gz: 5fed4e3e8d2f7010a138b44bf39a2346eb58327e713fcf9c6154038c33967f24d7120f8157216747ee98664728f43dc53582d5fddce85f2c14ce7ed31d5e05be

data/lib/vmpooler/api/v1.rb

@@ -829,6 +829,10 @@ module Vmpooler
         if config['domain']
           result[params[:hostname]]['domain'] = config['domain']
         end
+
+        result[params[:hostname]]['host'] = rdata['host'] if rdata['host']
+        result[params[:hostname]]['migrated'] = rdata['migrated'] if rdata['migrated']
+
       end
 
       JSON.pretty_generate(result)

data/lib/vmpooler/providers/vsphere.rb

@@ -312,7 +312,7 @@ module Vmpooler
             # Put the VM in the specified folder and resource pool
             relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(
               datastore: find_datastore(target_datastore, connection, target_datacenter_name),
-              diskMoveType: :moveChildMostDiskBacking
+              diskMoveType: get_disk_backing(pool)
             )
 
             manage_host_selection = @config[:config]['manage_host_selection'] if @config[:config].key?('manage_host_selection')
@@ -939,6 +939,7 @@ module Vmpooler
             begin
               connection = ensured_vsphere_connection(pool_object)
               vm_hash = get_vm_details(pool_name, vm_name, connection)
+              $redis.hset("vmpooler__vm__#{vm_name}", 'host', vm_hash['host_name'])
               migration_limit = @config[:config]['migration_limit'] if @config[:config].key?('migration_limit')
               migration_count = $redis.scard('vmpooler__migration')
               if migration_enabled? @config
@@ -965,9 +966,10 @@ module Vmpooler
         def migrate_vm_to_new_host(pool_name, vm_name, vm_hash, connection)
           $redis.sadd('vmpooler__migration', vm_name)
           target_host_name = select_next_host(pool_name, @provider_hosts, vm_hash['architecture'])
+          $redis.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
+          $redis.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
           target_host_object = find_host_by_dnsname(connection, target_host_name)
           finish = migrate_vm_and_record_timing(pool_name, vm_name, vm_hash, target_host_object, target_host_name)
-          #logger.log('s', "Provider_hosts is: #{provider.provider_hosts}")
           logger.log('s', "[>] [#{pool_name}] '#{vm_name}' migrated from #{vm_hash['host_name']} to #{target_host_name} in #{finish} seconds")
         ensure
           $redis.srem('vmpooler__migration', vm_name)
@@ -1028,6 +1030,17 @@ module Vmpooler
           return false if template[-1] == '/'
           return true
         end
+
+        def get_disk_backing(pool)
+          return :moveChildMostDiskBacking if linked_clone?(pool)
+          return :moveAllDiskBackingsAndConsolidate
+        end
+
+        def linked_clone?(pool)
+          return if pool[:create_linked_clone] == false
+          return true if pool[:create_linked_clone]
+          return true if @config[:config]['create_linked_clones']
+        end
       end
     end
   end

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/vmpooler.rb

@@ -64,6 +64,7 @@ module Vmpooler
     parsed_config[:config]['retry_factor'] = string_to_int(ENV['RETRY_FACTOR']) if ENV['RETRY_FACTOR']
     parsed_config[:config]['create_folders'] = ENV['CREATE_FOLDERS'] if ENV['CREATE_FOLDERS']
     parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS']
+    set_linked_clone(parsed_config)
     parsed_config[:config]['experimental_features'] = ENV['EXPERIMENTAL_FEATURES'] if ENV['EXPERIMENTAL_FEATURES']
     parsed_config[:config]['purge_unconfigured_folders'] = ENV['PURGE_UNCONFIGURED_FOLDERS'] if ENV['PURGE_UNCONFIGURED_FOLDERS']
     parsed_config[:config]['usage_stats'] = ENV['USAGE_STATS'] if ENV['USAGE_STATS']
@@ -183,4 +184,14 @@ module Vmpooler
     return unless s =~ /\d/
     return Integer(s)
   end
+
+  def self.true?(obj)
+    obj.to_s.downcase == "true"
+  end
+
+  def self.set_linked_clone(parsed_config)
+    parsed_config[:config]['create_linked_clones'] = parsed_config[:config]['create_linked_clones'] || true
+    parsed_config[:config]['create_linked_clones'] = ENV['CREATE_LINKED_CLONES'] if ENV['CREATE_LINKED_CLONES'] =~ /true|false/
+    parsed_config[:config]['create_linked_clones'] = true?(parsed_config[:config]['create_linked_clones']) if parsed_config[:config]['create_linked_clones']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup