From 6c3ffae1dc1ddae06af99f51e1e3745efe3d1da3 Mon Sep 17 00:00:00 2001
From: Scott Schneider <sschneider@puppetlabs.com>
Date: Thu, 20 Feb 2014 14:39:17 -0800
Subject: [PATCH] s/vm_host_pool__/vmpooler__/g

---
 vmpooler | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vmpooler b/vmpooler
index 4f5fbb9..a304eca 100755
--- a/vmpooler
+++ b/vmpooler
@@ -89,19 +89,19 @@ def check_ready_vm vm, pool, ttl
   Thread.new {
     if (ttl > 0)
       if ((((Time.now - host.runtime.bootTime)/60).to_s[/^\d+\.\d{1}/].to_f) > ttl)
-        $redis.smove('vmware_host_pool__ready__'+pool, 'vmware_host_pool__completed__'+pool, vm)
+        $redis.smove('vmpooler__ready__'+pool, 'vmpooler__completed__'+pool, vm)
 
         $logger.log('d', "[!] [#{pool}] '#{vm}' reached end of TTL after #{ttl} minutes, removed from 'ready' queue")
       end
     end
 
-    check_stamp = $redis.hget('vmware_host_pool__vm__'+vm, 'check')
+    check_stamp = $redis.hget('vmpooler__vm__'+vm, 'check')
 
     if (
       (! check_stamp) or
       (((Time.now - Time.parse(check_stamp))/60) > $config[:config]['vm_checktime'])
     )
-      $redis.hset('vmware_host_pool__vm__'+vm, 'check', Time.now)
+      $redis.hset('vmpooler__vm__'+vm, 'check', Time.now)
 
       host = $vsphere[pool].find_vm(vm) ||
              $vsphere[pool].find_vm_heavy(vm)[vm]
@@ -112,7 +112,7 @@ def check_ready_vm vm, pool, ttl
           (host.runtime.powerState) and
           (host.runtime.powerState != 'poweredOn')
         )
-          $redis.smove('vmware_host_pool__ready__'+pool, 'vmware_host_pool__completed__'+pool, vm)
+          $redis.smove('vmpooler__ready__'+pool, 'vmpooler__completed__'+pool, vm)
 
           $logger.log('d', "[!] [#{pool}] '#{vm}' appears to be powered off, removed from 'ready' queue")
         end
@@ -122,12 +122,12 @@ def check_ready_vm vm, pool, ttl
           (host.summary.guest.hostName) and
           (host.summary.guest.hostName != vm)
         )
-          $redis.smove('vmware_host_pool__ready__'+pool, 'vmware_host_pool__completed__'+pool, vm)
+          $redis.smove('vmpooler__ready__'+pool, 'vmpooler__completed__'+pool, vm)
 
           $logger.log('d', "[!] [#{pool}] '#{vm}' has mismatched hostname, removed from 'ready' queue")
         end
       else
-        $redis.srem('vmware_host_pool__ready__'+pool, vm)
+        $redis.srem('vmpooler__ready__'+pool, vm)
 
         $logger.log('s', "[!] [#{pool}] '#{vm}' not found in vCenter inventory, removed from 'ready' queue")
       end
@@ -137,7 +137,7 @@ def check_ready_vm vm, pool, ttl
           TCPSocket.new vm, 22
         }
       rescue
-        if ($redis.smove('vmware_host_pool__ready__'+pool, 'vmware_host_pool__completed__'+pool, vm))
+        if ($redis.smove('vmpooler__ready__'+pool, 'vmpooler__completed__'+pool, vm))
           $logger.log('d', "[!] [#{pool}] '#{vm}' is unreachable, removed from 'ready' queue")
         end
       end