vmpooler 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 584fd57d5c5eb3f4ac1be3ee2684c306d2f2d5c3
-  data.tar.gz: d3acf9c90d9957e26916bf6eb8145ca312f5bda5
+  metadata.gz: 9ca5e041d051fc1f66b4de635492388443b35ec4
+  data.tar.gz: 0389293f134e875f3a7f74da8cfcb6f72bd94601
 SHA512:
-  metadata.gz: 2d78a80241c539b5fb78ad40135eb9c1a20f6d76f204c28380b5618d62ce63d3a86cfab7adb1dc1e916e7b9c36ad35e258417dc0f5f32573b5b741ec97eb0a2c
-  data.tar.gz: 56f8969dc41f1c2ca038efc1bc38b07aadb641acd9ff5390a5ac9eafa8623c787e3a66a074f7eabe23fa394bd575d2cdeaa9cf9cfef5e1744b2727404b8b293d
+  metadata.gz: 3cadcac1a60a44662720f498ce83af5506e8c13ab39c9029fa53c030936d22d942529a41873d7ae7489d64487388f195d99f944f831e51cbb172e96c111a0052
+  data.tar.gz: f1ff4a6f52c8a8981f4ce126add76eee6d1ae863ba078053d48fa537e78ebc249989192abbe728482385de65208e7180a6e77c9c7c6849de35eafaec39fb194d

data/lib/vmpooler/api/helpers.rb

@@ -140,7 +140,7 @@ module Vmpooler
       end
 
       def hostname_shorten(hostname, domain=nil)
-        if domain && hostname =~ /^\w+\.#{domain}$/
+        if domain && hostname =~ /^[\w-]+\.#{domain}$/
           hostname = hostname[/[^\.]+/]
         end
 

data/lib/vmpooler/pool_manager.rb

@@ -267,10 +267,34 @@ module Vmpooler
       end
     end
 
-    def _clone_vm(pool_name, provider)
+    def generate_and_check_hostname(pool_name)
       # Generate a randomized hostname
       random_name = [@name_generator.adjective(max: 7), @name_generator.noun(max: 7)].join('-')
-      new_vmname = $config[:config]['prefix'] + random_name
+      hostname = $config[:config]['prefix'] + random_name
+      available = $redis.hlen('vmpooler__vm__' + hostname) == 0
+
+      return hostname, available
+    end
+
+    def find_unique_hostname(pool_name)
+      hostname_retries = 0
+      max_hostname_retries = 3
+      while hostname_retries < max_hostname_retries
+        hostname, available = generate_and_check_hostname(pool_name)
+        break if available
+
+        hostname_retries += 1
+        $metrics.increment("errors.duplicatehostname.#{pool_name}")
+        $logger.log('s', "[!] [#{pool_name}] Generated hostname #{hostname} was not unique (attempt \##{hostname_retries} of #{max_hostname_retries})")
+      end
+      
+      raise "Unable to generate a unique hostname after #{hostname_retries} attempts. The last hostname checked was #{hostname}" unless available
+      
+      hostname
+    end
+
+    def _clone_vm(pool_name, provider)
+      new_vmname = find_unique_hostname(pool_name)
 
       # Add VM to Redis inventory ('pending' pool)
       $redis.sadd('vmpooler__pending__' + pool_name, new_vmname)

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup