puppet 7.24.0-universal-darwin → 8.0.1-universal-darwin

data/lib/puppet/provider/package/pkgutil.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Packaging using Peter Bonivart's pkgutil program.
 Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do
   desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris."
@@ -7,7 +8,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     pkgutil_bin = "/opt/csw/bin/pkgutil"
   end
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 
   has_command(:pkguti, pkgutil_bin) do
     environment :HOME => ENV['HOME']

data/lib/puppet/provider/package/portage.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/package'
 require 'fileutils'
 
@@ -20,9 +21,9 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
   end
 
-  confine :osfamily => :gentoo
+  confine 'os.family' => :gentoo
 
-  defaultfor :osfamily => :gentoo
+  defaultfor 'os.family' => :gentoo
 
   def self.instances
     result_format = self.eix_result_format

data/lib/puppet/provider/package/ports.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :freebsd do
   desc "Support for FreeBSD's ports.  Note that this, too, mixes packages and ports."
 

data/lib/puppet/provider/package/portupgrade.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Whole new package, so include pack stuff
 require_relative '../../../puppet/provider/package'
 
@@ -18,7 +19,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
   :portinfo      => "/usr/sbin/pkg_info"
 
   ## Activate this only once approved by someone important.
-  # defaultfor :operatingsystem => :freebsd
+  # defaultfor 'os.name' => :freebsd
 
   # Remove unwanted environment variables.
   %w{INTERACTIVE UNAME}.each do |var|

data/lib/puppet/provider/package/puppet_gem.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   desc "Puppet Ruby Gem support. This provider is useful for managing
         gems needed by the ruby provided in the puppet-agent package."
@@ -7,9 +8,9 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   confine :true => Puppet.runtime[:facter].value(:aio_agent_version)
 
   def self.windows_gemcmd
-    puppet_dir = Puppet::Util.get_env('PUPPET_DIR')
+    puppet_dir = ENV['PUPPET_DIR']
     if puppet_dir
-      File.join(Puppet::Util.get_env('PUPPET_DIR').to_s, 'bin', 'gem.bat')
+      File.join(ENV['PUPPET_DIR'].to_s, 'bin', 'gem.bat')
     else
       File.join(Gem.default_bindir, 'gem.bat')
     end

data/lib/puppet/provider/package/puppetserver_gem.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 unless Puppet::Util::Platform.jruby_fips?
   require 'rubygems/commands/list_command'
 end

data/lib/puppet/provider/package/rpm.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/rpm_compare'
 

data/lib/puppet/provider/package/rug.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :rug, :parent => :rpm do
   desc "Support for suse `rug` package manager."
 
@@ -5,7 +6,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
 
   commands :rug => "/usr/bin/rug"
   commands :rpm => "rpm"
-  confine    :operatingsystem => [:suse, :sles]
+  confine  'os.name' => [:suse, :sles]
 
   # Install a package using 'rug'.
   def install

data/lib/puppet/provider/package/sun.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Sun packaging.
 
 require_relative '../../../puppet/provider/package'
@@ -14,8 +15,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     :pkgadd => "/usr/sbin/pkgadd",
     :pkgrm => "/usr/sbin/pkgrm"
 
-  confine :osfamily => :solaris
-  defaultfor :osfamily => :solaris
+  confine 'os.family' => :solaris
+  defaultfor 'os.family' => :solaris
 
   has_feature :install_options
 

data/lib/puppet/provider/package/sunfreeware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # At this point, it's an exact copy of the Blastwave stuff.
 Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source => :sun do
   desc "Package management using sunfreeware.com's `pkg-get` command on Solaris.
@@ -5,5 +6,5 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source
     has not actually been tested."
   commands :pkgget => "pkg-get"
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 end

data/lib/puppet/provider/package/tdnf.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
   desc "Support via `tdnf`.
 
@@ -24,5 +25,5 @@ Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
       end
   end
 
-  defaultfor :operatingsystem => "PhotonOS" 
+  defaultfor 'os.name' => "PhotonOS" 
 end

data/lib/puppet/provider/package/up2date.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
   desc "Support for Red Hat's proprietary `up2date` package update
     mechanism."
 
   commands :up2date => "/usr/sbin/up2date-nox"
 
-  defaultfor :osfamily => :redhat, :lsbdistrelease => ["2.1", "3", "4"]
+  defaultfor 'os.family' => :redhat, 'os.distro.release.full' => ["2.1", "3", "4"]
 
-  confine    :osfamily => :redhat
+  confine    'os.family' => :redhat
 
   # Install a package using 'up2date'.
   def install

