From 25930878b7663873f75f514abf3daa9cde8a50b4 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Fri, 25 Sep 2020 17:56:01 +0200 Subject: [PATCH] Fix refresh_cache and request_timeout parameters usage Considering the name of these parameters, they should be affect system-wide configuration but were set in root configuration file. This commit fixes this unexpected behavior. --- templates/hammer_etc.yml.erb | 6 ++++++ templates/hammer_root.yml.erb | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/hammer_etc.yml.erb b/templates/hammer_etc.yml.erb index 6deda14c2..b335e94e6 100644 --- a/templates/hammer_etc.yml.erb +++ b/templates/hammer_etc.yml.erb @@ -4,6 +4,12 @@ # Your foreman server address :host: '<%= @foreman_url_real %>' + + # Check API documentation cache status on each request + :refresh_cache: <%= @refresh_cache %> + + # API request timeout in seconds, set -1 for infinity + :request_timeout: <%= @request_timeout %> <% if @ssl_ca_file_real -%> :ssl: diff --git a/templates/hammer_root.yml.erb b/templates/hammer_root.yml.erb index c1cb27017..c669b5560 100644 --- a/templates/hammer_root.yml.erb +++ b/templates/hammer_root.yml.erb @@ -2,9 +2,3 @@ # Credentials. You'll be asked for the interactively if you leave them blank here :username: '<%= @username_real %>' :password: '<%= @password_real %>' - - # Check API documentation cache status on each request - :refresh_cache: <%= @refresh_cache %> - - # API request timeout in seconds, set -1 for infinity - :request_timeout: <%= @request_timeout %>