Skip to content

Commit

Permalink
Merge pull request #428 from puppetlabs/CAT-2205-puppetlabs-powershel…
Browse files Browse the repository at this point in the history
…l-not-fully-updated-for-puppet-8-uses-legacy-facts

(CAT-2205): Replaced legacy fact osfamily with os.family
  • Loading branch information
span786 authored Jan 23, 2025
2 parents ca78635 + 3b74f33 commit c9a9964
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions hiera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/exec/powershell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'puppet/provider/exec'

Puppet::Type.type(:exec).provide :powershell, parent: Puppet::Provider::Exec do
confine operatingsystem: :windows
confine 'os.name': :windows
confine feature: :pwshlib

desc <<-DESC
Expand Down

0 comments on commit c9a9964

Please sign in to comment.