data/lib/puppet/provider/package/urpmi.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
   desc "Support via `urpmi`."
   commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm", :urpme => "urpme"
 
-  defaultfor :operatingsystem => [:mandriva, :mandrake]
+  defaultfor 'os.name' => [:mandriva, :mandrake]
 
   has_feature :versionable
 

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows

data/lib/puppet/provider/package/windows/package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/provider/package'
 require_relative '../../../../puppet/util/windows'
 

data/lib/puppet/provider/package/windows.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/windows'
 require_relative 'windows/package'
@@ -20,8 +21,8 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     `install_options` or `uninstall_options` attributes, respectively.  Puppet
     will automatically quote any option that contains spaces."
 
-  confine    :operatingsystem => :windows
-  defaultfor :operatingsystem => :windows
+  confine    'os.name' => :windows
+  defaultfor 'os.name' => :windows
 
   has_feature :installable
   has_feature :uninstallable

data/lib/puppet/provider/package/yum.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/util/package/version/rpm'
 require_relative '../../../puppet/util/rpm_compare'
@@ -32,8 +33,8 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
   end
 
-defaultfor :operatingsystem => :amazon
-defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
+defaultfor 'os.name' => :amazon
+defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
 
   def insync?(is)
     return false if [:purged, :absent].include?(is)
@@ -303,7 +304,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
 
     # Yum on el-4 and el-5 returns exit status 0 when trying to install a package it doesn't recognize;
     # ensure we capture output to check for errors.
-    no_debug = if Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i > 5 then ["-d", "0"] else [] end
+    no_debug = if Puppet.runtime[:facter].value('os.release.major').to_i > 5 then ["-d", "0"] else [] end
     command = [command(:cmd)] + no_debug + ["-e", error_level, "-y", install_options, operation, wanted].compact
     output = execute(command)
 

data/lib/puppet/provider/package/zypper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11.
 
@@ -9,8 +10,8 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
   commands :zypper => "/usr/bin/zypper"
 
-  defaultfor :operatingsystem => [:suse, :sles, :sled, :opensuse]
-  confine    :operatingsystem => [:suse, :sles, :sled, :opensuse]
+  defaultfor 'os.name' => [:suse, :sles, :sled, :opensuse]
+  confine    'os.name' => [:suse, :sles, :sled, :opensuse]
 
   # @api private
   # Reset the latest version hash to nil

data/lib/puppet/provider/package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/provider'
 
 class Puppet::Provider::Package < Puppet::Provider

data/lib/puppet/provider/package_targetable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Targetable package providers implement a `command` attribute.
 #
 # The `packages` hash passed to `Puppet::Provider::Package::prefetch` is deduplicated,

data/lib/puppet/provider/parsedfile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet'
 require_relative '../../puppet/util/filetype'
 require_relative '../../puppet/util/fileparsing'

data/lib/puppet/provider/service/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :base, :parent => :service do
   desc "The simplest form of Unix service support.
 
@@ -15,7 +16,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   # ported from the facter 2.x implementation, since facter 3.x
   # is dropping the fact (for which this was the only use)
   def getps
-    case Puppet.runtime[:facter].value(:operatingsystem)
+    case Puppet.runtime[:facter].value('os.name')
     when 'OpenWrt'
       'ps www'
     when 'FreeBSD', 'NetBSD', 'OpenBSD', 'Darwin', 'DragonFly'

data/lib/puppet/provider/service/bsd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :bsd, :parent => :init do
   desc <<-EOT
     Generic BSD form of `init`-style service management with `rc.d`.
@@ -5,7 +6,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
     Uses `rc.conf.d` for service enabling and disabling.
   EOT
 
-  confine :operatingsystem => [:freebsd, :dragonfly]
+  confine 'os.name' => [:freebsd, :dragonfly]
 
   def rcconf_dir
     '/etc/rc.conf.d'

data/lib/puppet/provider/service/daemontools.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
@@ -156,7 +157,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         Puppet::FileSystem.symlink(self.daemon, self.service)
       end
     end
-rescue Puppet::ExecutionFailure
+  rescue Puppet::ExecutionFailure
     raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
   end
 

data/lib/puppet/provider/service/debian.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :debian, :parent => :init do
@@ -19,9 +20,9 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ['1','2']
-  defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ['5','6','7']
-  defaultfor :operatingsystem => :devuan
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1','2']
+  defaultfor 'os.name' => :debian, 'os.release.major' => ['5','6','7']
+  defaultfor 'os.name' => :devuan
 
   # Remove the symlinks
   def disable

data/lib/puppet/provider/service/freebsd.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
 
