mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 18:08:42 -05:00
Merge 21692e021d into 99056f7bf1
This commit is contained in:
commit
c095a0ff97
1 changed files with 9 additions and 0 deletions
|
|
@ -48,6 +48,15 @@ module Vmpooler
|
||||||
parsed_config.deep_merge(extra_config)
|
parsed_config.deep_merge(extra_config)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
parsed_config[:config]['pools_from_dir'] = ENV['POOLS_FROM_DIR'] if ENV['POOLS_FROM_DIR']
|
||||||
|
if parsed_config[:config]['pools_from_dir'] && Dir.exist?(parsed_config[:config]['pools_from_dir'])
|
||||||
|
pools_from_dir = []
|
||||||
|
Dir["#{parsed_config[:config]['pools_from_dir']}/*.yaml"].sort.each do |file_name|
|
||||||
|
parsed_pool = Yaml.load_file(file_name)
|
||||||
|
pools_from_dir += parsed_pool if parsed_pool
|
||||||
|
end
|
||||||
|
parsed_config[:pools] = pools_from_dir unless pools_from_dir.empty?
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
parsed_config ||= { config: {} }
|
parsed_config ||= { config: {} }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue