openstack/fuel-library
Code Issues Proposed changes

FUEL-195

Browse Source 
increased timeout
This commit is contained in:
Ivan Bondar 2013-02-26 17:52:02 +04:00
parent 885a7350b5
commit af27b7f8f7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/mcollective/astute/lib/astute/config.rb
View File

@ -38,7 +38,7 @@ module Astute
def self.default_config
conf = {}
conf[:PUPPET_TIMEOUT] = 60*60 # maximum time it waits for the whole deployment
conf[:PUPPET_TIMEOUT] = 2*60*60 # maximum time it waits for the whole deployment
conf[:PUPPET_DEPLOY_INTERVAL] = 2 # sleep for ## sec, then check puppet status again
conf[:PUPPET_FADE_TIMEOUT] = 60 # How long it can take for puppet to exit after dumping to last_run_summary
conf[:MC_RETRIES] = 5 # MClient tries to call mcagent before failure

2
deployment/puppet/cobbler/templates/snippets/mcollective_conf.erb
View File

@ -34,7 +34,7 @@ metadata :name => "puppetd",
:license => "Apache License 2.0",
:version => "1.8",
:url => "https://github.com/puppetlabs/mcollective-plugins",
:timeout => 1800
:timeout => 2400
action "last_run_summary", :description => "Get a summary of the last puppet run" do
display :always

2
deployment/puppet/cobbler/templates/snippets/ubuntu_mcollective_config.erb
View File

@ -38,7 +38,7 @@ metadata :name => "puppetd",
:license => "Apache License 2.0",
:version => "1.8",
:url => "https://github.com/puppetlabs/mcollective-plugins",
:timeout => 1800
:timeout => 2400
action "last_run_summary", :description => "Get a summary of the last puppet run" do
display :always

2
deployment/puppet/mcollective/templates/puppetd.ddl.erb
View File

@ -4,7 +4,7 @@ metadata :name => "puppetd",
:license => "Apache License 2.0",
:version => "1.8",
:url => "https://github.com/puppetlabs/mcollective-plugins",
:timeout => 1800
:timeout => 2400
action "last_run_summary", :description => "Get a summary of the last puppet run" do
display :always