openstack/puppet-openstacklib
Code Issues Proposed changes

Switch os_package_type to use os fact

Browse Source 
The operatingsystem fact is a legacy fact and we can use the $::os facts
instead.

Change-Id: I9e793b20ecc57fbd2b481a5bd53a317c54a3fa12
This commit is contained in:
Alex Schultz
2020-03-23 16:52:31 -06:00
parent 3b39a090b1
commit 30d919b0b8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/facter/os_package_type.rb
View File

@@ -12,17 +12,18 @@
# #
# In all other cases, we can consider that we're using vanilia (ie: unmodified) # In all other cases, we can consider that we're using vanilia (ie: unmodified)
# distribution packages, and we can set $::os_package_type depending on the # distribution packages, and we can set $::os_package_type depending on the
# value of $::operatingsystem. # value of $::os['name']
# #
# Having the below snipets helps simplifying checks within individual project # Having the below snipets helps simplifying checks within individual project
# manifests, so that we can just reuse $::os_package_type directly without # manifests, so that we can just reuse $::os_package_type directly without
# having to also check if it contains a value, then check for the content of # having to also check if it contains a value, then check for the content of
# $::operatingsystem (ie: what's below factors the check once and for all). # $::os['family'] (ie: what's below factors the check once and for all).
Facter.add('os_package_type') do Facter.add('os_package_type') do
setcode do setcode do
case Facter.value(:osfamily) os = Facter.value(:os)
case os['family']
when 'Debian' when 'Debian'
if Facter.value(:operatingsystem) == 'Debian' then if os['name'] == 'Debian' then
'debian' 'debian'
else else
'ubuntu' 'ubuntu'