-  confine :operatingsystem => [:freebsd, :dragonfly]
-  defaultfor :operatingsystem => [:freebsd, :dragonfly]
+  confine 'os.name' => [:freebsd, :dragonfly]
+  defaultfor 'os.name' => [:freebsd, :dragonfly]
 
   def rcconf()        '/etc/rc.conf' end
   def rcconf_local()  '/etc/rc.conf.local' end

data/lib/puppet/provider/service/gentoo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage gentoo services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :gentoo, :parent => :init do
@@ -10,7 +11,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
   commands :update => "/sbin/rc-update"
 
-  confine :operatingsystem => :gentoo
+  confine 'os.name' => :gentoo
 
   def disable
       output = update :del, @resource[:name], :default

data/lib/puppet/provider/service/init.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
   desc "Standard `init`-style service management."
 
   def self.defpath
-    case Puppet.runtime[:facter].value(:operatingsystem)
+    case Puppet.runtime[:facter].value('os.name')
     when "FreeBSD", "DragonFly"
       ["/etc/rc.d", "/usr/local/etc/rc.d"]
     when "HP-UX"
@@ -21,8 +22,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   # Debian and Ubuntu should use the Debian provider.
   # RedHat systems should use the RedHat provider.
   confine :true => begin
-      os = Puppet.runtime[:facter].value(:operatingsystem).downcase
-      family = Puppet.runtime[:facter].value(:osfamily).downcase
+      os = Puppet.runtime[:facter].value('os.name').downcase
+      family = Puppet.runtime[:facter].value('os.family').downcase
       !(os == 'debian' || os == 'ubuntu' || family == 'redhat')
   end
 
@@ -54,7 +55,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # these excludes were found with grep -r -L start /etc/init.d
     excludes += %w{rcS module-init-tools}
     # Prevent puppet failing on unsafe scripts from Yocto Linux
-    if Puppet.runtime[:facter].value(:osfamily) == "cisco-wrlinux"
+    if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
       excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
                    hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
                    rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
@@ -172,7 +173,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   def service_execute(type, command, fof = true, squelch = false, combine = true)
-    if type == :start && Puppet.runtime[:facter].value(:osfamily) == "Solaris"
+    if type == :start && Puppet.runtime[:facter].value('os.family') == "Solaris"
         command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end
     super(type, command, fof, squelch, combine)

data/lib/puppet/provider/service/launchd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
@@ -42,8 +43,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
   commands :launchctl => "/bin/launchctl"
 
-  defaultfor :operatingsystem => :darwin
-  confine :operatingsystem    => :darwin
+  defaultfor 'os.name' => :darwin
+  confine 'os.name'    => :darwin
   confine :feature            => :cfpropertylist
 
   has_feature :enableable
@@ -70,7 +71,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.get_os_version
-    @os_version ||= Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i
+    @os_version ||= Facter.value('os.release.major').to_i
   end
 
   # Defines the path to the overrides plist file where service enabling

data/lib/puppet/provider/service/openbsd.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :openbsd, :parent => :init do
 
   desc "Provider for OpenBSD's rc.d daemon control scripts"
 
   commands :rcctl => '/usr/sbin/rcctl'
 
-  confine :operatingsystem => :openbsd
-  defaultfor :operatingsystem => :openbsd
+  confine 'os.name' => :openbsd
+  defaultfor 'os.name' => :openbsd
   has_feature :flaggable
 
   def startcmd

data/lib/puppet/provider/service/openrc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Gentoo OpenRC
 Puppet::Type.type(:service).provide :openrc, :parent => :base do
   desc <<-EOT
@@ -7,8 +8,8 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
 
   EOT
 
-  defaultfor :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :funtoo
+  defaultfor 'os.name' => :gentoo
+  defaultfor 'os.name' => :funtoo
 
   has_command(:rcstatus, '/bin/rc-status') do
     environment :RC_SVCNAME => nil

data/lib/puppet/provider/service/openwrt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
   desc <<-EOT
     Support for OpenWrt flavored init scripts.
@@ -6,8 +7,8 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
 
   EOT
 
-  defaultfor :operatingsystem => :openwrt
-  confine :operatingsystem => :openwrt
+  defaultfor 'os.name' => :openwrt
+  confine 'os.name' => :openwrt
 
   has_feature :enableable
 

data/lib/puppet/provider/service/rcng.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   desc <<-EOT
     RCng service management with rc.d
   EOT
 
-  defaultfor :operatingsystem => [:netbsd, :cargos]
-  confine :operatingsystem => [:netbsd, :cargos]
+  defaultfor 'os.name' => [:netbsd, :cargos]
+  confine 'os.name' => [:netbsd, :cargos]
 
   def self.defpath
     "/etc/rc.d"

