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

Do not prepare template when config_template is set

Browse source
This commit is contained in:
kirby@puppetlabs.com 2018-07-02 14:12:17 -07:00
parent 1b17cceb01
commit 70156ba7f7
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/vmpooler/pool_manager.rb
View file

@ -628,10 +628,12 @@ module Vmpooler
prepare_template(pool, provider)
prepared_template = $redis.hget('vmpooler__template__prepared', pool['name'])
end
elsif not prepared_template == pool['template']
mutex.synchronize do
prepare_template(pool, provider)
prepared_template = $redis.hget('vmpooler__template__prepared', pool['name'])
elsif prepared_template != pool['template']
if configured_template.nil?
mutex.synchronize do
prepare_template(pool, provider)
prepared_template = $redis.hget('vmpooler__template__prepared', pool['name'])
end
end
end
return if configured_template.nil?