mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 10:08:40 -05:00
Allow for a globally-configurable 'pending' timeout
This commit is contained in:
parent
54a77a49d0
commit
b54d42aea4
2 changed files with 13 additions and 1 deletions
|
|
@ -336,7 +336,13 @@ module Vmpooler
|
||||||
|
|
||||||
# PENDING
|
# PENDING
|
||||||
$redis.smembers('vmpooler__pending__'+pool['name']).each do |vm|
|
$redis.smembers('vmpooler__pending__'+pool['name']).each do |vm|
|
||||||
pool['timeout'] ||= 15
|
unless (pool['timeout'])
|
||||||
|
if ($config[:config]['timeout'])
|
||||||
|
pool['timeout'] = $config[:config]['timeout']
|
||||||
|
else
|
||||||
|
pool['timeout'] = 15
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if (inventory[vm])
|
if (inventory[vm])
|
||||||
begin
|
begin
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,10 @@
|
||||||
# The number of concurrent VMware vSphere tasks to perform.
|
# The number of concurrent VMware vSphere tasks to perform.
|
||||||
# (optional; default: '10')
|
# (optional; default: '10')
|
||||||
#
|
#
|
||||||
|
# - timeout
|
||||||
|
# How long (in minutes) before marking a clone as 'failed' and retrying.
|
||||||
|
# (optional; default: '15')
|
||||||
|
#
|
||||||
# - vm_checktime
|
# - vm_checktime
|
||||||
# How often (in minutes) to check the sanity of VMs in 'ready' queues.
|
# How often (in minutes) to check the sanity of VMs in 'ready' queues.
|
||||||
# (optional; default: '15')
|
# (optional; default: '15')
|
||||||
|
|
@ -108,6 +112,7 @@
|
||||||
site_name: 'vmpooler'
|
site_name: 'vmpooler'
|
||||||
logfile: '/var/log/vmpooler.log'
|
logfile: '/var/log/vmpooler.log'
|
||||||
task_limit: 10
|
task_limit: 10
|
||||||
|
timeout: 15
|
||||||
vm_checktime: 15
|
vm_checktime: 15
|
||||||
vm_lifetime: 12
|
vm_lifetime: 12
|
||||||
domain: 'company.com'
|
domain: 'company.com'
|
||||||
|
|
@ -141,6 +146,7 @@
|
||||||
#
|
#
|
||||||
# - timeout
|
# - timeout
|
||||||
# How long (in minutes) before marking a clone as 'failed' and retrying.
|
# How long (in minutes) before marking a clone as 'failed' and retrying.
|
||||||
|
# This setting overrides any globally-configured timeout setting.
|
||||||
# (optional; default: '15')
|
# (optional; default: '15')
|
||||||
#
|
#
|
||||||
# - ready_ttl
|
# - ready_ttl
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue