puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(POOLER-70) Update _check_pool for VM Provider

Browse source 
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
- Removes the MockFindFolder class as it is no longer required
- Minor update for rubocop violations
This commit is contained in:
Glenn Sarti 2017-03-31 14:31:43 -07:00
parent 7c3ad716af
commit 2ca1a39e8c
3 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmpooler/pool_manager.rb
View file

@ -548,9 +548,7 @@ module Vmpooler
# INVENTORY
inventory = {}
begin
base = provider.find_folder(pool['folder'])
base.childEntity.each do |vm|
provider.vms_in_pool(pool['name']).each do |vm|
if
(! $redis.sismember('vmpooler__running__' + pool['name'], vm['name'])) &&
(! $redis.sismember('vmpooler__ready__' + pool['name'], vm['name'])) &&
@ -629,7 +627,7 @@ module Vmpooler
# DISCOVERED
begin
$redis.smembers("vmpooler__discovered__#{pool['name']}").each do |vm|
%w(pending ready running completed).each do |queue|
%w[pending ready running completed].each do |queue|
if $redis.sismember("vmpooler__#{queue}__#{pool['name']}", vm)
$logger.log('d', "[!] [#{pool['name']}] '#{vm}' found in '#{queue}', removed from 'discovered' queue")
$redis.srem("vmpooler__discovered__#{pool['name']}", vm)