Skip to content

Commit

Permalink
(PDK-1609) Prefer os.name over os.family in hiera.yaml
Browse files Browse the repository at this point in the history
The `os.name` fact is more specific than the `os.family` fact and so it
should be higher in the hierarchy.
  • Loading branch information
rodjek authored and logicminds committed Apr 13, 2020
1 parent 888e65f commit 4d39f7a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions moduleroot_init/hiera.yaml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ defaults: # Used for any hierarchy level that omits these keys.
hierarchy:
- name: "osfamily/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"
# Used to distinguish between Debian and Ubuntu
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
- name: "osfamily"
paths:
- "os/%{facts.os.family}.yaml"
- "os/%{facts.os.name}.yaml"
- "os/%{facts.os.family}.yaml"
- name: 'common'
path: 'common.yaml'

0 comments on commit 4d39f7a

Please sign in to comment.