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.
theforeman · Sep 25, 2020 · 0fbfcfc · 0fbfcfc
1 parent 026d474
commit 0fbfcfc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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 %>