diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index 7bd7c22..7142be2 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -87,6 +87,14 @@ module Vmpooler parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS'] 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]['server'] = ENV['REDIS_SERVER'] || parsed_config[:redis]['server'] || 'localhost' parsed_config[:redis]['port'] = string_to_int(ENV['REDIS_PORT']) if ENV['REDIS_PORT'] diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 7c8c727..c5ceeba 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -635,10 +635,10 @@ module Vmpooler end # @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 - @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 def get_pool_name_for_vm(vm_name, redis)