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

Allow vmpooler to run without specifying a configuration file

Browse source
This commit is contained in:
kirby@puppetlabs.com 2018-07-13 09:34:25 -07:00
parent b4bae80eeb
commit 1e63d25b2b
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/vmpooler.rb
View file

@ -1,5 +1,3 @@
require 'rubygems' unless defined?(Gem)
module Vmpooler module Vmpooler
require 'date' require 'date'
require 'json' require 'json'
@ -14,11 +12,7 @@ module Vmpooler
require 'set' require 'set'
%w[api graphite logger pool_manager statsd dummy_statsd generic_connection_pool providers].each do |lib| %w[api graphite logger pool_manager statsd dummy_statsd generic_connection_pool providers].each do |lib|
begin require "vmpooler/#{lib}"
require "vmpooler/#{lib}"
rescue LoadError
require File.expand_path(File.join(File.dirname(__FILE__), 'vmpooler', lib))
end
end end
def self.config(filepath = 'vmpooler.yaml') def self.config(filepath = 'vmpooler.yaml')
@ -31,21 +25,23 @@ module Vmpooler
else else
# Take the name of the config file either from an ENV variable or from the filepath argument # Take the name of the config file either from an ENV variable or from the filepath argument
config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath config_file = ENV['VMPOOLER_CONFIG_FILE'] || filepath
parsed_config = YAML.load_file(config_file) parsed_config = YAML.load_file(config_file) if File.exist? config_file
end end
exit unless parsed_config parsed_config ||= { config: {} }
# Bail out if someone attempts to start vmpooler with dummy authentication # Bail out if someone attempts to start vmpooler with dummy authentication
# without enbaling debug mode. # without enbaling debug mode.
if parsed_config[:auth]['provider'] == 'dummy' if parsed_config.has_key? :auth
unless ENV['VMPOOLER_DEBUG'] if parsed_config[:auth]['provider'] == 'dummy'
warning = [ unless ENV['VMPOOLER_DEBUG']
'Dummy authentication should not be used outside of debug mode', warning = [
'please set environment variable VMPOOLER_DEBUG to \'true\' if you want to use dummy authentication' 'Dummy authentication should not be used outside of debug mode',
] 'please set environment variable VMPOOLER_DEBUG to \'true\' if you want to use dummy authentication'
]
raise warning.join(";\s") raise warning.join(";\s")
end
end end
end end
@ -70,7 +66,7 @@ module Vmpooler
parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS'] parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS']
parsed_config[:config]['experimental_features'] = ENV['EXPERIMENTAL_FEATURES'] if ENV['EXPERIMENTAL_FEATURES'] parsed_config[:config]['experimental_features'] = ENV['EXPERIMENTAL_FEATURES'] if ENV['EXPERIMENTAL_FEATURES']
parsed_config[:redis] = parsed_config[:redis] || {} if ENV['REDIS_SERVER'] parsed_config[:redis] = parsed_config[:redis] || {}
parsed_config[:redis]['server'] = ENV['REDIS_SERVER'] || parsed_config[:redis]['server'] || 'localhost' parsed_config[:redis]['server'] = ENV['REDIS_SERVER'] || parsed_config[:redis]['server'] || 'localhost'
parsed_config[:redis]['port'] = ENV['REDIS_PORT'] if ENV['REDIS_PORT'] parsed_config[:redis]['port'] = ENV['REDIS_PORT'] if ENV['REDIS_PORT']
parsed_config[:redis]['password'] = ENV['REDIS_PASSWORD'] if ENV['REDIS_PASSWORD'] parsed_config[:redis]['password'] = ENV['REDIS_PASSWORD'] if ENV['REDIS_PASSWORD']
@ -85,12 +81,14 @@ module Vmpooler
parsed_config[:graphite]['server'] = ENV['GRAPHITE_SERVER'] if ENV['GRAPHITE_SERVER'] parsed_config[:graphite]['server'] = ENV['GRAPHITE_SERVER'] if ENV['GRAPHITE_SERVER']
parsed_config[:auth] = parsed_config[:auth] || {} if ENV['AUTH_PROVIDER'] parsed_config[:auth] = parsed_config[:auth] || {} if ENV['AUTH_PROVIDER']
parsed_config[:auth]['provider'] = ENV['AUTH_PROVIDER'] if ENV['AUTH_PROVIDER'] if parsed_config.has_key? :auth
parsed_config[:auth][:ldap] = parsed_config[:auth][:ldap] || {} if parsed_config[:auth]['provider'] == 'ldap' parsed_config[:auth]['provider'] = ENV['AUTH_PROVIDER'] if ENV['AUTH_PROVIDER']
parsed_config[:auth][:ldap]['server'] = ENV['LDAP_SERVER'] if ENV['LDAP_SERVER'] parsed_config[:auth][:ldap] = parsed_config[:auth][:ldap] || {} if parsed_config[:auth]['provider'] == 'ldap'
parsed_config[:auth][:ldap]['port'] = ENV['LDAP_PORT'] if ENV['LDAP_PORT'] parsed_config[:auth][:ldap]['server'] = ENV['LDAP_SERVER'] if ENV['LDAP_SERVER']
parsed_config[:auth][:ldap]['base'] = ENV['LDAP_BASE'] if ENV['LDAP_BASE'] parsed_config[:auth][:ldap]['port'] = ENV['LDAP_PORT'] if ENV['LDAP_PORT']
parsed_config[:auth][:ldap]['user_object'] = ENV['LDAP_USER_OBJECT'] if ENV['LDAP_USER_OBJECT'] parsed_config[:auth][:ldap]['base'] = ENV['LDAP_BASE'] if ENV['LDAP_BASE']
parsed_config[:auth][:ldap]['user_object'] = ENV['LDAP_USER_OBJECT'] if ENV['LDAP_USER_OBJECT']
end
# Create an index of pool aliases # Create an index of pool aliases
parsed_config[:pool_names] = Set.new parsed_config[:pool_names] = Set.new