diff --git a/.fixtures.yml b/.fixtures.yml index 1236859..0d73d4b 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,6 +2,6 @@ fixtures: forge_modules: stdlib: repo: puppetlabs/stdlib - ref: 7.0.0 + ref: 9.6.0 symlinks: sssd: "#{source_dir}" diff --git a/data/Debian.yaml b/data/Debian-family.yaml similarity index 100% rename from data/Debian.yaml rename to data/Debian-family.yaml diff --git a/data/RedHat.yaml b/data/RedHat-family.yaml similarity index 100% rename from data/RedHat.yaml rename to data/RedHat-family.yaml diff --git a/data/common.yaml b/data/common.yaml index 5d02f2c..46d74f8 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -17,3 +17,5 @@ sssd::config: cache_credentials: true sssd::mkhomedir: true sssd::clear_cache: false +sssd::required_packages: {} +sssd::pam_mkhomedir_file_path: ~ \ No newline at end of file diff --git a/hiera.yaml b/hiera.yaml index c6ee5b2..cefcbd7 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -1,14 +1,17 @@ --- -version: 4 -datadir: data +version: 5 + +defaults: + datadir: 'data' + data_hash: 'yaml_data' + hierarchy: - - name: "Operating System Major Version" - backend: yaml - path: "%{facts.os.name}-%{facts.os.release.major}" + - name: 'Operating System Major Version' + path: '%{facts.os.name}-%{facts.os.release.major}.yaml' + + - name: 'Operating System Family' + path: '%{facts.os.family}.yaml' - - name: "Operating System Family" - backend: yaml - path: "%{facts.os.family}" + - name: 'common' + path: 'common.yaml' - - name: "common" - backend: yaml diff --git a/manifests/install.pp b/manifests/install.pp index 8dc44c7..523c039 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -6,6 +6,6 @@ ensure => $sssd::package_ensure, } - ensure_packages($sssd::required_packages) + stdlib::ensure_packages($sssd::required_packages) } diff --git a/metadata.json b/metadata.json index 9a84b6b..a956a3b 100644 --- a/metadata.json +++ b/metadata.json @@ -10,11 +10,9 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.2.0 < 8.0.0" + "version_requirement": ">= 4.2.0 < 10.0.0" } ], - "data_provider": "hiera", - "description": "Install and configure the System Security Services Daemon", "tags": [ "sssd" ],