Merge "Fix default retries parameters for shell tasks"

This commit is contained in:
Jenkins 2016-11-22 09:05:40 +00:00 committed by Gerrit Code Review
commit 215c353c0d
3 changed files with 8 additions and 6 deletions

View File

@ -71,9 +71,11 @@ module Astute
conf[:reboot_timeout] = 900 # how long it can take for node to reboot
conf[:dump_timeout] = 3600 # maximum time it waits for the dump (meaningles to be larger
# than the specified in timeout of execute_shell_command mcagent
conf[:shell_retries] = 2 # default retries for shell task
conf[:shell_interval] = 2 # default interval for shell task
conf[:shell_timeout] = 300 # default timeout for shell task
conf[:stop_timeout] = 600 # how long it can take for stop
conf[:shell_cwd] = '/' # default cwd for shell task
conf[:stop_timeout] = 600 # how long it can take for stop
conf[:rsync_options] = '-c -r --delete -l' # default rsync options
conf[:keys_src_dir] = '/var/lib/fuel/keys' # path where ssh and openssl keys will be created
conf[:puppet_ssh_keys] = [

View File

@ -50,12 +50,12 @@ module Astute
def setup_default
@task['parameters']['timeout'] ||= Astute.config.shell_timeout
@task['parameters']['cwd'] ||= Astute.config.shell_cwd
@task['parameters']['retries'] ||= Astute.config.mc_retries
@task['parameters']['interval'] ||= Astute.config.mc_retry_interval
@task['parameters']['retries'] ||= Astute.config.shell_retries
@task['parameters']['interval'] ||= Astute.config.shell_interval
end
def generate_master_shell
@task.merge('node_id' => 'master')
end
end
end
end

View File

@ -61,8 +61,8 @@ module Astute
def setup_default
@task['parameters']['timeout'] ||= Astute.config.shell_timeout
@task['parameters']['cwd'] ||= Astute.config.shell_cwd
@task['parameters']['retries'] ||= Astute.config.mc_retries
@task['parameters']['interval'] ||= Astute.config.mc_retry_interval
@task['parameters']['retries'] ||= Astute.config.shell_retries
@task['parameters']['interval'] ||= Astute.config.shell_interval
end
def puppet_exec_template