Add defaults and make server_timeout and inotify configurable (fixes v…

…oxpupuli#85)

Add defaults from subscription-manager 1.21.10

manifests/init.pp

@@ -31,16 +31,17 @@
 #   Used directly in rhsm.conf template
 #   1 for Satellite 6
 #   0 for RHSM
+# @param inotify [Integer[0,1]] Inotify is used for monitoring changes in directories with certificates. When this directory is mounted using a network
+#   file system without inotify notification support (e.g. NFS), then disabling inotify is strongly recommended.
 # @param pool [String] Attach system to a specific pool instead of auto attach to compatible subscriptions
 # @param proxy_hostname [String] Proxy hostname
 # @param proxy_port [Integer] Proxy port
 # @param proxy_user [String] Proxy user
 # @param proxy_password [String] Proxy password
+# @param server_timeout [Integer[0]] HTTP timeout in seconds
 # @param baseurl [String] Base URL for rhsm, default provided
-# @param package_ensure [String] Whether to install subscription-manager
-# @param enabled_repo_ids [Array[String]
-#   A listing of the Repo IDs to provide to the subscription-manager repo
-#   --enable command.
+# @param package_ensure [String] Whether to install subscription-manager, directly passed to the `ensure` param of the package.
+# @param enabled_repo_ids [Array[String]] A listing of the Repo IDs to provide to the `subscription-manager repo --enable` command.
 #   
 # @example
 #   include rhsm
@@ -67,12 +68,14 @@
   $servername                        = 'subscription.rhsm.redhat.com',
   $serverprefix                      = '/subscription',
   $serverport                        = 443,
+  $server_timeout = 180,
   $ca_cert_dir                       = '/etc/rhsm/ca/',
   $repo_ca_cert_filename             = 'redhat-uep.pem',
   $repo_ca_cert_source               = undef,
   $manage_repos                      = 1,
   $full_refresh_on_yum               = 0,
   $package_ensure                    = 'latest',
+  $inotify                           = 1,
   Array[String[1]] $enabled_repo_ids = [],
 ) {
 

templates/rhsm.conf.erb

@@ -33,10 +33,15 @@ proxy_password = <%= @proxy_password %>
 # host/domain suffix blacklist for proxy, if needed
 no_proxy =
 
+server_timeout = <%= @server_timeout %>
+
 [rhsm]
 # Content base URL:
 baseurl= <%= @baseurl %>
 
+# Repository metadata GPG key URL:
+repomd_gpg_url =
+
 # Server CA certificate location:
 ca_cert_dir = <%= @ca_cert_dir %>
 
@@ -64,6 +69,17 @@ pluginDir = /usr/share/rhsm-plugins
 # The directory to search for plugin configuration files
 pluginConfDir = /etc/rhsm/pluginconf.d
 
+# Manage automatic enabling of yum/dnf plugins (product-id, subscription-manager)
+auto_enable_yum_plugins = 1
+
+# Inotify is used for monitoring changes in directories with certificates.
+# Currently only the /etc/pki/consumer directory is monitored by the
+# rhsm.service. When this directory is mounted using a network file system
+# without inotify notification support (e.g. NFS), then disabling inotify
+# is strongly recommended. When inotify is disabled, periodical directory
+# polling is used instead.
+inotify = <%= @inotify %>
+
 [rhsmcertd]
 # Interval to run cert check (in minutes):
 certCheckInterval = 240
@@ -80,4 +96,3 @@ default_log_level = INFO
 # rhsm.connection = DEBUG
 # rhsm-app = DEBUG
 # rhsm-app.rhsmd = DEBUG
-