data/lib/puppet/provider/service/redhat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
@@ -8,8 +9,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
-  defaultfor :osfamily => :redhat
-  defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["10", "11"]
+  defaultfor 'os.family' => :redhat
+  defaultfor 'os.family' => :suse, 'os.release.major' => ["10", "11"]
 
   # Remove the symlinks
   def disable
@@ -35,7 +36,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # For Suse OS family, chkconfig returns 0 even if the service is disabled or non-existent
     # Therefore, check the output for '<name>  on' (or '<name>  B for boot services)
     # to see if it is enabled
-    return :false unless Puppet.runtime[:facter].value(:osfamily) != 'Suse' || output =~ /^#{name}\s+(on|B)$/
+    return :false unless Puppet.runtime[:facter].value('os.family') != 'Suse' || output =~ /^#{name}\s+(on|B)$/
 
     :true
   end

data/lib/puppet/provider/service/runit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>

data/lib/puppet/provider/service/service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::Type.type(:service).provide :service do
   desc "The simplest form of service support."
 

data/lib/puppet/provider/service/smf.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 
 # Solaris 10 SMF-style services.
@@ -18,9 +19,9 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     be imported if it does not exist.
   EOT
 
-  defaultfor :osfamily => :solaris
+  defaultfor 'os.family' => :solaris
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 
   commands :adm => "/usr/sbin/svcadm",
            :svcs => "/usr/bin/svcs",
@@ -101,14 +102,14 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   # Returns true if the provider supports incomplete services.
   def supports_incomplete_services?
-    Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value(:operatingsystemrelease), '11.1') >= 0
+    Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value('os.release.full'), '11.1') >= 0
   end
 
   # Returns true if the service is complete. A complete service is a service that
   # has the general/complete property defined.
   def complete_service?
     unless supports_incomplete_services?
-      raise Puppet::Error, _("Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine.") % { service: @resource[:name], release: Puppet.runtime[:facter].value(:operatingsystemrelease) }
+      raise Puppet::Error, _("Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine.") % { service: @resource[:name], release: Puppet.runtime[:facter].value('os.release.full') }
     end
 
     return @complete_service if @complete_service
@@ -138,7 +139,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   end
 
   def restartcmd
-    if Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value(:operatingsystemrelease), '11.2') >= 0
+    if Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value('os.release.full'), '11.2') >= 0
       [command(:adm), :restart, "-s", self.service_fmri]
     else
       # Synchronous restart only supported in Solaris 11.2 and above

data/lib/puppet/provider/service/src.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 
 # AIX System Resource controller (SRC)
@@ -13,8 +14,8 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   is not yet supported.
   "
 
-  defaultfor :operatingsystem => :aix
-  confine :operatingsystem => :aix
+  defaultfor 'os.name' => :aix
+  confine 'os.name' => :aix
 
   optional_commands :stopsrc  => "/usr/bin/stopsrc",
                     :startsrc => "/usr/bin/startsrc",

data/lib/puppet/provider/service/systemd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage systemd services using systemctl
 
 require_relative '../../../puppet/file_system'
@@ -13,19 +14,19 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor :osfamily => [:archlinux]
-  defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8", "9"]
-  defaultfor :osfamily => :redhat, :operatingsystem => :fedora
-  defaultfor :osfamily => :suse
-  defaultfor :osfamily => :coreos
-  defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"]
-  defaultfor :operatingsystem => :debian
-  notdefaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["5", "6", "7"] # These are using the "debian" method
-  defaultfor :operatingsystem => :LinuxMint
-  notdefaultfor :operatingsystem => :LinuxMint, :operatingsystemmajrelease => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
-  defaultfor :operatingsystem => :ubuntu
-  notdefaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
-  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3", "4"]
+  defaultfor 'os.family' => [:archlinux]
+  defaultfor 'os.family' => :redhat, 'os.release.major' => ["7", "8", "9"]
+  defaultfor 'os.family' => :redhat, 'os.name' => :fedora
+  defaultfor 'os.family' => :suse
+  defaultfor 'os.family' => :coreos
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2"]
+  defaultfor 'os.name' => :debian
+  notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
+  defaultfor 'os.name' => :LinuxMint
+  notdefaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
+  defaultfor 'os.name' => :ubuntu
+  notdefaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ["3", "4"]
 
   def self.instances
     i = []
@@ -110,7 +111,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     # The indirect state indicates that the unit is not enabled.
     return :false if output == 'indirect'
     return :true if (code == 0)
-    if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value(:osfamily).casecmp('debian').zero?)
+    if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?)
       ret = debian_enabled?
       return ret if ret
     end