From 3dbe31a18458958ec1014062b316d081209e842f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 1 Jun 2023 11:16:01 +0200 Subject: [PATCH 1/5] Add support for stdlib > 8.0 and < 9.0 --- .fixtures.yml | 2 +- metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 1236859..00c3a59 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,6 +2,6 @@ fixtures: forge_modules: stdlib: repo: puppetlabs/stdlib - ref: 7.0.0 + ref: 8.6.0 symlinks: sssd: "#{source_dir}" diff --git a/metadata.json b/metadata.json index 9a84b6b..50f56df 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.2.0 < 8.0.0" + "version_requirement": ">= 4.2.0 < 9.0.0" } ], "data_provider": "hiera", From 7f9a6ca2e62f39ff33b2124b352c65a66b635f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 25 Apr 2024 12:31:11 +0200 Subject: [PATCH 2/5] Add support for stdlib > 8.0 and < 10.0 --- .fixtures.yml | 2 +- metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 00c3a59..0d73d4b 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,6 +2,6 @@ fixtures: forge_modules: stdlib: repo: puppetlabs/stdlib - ref: 8.6.0 + ref: 9.6.0 symlinks: sssd: "#{source_dir}" diff --git a/metadata.json b/metadata.json index 50f56df..f572652 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.2.0 < 9.0.0" + "version_requirement": ">= 4.2.0 < 10.0.0" } ], "data_provider": "hiera", From f3bdfb62277c7674ec3e84ac031cbb0ee1af63de Mon Sep 17 00:00:00 2001 From: Yorick Poels Date: Thu, 19 Jun 2025 14:04:18 +0200 Subject: [PATCH 3/5] Remove deprecation warnings in puppet 8 Make the module puppet 8 compatible by bumping hiera to version 5 and removing an obsolete definition from metadata.json --- hiera.yaml | 8 ++++++-- metadata.json | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hiera.yaml b/hiera.yaml index c6ee5b2..0a0968c 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -1,6 +1,10 @@ --- -version: 4 -datadir: data +version: 5 + +defaults: + datadir: 'data' + data_hash: 'yaml_data' + hierarchy: - name: "Operating System Major Version" backend: yaml diff --git a/metadata.json b/metadata.json index 9a84b6b..2f8f494 100644 --- a/metadata.json +++ b/metadata.json @@ -13,8 +13,6 @@ "version_requirement": ">= 4.2.0 < 8.0.0" } ], - "data_provider": "hiera", - "description": "Install and configure the System Security Services Daemon", "tags": [ "sssd" ], From b8d3f360d654322c1a8b2c779013bc5963b2b0bd Mon Sep 17 00:00:00 2001 From: yorickps Date: Thu, 19 Jun 2025 16:03:26 +0200 Subject: [PATCH 4/5] Fix hiera hierarchy (#2) Set undefined values for some params --- data/{Debian.yaml => Debian-family.yaml} | 0 data/{RedHat.yaml => RedHat-family.yaml} | 0 data/common.yaml | 2 ++ hiera.yaml | 15 +++++++-------- 4 files changed, 9 insertions(+), 8 deletions(-) rename data/{Debian.yaml => Debian-family.yaml} (100%) rename data/{RedHat.yaml => RedHat-family.yaml} (100%) 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 0a0968c..cefcbd7 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -6,13 +6,12 @@ defaults: 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" - backend: yaml - path: "%{facts.os.family}" + - name: 'Operating System Family' + path: '%{facts.os.family}.yaml' + + - name: 'common' + path: 'common.yaml' - - name: "common" - backend: yaml From 1c8539ef897aabb6962ffe8121ae20760dd0edd1 Mon Sep 17 00:00:00 2001 From: yorickps Date: Thu, 19 Jun 2025 17:12:09 +0200 Subject: [PATCH 5/5] Use stdlib::ensure_packages (#3) ensure_packages has been deprecated in Puppet 8 --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) }