Add the confdir configuration option

Author: glennmorris

REFERENCE.md

@@ -41,6 +41,7 @@ The following parameters are available in the `clustershell` class:
 * [`maxrc`](#-clustershell--maxrc)
 * [`node_count`](#-clustershell--node_count)
 * [`verbosity`](#-clustershell--verbosity)
+* [`confdir`](#-clustershell--confdir)
 * [`ssh_user`](#-clustershell--ssh_user)
 * [`ssh_path`](#-clustershell--ssh_path)
 * [`ssh_options`](#-clustershell--ssh_options)
@@ -68,6 +69,7 @@ The following parameters are available in the `clustershell` class:
 * [`group_yaml`](#-clustershell--group_yaml)
 * [`include_genders_groups`](#-clustershell--include_genders_groups)
 * [`manage_genders`](#-clustershell--manage_genders)
+* [`clush_conf_dir`](#-clustershell--clush_conf_dir)
 
 ##### <a name="-clustershell--fanout"></a>`fanout`
 
@@ -141,6 +143,14 @@ Value for clush.conf verbosity
 
 Default value: `'1'`
 
+##### <a name="-clustershell--confdir"></a>`confdir`
+
+Data type: `String`
+
+Value for clush.conf confdir
+
+Default value: `'/etc/clustershell/clush.conf.d $CFGDIR/clush.conf.d'`
+
 ##### <a name="-clustershell--ssh_user"></a>`ssh_user`
 
 Data type: `Optional[String]`
@@ -357,6 +367,14 @@ Manage genders class when including genders group source
 
 Default value: `true`
 
+##### <a name="-clustershell--clush_conf_dir"></a>`clush_conf_dir`
+
+Data type: `Stdlib::Absolutepath`
+
+
+
+Default value: `'/etc/clustershell/clush.conf.d'`
+
 ## Defined types
 
 ### <a name="clustershell--group_source"></a>`clustershell::group_source`

manifests/init.pp

@@ -21,6 +21,8 @@
 #   Value for clush.conf node_count
 # @param verbosity
 #   Value for clush.conf verbosity
+# @param confdir
+#   Value for clush.conf confdir
 # @param ssh_user
 #   SSH user
 # @param ssh_path
@@ -85,6 +87,7 @@
   String $maxrc = 'no',
   String $node_count = 'yes',
   String $verbosity = '1',
+  String $confdir = '/etc/clustershell/clush.conf.d $CFGDIR/clush.conf.d',
   Optional[String] $ssh_user = undef,
   String $ssh_path = 'ssh',
   String $ssh_options = '-oStrictHostKeyChecking=no',
@@ -96,6 +99,7 @@
   String[1] $python_package_name = 'python3-clustershell',
   Stdlib::Absolutepath $conf_dir = '/etc/clustershell',
   Stdlib::Absolutepath $conf = '/etc/clustershell/clush.conf',
+  Stdlib::Absolutepath $clush_conf_dir = '/etc/clustershell/clush.conf.d',
   String[1] $conf_template  = 'clustershell/clush.conf.erb',
   Stdlib::Absolutepath $defaults_conf = '/etc/clustershell/defaults.conf',
   String[1] $defaults_conf_template = 'clustershell/defaults.conf.erb',
@@ -182,6 +186,14 @@
     content => template($conf_template),
   }
 
+  file { '/etc/clustershell/clush.conf.d':
+    ensure => 'directory',
+    path   => $clush_conf_dir,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+
   file { '/etc/clustershell/defaults.conf':
     ensure  => 'file',
     path    => $defaults_conf,

spec/classes/clustershell_spec.rb

@@ -70,6 +70,7 @@
                                 'maxrc: no',
                                 'node_count: yes',
                                 'verbosity: 1',
+                                'confdir: /etc/clustershell/clush.conf.d $CFGDIR/clush.conf.d',
                                 'ssh_path: ssh',
                                 'ssh_options: -oStrictHostKeyChecking=no'
                               ])

templates/clush.conf.erb

@@ -16,6 +16,7 @@ history_size: <%= @history_size %>
 maxrc: <%= @maxrc %>
 node_count: <%= @node_count %>
 verbosity: <%= @verbosity %>
+confdir: <%= @confdir %>
 
 # Add always all remote hosts to known_hosts without confirmation
 <% if @ssh_user -%>