From b01015e7a4efce137c16895c881743b93f491887 Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Thu, 16 Jan 2025 23:10:48 +0530 Subject: [PATCH] (CAT-2203) Removing legacy facts --- hiera.yaml | 4 ++-- lib/puppet/provider/java_ks/keytool.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hiera.yaml b/hiera.yaml index 545fff3..72369de 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -6,14 +6,14 @@ defaults: # Used for any hierarchy level that omits these keys. data_hash: yaml_data # Use the built-in YAML backend. hierarchy: - - name: "osfamily/major release" + - name: "os.family/major release" paths: # Used to distinguish between Debian and Ubuntu - "os/%{facts.os.name}/%{facts.os.release.major}.yaml" - "os/%{facts.os.family}/%{facts.os.release.major}.yaml" # Used for Solaris - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml" - - name: "osfamily" + - name: "os.family" paths: - "os/%{facts.os.name}.yaml" - "os/%{facts.os.family}.yaml" diff --git a/lib/puppet/provider/java_ks/keytool.rb b/lib/puppet/provider/java_ks/keytool.rb index 3bbef32..8f94c6b 100644 --- a/lib/puppet/provider/java_ks/keytool.rb +++ b/lib/puppet/provider/java_ks/keytool.rb @@ -358,7 +358,7 @@ def run_command(cmd, target = false, stdinfile = false, env = {}) # From a best practice standpoint the keystore should be protected by file # permissions and not just the passphrase so "making it work on SLES" # trumps. - if Facter.value('osfamily') == 'Suse' && @resource[:password] + if Facter.value('os.family') == 'Suse' && @resource[:password] cmd_to_run = cmd.is_a?(String) ? cmd.split(%r{\s}).first : cmd.first if cmd_to_run == command_keytool cmd << '-srcstorepass' << @resource[:password]