Merge pull request #149 from frozenfoxx/master

Added prefix parameter to the vmpooler configuration

lib/vmpooler.rb

@@ -32,6 +32,7 @@ module Vmpooler
     parsed_config[:config]['task_limit']   ||= 10
     parsed_config[:config]['vm_checktime'] ||= 15
     parsed_config[:config]['vm_lifetime']  ||= 24
+    parsed_config[:config]['prefix']       ||= ''
 
     # Create an index of pool aliases
     parsed_config[:pools].each do |pool|

lib/vmpooler/pool_manager.rb

@@ -189,7 +189,7 @@ module Vmpooler
 
         # Generate a randomized hostname
         o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
-        vm['hostname'] = o[rand(25)] + (0...14).map { o[rand(o.length)] }.join
+        vm['hostname'] = $config[:config]['prefix'] + o[rand(25)] + (0...14).map { o[rand(o.length)] }.join
 
         # Add VM to Redis inventory ('pending' pool)
         $redis.sadd('vmpooler__pending__' + vm['template'], vm['hostname'])

vmpooler.yaml.example

@@ -161,6 +161,11 @@
 #
 #   - domain
 #     If set, returns a top-level 'domain' JSON key in POST requests
+#
+#   - prefix
+#     If set, prefixes all created VMs with this string.  This should include
+#     a separator.
+#     (optional; default: '')
 
 # Example:
 
@@ -176,6 +181,7 @@
     - 'created_by'
     - 'project'
   domain: 'company.com'
+  prefix: 'poolvm-'
 
 # :pools:
 #