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

[WIP] Make the default provider configurable

Browse source
This commit is contained in:
Gene Liverman 2021-12-03 08:34:29 -05:00
parent d1c86eaf9b
commit fc3957077c
No known key found for this signature in database
GPG key ID: 3AF83985B6C857C6
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmpooler.rb
View file

@ -87,6 +87,14 @@ 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']
set_linked_clone(parsed_config) set_linked_clone(parsed_config)
parsed_config[:config][:default_pool_providers] = if ENV['DEFAULT_POOL_PROVIDERS']
ENV['DEFAULT_POOL_PROVIDERS'].split(',')
elsif parsed_config[:config][:default_pool_providers]
parsed_config[:config][:default_pool_providers]
else
%w[dummy]
end
parsed_config[:redis] = parsed_config[:redis] || {} 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'] = string_to_int(ENV['REDIS_PORT']) if ENV['REDIS_PORT'] parsed_config[:redis]['port'] = string_to_int(ENV['REDIS_PORT']) if ENV['REDIS_PORT']

6
lib/vmpooler/pool_manager.rb
View file

@ -635,10 +635,10 @@ module Vmpooler
end end
# @return [Array] - returns a list of providers that should always be loaded # @return [Array] - returns a list of providers that should always be loaded
# note: vsphere is the default if user does not specify although this should not be
# if vsphere is to no longer be loaded by default please remove
def default_providers def default_providers
@default_providers ||= %w[dummy] default_pool_providers = config[:config][:default_pool_providers]
$logger.log('i', "[+] [default_providers] The default providers are: #{default_pool_providers}")
@default_providers ||= default_pool_providers
end end
def get_pool_name_for_vm(vm_name, redis) def get_pool_name_for_vm(vm_name, redis)