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

Revert "Merge pull request #155 from shermdog/RE-7014-cinext"

Browse source 
This reverts commit cc03a86f6a, reversing
changes made to 5aaab7c5c2.
This commit is contained in:
Josh Cooper 2016-07-08 11:48:48 -07:00
parent cc03a86f6a
commit 0fd6fff934
11 changed files with 26 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/vmpooler.rb
View file

@ -7,7 +7,6 @@ module Vmpooler
require 'rbvmomi'
require 'redis'
require 'sinatra/base'
require "statsd-ruby"
require 'time'
require 'timeout'
require 'yaml'
@ -53,13 +52,6 @@ module Vmpooler
parsed_config[:graphite]['prefix'] ||= 'vmpooler'
end
# statsd is an addition and my not be present in YAML configuration
if parsed_config[:statsd]
if parsed_config[:statsd]['server']
parsed_config[:statsd]['prefix'] ||= 'vmpooler'
end
end
if parsed_config[:tagfilter]
parsed_config[:tagfilter].keys.each do |tag|
parsed_config[:tagfilter][tag] = Regexp.new(parsed_config[:tagfilter][tag])
@ -87,14 +79,6 @@ module Vmpooler
end
end
def self.new_statsd(server, port)
if server.nil? || server.empty?
nil
else
Statsd.new server, port
end
end
def self.pools(conf)
conf[:pools]
end