Move from params.pp to Hiera data

data/common.yaml

@@ -0,0 +1,14 @@
+---
+openldap::client::package: "openldap"
+openldap::client::file: "/etc/openldap/ldap.conf"
+openldap::server::confdir: "/etc/openldap/slapd.d"
+openldap::server::conffile: "/etc/openldap/slapd.conf"
+openldap::server::group: "ldap"
+openldap::server::owner: "ldap"
+openldap::server::service: "slapd"
+openldap::utils::package: ~
+openldap::server::escape_ldapi_ifs: false
+openldap::server::enable_chown: ~
+openldap::server::register_slp: ~
+openldap::server::ldap_config_backend: ~
+openldap::server::enable_memory_limit: ~

data/os/Archlinux.yaml

@@ -0,0 +1,2 @@
+---
+openldap::server::package: "openldap"

data/os/Debian.yaml

@@ -0,0 +1,9 @@
+---
+openldap::client::package: "libldap-2.4-2"
+openldap::client::file: "/etc/ldap/ldap.conf"
+openldap::server::confdir: "/etc/ldap/slapd.d"
+openldap::server::conffile: "/etc/ldap/slapd.conf"
+openldap::server::group: "openldap"
+openldap::server::owner: "openldap"
+openldap::server::package: "slapd"
+openldap::utils::package: "ldap-utils"

data/os/FreeBSD.yaml

@@ -0,0 +1,7 @@
+---
+openldap::client::package: "openldap-client"
+openldap::client::file: "/usr/local/etc/openldap/ldap.conf"
+openldap::server::confdir: "/usr/local/etc/openldap/slapd.d"
+openldap::server::conffile: "/usr/local/etc/openldap/slapd.conf"
+openldap::server::package: "openldap-server"
+openldap::server::escape_ldapi_ifs: true

data/os/RedHat.yaml

@@ -0,0 +1,3 @@
+---
+openldap::server::package: "openldap-servers"
+openldap::utils::package: "openldap-clients"

data/os/RedHat/5.yaml

@@ -0,0 +1,2 @@
+---
+openldap::server::service: "ldap"

data/os/Suse.yaml

@@ -0,0 +1,8 @@
+---
+openldap::client::package: "openldap2-client"
+openldap::server::package: "openldap2"
+openldap::server::escape_ldapi_ifs: true
+openldap::server::enable_chown: true
+openldap::server::register_slp: true
+openldap::server::ldap_config_backend: "files"
+openldap::server::enable_memory_limit: true

hiera.yaml

@@ -0,0 +1,16 @@
+---
+version: 5
+
+defaults:
+  datadir: 'data'
+  data_hash: 'yaml_data'
+
+hierarchy:
+  - name: 'family/operatingsystemmajrelease'
+    path: 'os/%{facts.osfamily}/%{facts.operatingsystemmajrelease}.yaml'
+
+  - name: 'family'
+    path: 'os/%{facts.osfamily}.yaml'
+
+  - name: 'common'
+    path: 'common.yaml'

manifests/client.pp

@@ -1,7 +1,7 @@
 # See README.md for details.
 class openldap::client (
-  $package                                      = $openldap::params::client_package,
-  $file                                         = $openldap::params::client_conffile,
+  $package,
+  $file,
 
   # Options
   $base                                         = undef,
@@ -52,7 +52,7 @@
 
   # SUDO Options
   $sudoers_base                                 = undef,
-) inherits openldap::params {
+) {
   contain openldap::client::install
   contain openldap::client::config
   Class['openldap::client::install'] -> Class['openldap::client::config']

manifests/server.pp

@@ -1,12 +1,14 @@
 # See README.md for details.
 class openldap::server (
-  $package                                          = $openldap::params::server_package,
-  $confdir                                          = $openldap::params::server_confdir,
-  $conffile                                         = $openldap::params::server_conffile,
-  $service                                          = $openldap::params::server_service,
+  $package,
+  $confdir,
+  $conffile,
+  $service,
+  $owner,
+  $group,
+  Boolean $escape_ldapi_ifs,
+  Optional[Boolean] $enable_chown,
   Optional[Boolean] $service_hasstatus              = undef,
-  $owner                                            = $openldap::params::server_owner,
-  $group                                            = $openldap::params::server_group,
   $enable                                           = true,
   $start                                            = true,
   Optional[Stdlib::Absolutepath] $ssl_key           = undef,
@@ -16,19 +18,17 @@
   $ldap_ifs                                         = ['/'],
   $ldaps_ifs                                        = [],
   $ldapi_ifs                                        = ['/'],
-  Boolean $escape_ldapi_ifs                         = $openldap::params::escape_ldapi_ifs,
   Optional[String] $slapd_params                    = undef,
-  Optional[Boolean] $enable_chown                   = $openldap::params::enable_chown,
   Optional[Stdlib::Port] $ldap_port                 = undef,
   Optional[Stdlib::IP::Address] $ldap_address       = undef,
   Optional[Stdlib::Port] $ldaps_port                = undef,
   Optional[Stdlib::IP::Address] $ldaps_address      = undef,
   Optional[Stdlib::Absolutepath] $ldapi_socket_path = undef,
-  Optional[Boolean] $register_slp                   = $openldap::params::register_slp,
+  Optional[Boolean] $register_slp,
   Optional[Stdlib::Absolutepath] $krb5_keytab_file  = undef,
-  Optional[String] $ldap_config_backend             = $openldap::params::ldap_config_backend,
-  Optional[Boolean] $enable_memory_limit            = $openldap::params::enable_memory_limit,
-) inherits openldap::params {
+  Optional[String] $ldap_config_backend,
+  Optional[Boolean] $enable_memory_limit,
+) {
   class { 'openldap::server::install': }
   -> class { 'openldap::server::config': }
   ~> class { 'openldap::server::service': }

manifests/utils.pp

@@ -1,7 +1,7 @@
 # See README.md for details.
 class openldap::utils (
-  $package = $openldap::params::utils_package,
-) inherits openldap::params {
+  $package,
+) {
   if $package {
     package { $package:
       ensure => present,