Merge pull request #466 from puppetlabs/CAT-2203

(CAT-2203) Removing legacy facts

Author: amitkarsale

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"

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]