puppet 6.11.1 → 6.12.0

data/lib/puppet/type.rb

@@ -1486,7 +1486,7 @@ class Type
           }
 
       Tags are useful for things like applying a subset of a host's configuration
-      with [the `tags` setting](/puppet/latest/configuration.html#tags)
+      with [the `tags` setting](https://puppet.com/docs/puppet/latest/configuration.html#tags)
       (e.g. `puppet agent --test --tags bootstrap`)."
 
     munge do |tags|

data/lib/puppet/type/file/data_sync.rb

@@ -42,7 +42,11 @@ module Puppet
           send resource[:loglevel], "[diff redacted]"
         else
           write_temporarily(param) do |path|
-            send resource[:loglevel], "\n" + diff(resource[:path], path)
+            diff_output = diff(resource[:path], path)
+            if diff_output.encoding == Encoding::BINARY || !diff_output.valid_encoding?
+              diff_output = "Binary files #{resource[:path]} and #{path} differ"
+            end
+            send resource[:loglevel], "\n" + diff_output
           end
         end
       end

data/lib/puppet/type/group.rb

@@ -175,7 +175,8 @@ module Puppet
     end
 
     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
-      desc "The name of the I&A module to use to manage this user"
+      desc "The name of the I&A module to use to manage this group.
+        This should be set to `files` if managing local groups."
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
@@ -216,7 +217,7 @@ module Puppet
              :required_features => :libuser,
              :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
-            being managed by some other Name Switch Service (NSS).
+            being managed by some other Name Switch Service (NSS). For AIX, refer to the `ia_load_module` parameter.
             
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , `lgroupadd`, and `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false

data/lib/puppet/type/user.rb

@@ -626,7 +626,8 @@ module Puppet
     end
 
     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
-      desc "The name of the I&A module to use to manage this user."
+      desc "The name of the I&A module to use to manage this user.
+        This should be set to `files` if managing local users."
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
@@ -690,7 +691,7 @@ module Puppet
             :required_features => :libuser,
             :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
-            being managed by some other Name Service Switch (NSS).
+            being managed by some other Name Service Switch (NSS). For AIX, refer to the `ia_load_module` parameter.
             
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , and `lgroupadd`, `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false

data/lib/puppet/util.rb

@@ -526,21 +526,44 @@ module Util
 
   module_function :thinmark
 
+  PUPPET_STACK_INSERTION_FRAME = /.*puppet_stack\.rb.*in.*`stack'/
+
   # utility method to get the current call stack and format it to a human-readable string (which some IDEs/editors
   # will recognize as links to the line numbers in the trace)
-  def self.pretty_backtrace(backtrace = caller(1))
-    backtrace.collect do |line|
-      _, path, rest = /^(.*):(\d+.*)$/.match(line).to_a
-      # If the path doesn't exist - like in one test, and like could happen in
-      # the world - we should just tolerate it and carry on. --daniel 2012-09-05
-      # Also, if we don't match, just include the whole line.
-      if path
-        path = Pathname(path).realpath rescue path
-        "#{path}:#{rest}"
+  def self.pretty_backtrace(backtrace = caller(1), puppetstack = [])
+    format_backtrace_array(backtrace, puppetstack).join("\n")
+  end
+
+  # arguments may be a Ruby stack, with an optional Puppet stack argument,
+  # or just a Puppet stack.
+  # stacks may be an Array of Strings "/foo.rb:0 in `blah'" or
+  # an Array of Arrays that represent a frame: ["/foo.pp", 0]
+  def self.format_backtrace_array(primary_stack, puppetstack = [])
+    primary_stack.flat_map do |frame|
+      frame = format_puppetstack_frame(frame) if frame.is_a?(Array)
+      primary_frame = resolve_stackframe(frame)
+
+      if primary_frame =~ PUPPET_STACK_INSERTION_FRAME && !puppetstack.empty?
+        [resolve_stackframe(format_puppetstack_frame(puppetstack.shift)),
+         primary_frame]
       else
-        line
+        primary_frame
       end
-    end.join("\n")
+    end
+  end
+
+  def self.resolve_stackframe(frame)
+    _, path, rest = /^(.*):(\d+.*)$/.match(frame).to_a
+    if path
+      path = Pathname(path).realpath rescue path
+      "#{path}:#{rest}"
+    else
+      frame
+    end
+  end
+
+  def self.format_puppetstack_frame(file_and_lineno)
+    file_and_lineno.join(':')
   end
 
   # Replace a file, securely.  This takes a block, and passes it the file

data/lib/puppet/util/logging.rb

@@ -48,12 +48,13 @@ module Logging
   #    wish to log a message at all; in this case it is likely that you are only calling this method in order
   #    to take advantage of the backtrace logging.
   def log_exception(exception, message = :default, options = {})
-    trace = Puppet[:trace] || options[:trace]
     level = options[:level] || :err
+    combined_trace = Puppet[:trace] || options[:trace]
+    puppet_trace = Puppet[:puppet_trace] || options[:puppet_trace]
+
     if message == :default && exception.is_a?(Puppet::ParseErrorWithIssue)
       # Retain all detailed info and keep plain message and stacktrace separate
-      backtrace = []
-      build_exception_trace(backtrace, exception, trace)
+      backtrace = build_exception_trace(exception, combined_trace, puppet_trace)
       Puppet::Util::Log.create({
           :level => level,
           :source => log_source,
@@ -67,28 +68,27 @@ module Logging
           :node => exception.node
         }.merge(log_metadata))
     else
-      send_log(level, format_exception(exception, message, trace))
+      send_log(level, format_exception(exception, message, combined_trace, puppet_trace))
     end
   end
 
-  def build_exception_trace(arr, exception, trace = true)
-    if trace and exception.backtrace
-      exception.backtrace.each do |line|
-        arr << line =~ /^(.+):(\d+.*)$/ ? ("#{Pathname($1).realpath}:#{$2}" rescue line) : line
-      end
-    end
+  def build_exception_trace(exception, combined_trace = true, puppet_trace = false)
+    built_trace = format_backtrace(exception, combined_trace, puppet_trace)
+
     if exception.respond_to?(:original)
       original =  exception.original
       unless original.nil?
-        arr << _('Wrapped exception:')
-        arr << original.message
-        build_exception_trace(arr, original, trace)
+        built_trace << _('Wrapped exception:')
+        built_trace << original.message
+        built_trace += build_exception_trace(original, combined_trace, puppet_trace)
       end
     end
+
+    built_trace
   end
   private :build_exception_trace
 
-  def format_exception(exception, message = :default, trace = true)
+  def format_exception(exception, message = :default, combined_trace = true, puppet_trace = false)
     arr = []
     case message
     when :default
@@ -99,16 +99,28 @@ module Logging
       arr << message
     end
 
-    if trace and exception.backtrace
-      arr << Puppet::Util.pretty_backtrace(exception.backtrace)
-    end
+    arr += format_backtrace(exception, combined_trace, puppet_trace)
+
     if exception.respond_to?(:original) and exception.original
       arr << _("Wrapped exception:")
-      arr << format_exception(exception.original, :default, trace)
+      arr << format_exception(exception.original, :default, combined_trace, puppet_trace)
     end
+
     arr.flatten.join("\n")
   end
 
+  def format_backtrace(exception, combined_trace, puppet_trace)
+    puppetstack = exception.respond_to?(:puppetstack) ? exception.puppetstack : []
+
+    if combined_trace and exception.backtrace
+      Puppet::Util.format_backtrace_array(exception.backtrace, puppetstack)
+    elsif puppet_trace && !puppetstack.empty?
+      Puppet::Util.format_backtrace_array(puppetstack)
+    else
+      []
+    end
+  end
+
   def log_and_raise(exception, message)
     log_exception(exception, message)
     raise exception, message + "\n" + exception.to_s, exception.backtrace

data/lib/puppet/util/windows/adsi.rb

@@ -1,6 +1,23 @@
 module Puppet::Util::Windows::ADSI
   require 'ffi'
 
+  # https://docs.microsoft.com/en-us/windows/win32/api/dsrole/ne-dsrole-dsrole_machine_role
+  STANDALONE_WORKSTATION = 0
+  MEMBER_WORKSTATION = 1
+  STANDALONE_SERVER = 2
+  MEMBER_SERVER = 3
+  BACKUP_DOMAIN_CONTROLLER = 4
+  PRIMARY_DOMAIN_CONTROLLER = 5
+
+  DOMAIN_ROLES = {
+    STANDALONE_WORKSTATION => :STANDALONE_WORKSTATION,
+    MEMBER_WORKSTATION => :MEMBER_WORKSTATION,
+    STANDALONE_SERVER => :STANDALONE_SERVER,
+    MEMBER_SERVER => :MEMBER_SERVER,
+    BACKUP_DOMAIN_CONTROLLER => :BACKUP_DOMAIN_CONTROLLER,
+    PRIMARY_DOMAIN_CONTROLLER => :PRIMARY_DOMAIN_CONTROLLER,
+  }
+
   class << self
     extend FFI::Library
 
@@ -94,6 +111,14 @@ module Puppet::Util::Windows::ADSI
       wmi_connection.execquery(query)
     end
 
+    def domain_role
+      unless @domain_role
+        query_result = Puppet::Util::Windows::ADSI.execquery('select DomainRole from Win32_ComputerSystem').to_enum.first
+        @domain_role = DOMAIN_ROLES[query_result.DomainRole] if query_result
+      end
+      @domain_role
+    end
+
     ffi_convention :stdcall
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724295(v=vs.85).aspx
@@ -176,7 +201,12 @@ module Puppet::Util::Windows::ADSI
         well_known = false
         if (sid = Puppet::Util::Windows::SID.name_to_principal(name_or_sid))
           # Examples of SidType include SidTypeUser, SidTypeGroup
-          return true if sid.account_type == "SidType#{@object_class.capitalize}".to_sym
+          if sid.account_type == "SidType#{@object_class.capitalize}".to_sym
+            # Check if we're getting back a local user when domain-joined
+            return true unless [:MEMBER_WORKSTATION, :MEMBER_SERVER].include?(Puppet::Util::Windows::ADSI.domain_role)
+            # The resource domain and the computer name are not always case-matching
+            return sid.domain.casecmp(Puppet::Util::Windows::ADSI.computer_name) == 0
+          end
 
           # 'well known group' is special as it can be a group like Everyone OR a user like SYSTEM
           # so try to resolve it
@@ -386,23 +416,23 @@ module Puppet::Util::Windows::ADSI
       ADS_UF_SCRIPT:                                 0x0001,
       ADS_UF_ACCOUNTDISABLE:                         0x0002,
       ADS_UF_HOMEDIR_REQUIRED:                       0x0008,
-      ADS_UF_LOCKOUT:                                0x0010,                          
-      ADS_UF_PASSWD_NOTREQD:                         0x0020,                   
-      ADS_UF_PASSWD_CANT_CHANGE:                     0x0040,               
-      ADS_UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED:        0x0080,       
-      ADS_UF_TEMP_DUPLICATE_ACCOUNT:                 0x0100,           
-      ADS_UF_NORMAL_ACCOUNT:                         0x0200,                   
-      ADS_UF_INTERDOMAIN_TRUST_ACCOUNT:              0x0800,        
-      ADS_UF_WORKSTATION_TRUST_ACCOUNT:              0x1000,        
-      ADS_UF_SERVER_TRUST_ACCOUNT:                   0x2000,             
-      ADS_UF_DONT_EXPIRE_PASSWD:                     0x10000,            
-      ADS_UF_MNS_LOGON_ACCOUNT:                      0x20000,               
-      ADS_UF_SMARTCARD_REQUIRED:                     0x40000,              
-      ADS_UF_TRUSTED_FOR_DELEGATION:                 0x80000,          
-      ADS_UF_NOT_DELEGATED:                          0x100000,                  
-      ADS_UF_USE_DES_KEY_ONLY:                       0x200000,               
-      ADS_UF_DONT_REQUIRE_PREAUTH:                   0x400000,               
-      ADS_UF_PASSWORD_EXPIRED:                       0x800000,               
+      ADS_UF_LOCKOUT:                                0x0010,
+      ADS_UF_PASSWD_NOTREQD:                         0x0020,
+      ADS_UF_PASSWD_CANT_CHANGE:                     0x0040,
+      ADS_UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED:        0x0080,
+      ADS_UF_TEMP_DUPLICATE_ACCOUNT:                 0x0100,
+      ADS_UF_NORMAL_ACCOUNT:                         0x0200,
+      ADS_UF_INTERDOMAIN_TRUST_ACCOUNT:              0x0800,
+      ADS_UF_WORKSTATION_TRUST_ACCOUNT:              0x1000,
+      ADS_UF_SERVER_TRUST_ACCOUNT:                   0x2000,
+      ADS_UF_DONT_EXPIRE_PASSWD:                     0x10000,
+      ADS_UF_MNS_LOGON_ACCOUNT:                      0x20000,
+      ADS_UF_SMARTCARD_REQUIRED:                     0x40000,
+      ADS_UF_TRUSTED_FOR_DELEGATION:                 0x80000,
+      ADS_UF_NOT_DELEGATED:                          0x100000,
+      ADS_UF_USE_DES_KEY_ONLY:                       0x200000,
+      ADS_UF_DONT_REQUIRE_PREAUTH:                   0x400000,
+      ADS_UF_PASSWORD_EXPIRED:                       0x800000,
       ADS_UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: 0x1000000
     }
 

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.11.1'
+  PUPPETVERSION = '6.12.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppet/x509/cert_provider.rb

@@ -16,12 +16,16 @@ class Puppet::X509::CertProvider
                  crlpath: Puppet[:hostcrl],
                  privatekeydir: Puppet[:privatekeydir],
                  certdir: Puppet[:certdir],
-                 requestdir: Puppet[:requestdir])
+                 requestdir: Puppet[:requestdir],
+                 hostprivkey: Puppet.settings.set_by_config?(:hostprivkey) ? Puppet[:hostprivkey] : nil,
+                 hostcert: Puppet.settings.set_by_config?(:hostcert) ? Puppet[:hostcert] : nil)
     @capath = capath
     @crlpath = crlpath
     @privatekeydir = privatekeydir
     @certdir = certdir
     @requestdir = requestdir
+    @hostprivkey = hostprivkey
+    @hostcert = hostcert
   end
 
   # Save `certs` to the configured `capath`.
@@ -146,7 +150,7 @@ class Puppet::X509::CertProvider
           else
             key.to_pem
           end
-    path = to_path(@privatekeydir, name)
+    path = @hostprivkey || to_path(@privatekeydir, name)
     save_pem(pem, path, **permissions_for_setting(:hostprivkey))
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to save private key for '%{name}'") % {name: name}, e)
@@ -165,7 +169,7 @@ class Puppet::X509::CertProvider
   # @raise [Puppet::Error] if the private key cannot be loaded
   # @api private
   def load_private_key(name, required: false, password: nil)
-    path = to_path(@privatekeydir, name)
+    path = @hostprivkey || to_path(@privatekeydir, name)
     pem = load_pem(path)
     if !pem && required
       raise Puppet::Error, _("The private key is missing from '%{path}'") % { path: path }
@@ -225,7 +229,7 @@ class Puppet::X509::CertProvider
   # @raise [Puppet::Error] if the client cert cannot be saved
   # @api private
   def save_client_cert(name, cert)
-    path = to_path(@certdir, name)
+    path = @hostcert || to_path(@certdir, name)
     save_pem(cert.to_pem, path, **permissions_for_setting(:hostcert))
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to save client certificate for '%{name}'") % {name: name}, e)
@@ -240,7 +244,7 @@ class Puppet::X509::CertProvider
   # @raise [Puppet::Error] if the client cert cannot be loaded
   # @api private
   def load_client_cert(name, required: false)
-    path = to_path(@certdir, name)
+    path = @hostcert || to_path(@certdir, name)
     pem = load_pem(path)
     if !pem && required
       raise Puppet::Error, _("The client certificate is missing from '%{path}'") % { path: path }

data/locales/puppet.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2019 Puppet, Inc.
+# Copyright (C) 2020 Puppet, Inc.
 # This file is distributed under the same license as the Puppet automation framework package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.10.1-308-g9fd2251\n"
+"Project-Id-Version: Puppet automation framework 6.11.1-197-g539749b170\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-11-14 01:31+0000\n"
-"PO-Revision-Date: 2019-11-14 01:31+0000\n"
+"POT-Creation-Date: 2020-01-07 15:20+0000\n"
+"PO-Revision-Date: 2020-01-07 15:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -547,93 +547,94 @@ msgstr ""
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:94 ../lib/puppet/configurer.rb:179
+#: ../lib/puppet/configurer.rb:94 ../lib/puppet/configurer.rb:177
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:172
+#: ../lib/puppet/configurer.rb:170
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:192
+#: ../lib/puppet/configurer.rb:186
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:232
+#: ../lib/puppet/configurer.rb:226 ../lib/puppet/http/resolver/server_list.rb:19
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:235
+#: ../lib/puppet/configurer.rb:229
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:268
+#: ../lib/puppet/configurer.rb:261
 msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:313
+#: ../lib/puppet/configurer.rb:306
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:318
+#: ../lib/puppet/configurer.rb:311
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:322
+#: ../lib/puppet/configurer.rb:315
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:351
+#: ../lib/puppet/configurer.rb:344
 msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:362
+#: ../lib/puppet/configurer.rb:355
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:364
+#: ../lib/puppet/configurer.rb:357
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:384
+#: ../lib/puppet/configurer.rb:398
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:417
+#: ../lib/puppet/configurer.rb:431 ../lib/puppet/http/resolver/server_list.rb:29
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:421
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:435 ../lib/puppet/http/resolver/server_list.rb:35
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:433 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:447 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:442
+#: ../lib/puppet/configurer.rb:456
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:462
+#: ../lib/puppet/configurer.rb:476
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:473
+#: ../lib/puppet/configurer.rb:487
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:488
+#: ../lib/puppet/configurer.rb:502
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:520
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:526
+#: ../lib/puppet/configurer.rb:540
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -697,38 +698,38 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:152
+#: ../lib/puppet/defaults.rb:171
 msgid "Cannot disable unrecognized warning types %{invalid}."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:153
+#: ../lib/puppet/defaults.rb:172
 msgid "Valid values are %{values}."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:494
+#: ../lib/puppet/defaults.rb:526
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:496
+#: ../lib/puppet/defaults.rb:528
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:686
+#: ../lib/puppet/defaults.rb:718
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:767
+#: ../lib/puppet/defaults.rb:799
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:948
+#: ../lib/puppet/defaults.rb:980
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1027 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1059 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
@@ -2221,24 +2222,24 @@ msgstr ""
 msgid "Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:31
-msgid "Failed to connect to %{uri}: %{message}"
+#: ../lib/puppet/http/client.rb:32
+msgid "Request to %{uri} timed out connect operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:96
-msgid "Sleeping for %{interval} seconds before retrying the request"
+#: ../lib/puppet/http/client.rb:34
+msgid "Request to %{uri} timed out read operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:125
+#: ../lib/puppet/http/client.rb:36
 msgid "Request to %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:127
-msgid "Request to %{uri} timed out after %{elapsed} seconds"
+#: ../lib/puppet/http/client.rb:42
+msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:129
-msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
+#: ../lib/puppet/http/client.rb:157
+msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
 #: ../lib/puppet/http/errors.rb:21
@@ -2261,6 +2262,11 @@ msgstr ""
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
 
+#. TRANSLATORS "pson", "preffered_serialization_format", and "puppetserver" should not be translated
+#: ../lib/puppet/http/service/report.rb:35
+msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
+msgstr ""
+
 #: ../lib/puppet/indirector.rb:25
 msgid "Indirection %{indirection_name} does not exist"
 msgstr ""
@@ -4072,11 +4078,11 @@ msgstr ""
 msgid "Trusted node data modified for node %{name}"
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:206
+#: ../lib/puppet/node/environment.rb:208
 msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:545 ../lib/puppet/pops/loaders.rb:298
+#: ../lib/puppet/node/environment.rb:551 ../lib/puppet/pops/loaders.rb:298
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4108,54 +4114,54 @@ msgstr ""
 
 #. TRANSLATORS: do not translate the variable names in this error message
 #. TRANSLATORS: do not translate the variable names in this error message
-#: ../lib/puppet/pal/pal_impl.rb:73 ../lib/puppet/pal/pal_impl.rb:166
+#: ../lib/puppet/pal/pal_impl.rb:73 ../lib/puppet/pal/pal_impl.rb:171
 msgid "manifest_file or code_string cannot be given when configured_by_env is true"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:214
+#: ../lib/puppet/pal/pal_impl.rb:219
 msgid "temporary environment name"
 msgstr ""
 
 #. TRANSLATORS: do not translate variable name string in these assertions
-#: ../lib/puppet/pal/pal_impl.rb:219
+#: ../lib/puppet/pal/pal_impl.rb:224
 msgid "A block must be given to 'in_tmp_environment'"
 msgstr ""
 
 #. TRANSLATORS terms in the assertions below are names of terms in code
-#: ../lib/puppet/pal/pal_impl.rb:273
+#: ../lib/puppet/pal/pal_impl.rb:278
 msgid "A block must be given to 'in_environment'"
 msgstr ""
 
 #. TRANSLATORS 'in_environment' is a name, do not translate
-#: ../lib/puppet/pal/pal_impl.rb:278
+#: ../lib/puppet/pal/pal_impl.rb:283
 msgid "The environment directory '%{env_dir}' does not exist"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:301
+#: ../lib/puppet/pal/pal_impl.rb:306
 msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:355
+#: ../lib/puppet/pal/pal_impl.rb:360
 msgid "Given variables must be a hash, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:361
+#: ../lib/puppet/pal/pal_impl.rb:366
 msgid "Given variable '%{varname}' has illegal name"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:365
+#: ../lib/puppet/pal/pal_impl.rb:370
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:505
+#: ../lib/puppet/pal/pal_impl.rb:510
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:519
+#: ../lib/puppet/pal/pal_impl.rb:524
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:526
+#: ../lib/puppet/pal/pal_impl.rb:531
 msgid "A block must be given"
 msgstr ""
 
@@ -6111,35 +6117,35 @@ msgstr ""
 msgid "No Puppet Type found for %{klass}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:112 ../lib/puppet/pops/time/timestamp.rb:83
+#: ../lib/puppet/pops/time/timespan.rb:114 ../lib/puppet/pops/time/timestamp.rb:83
 msgid "Unable to parse '%{str}' using any of the formats %{formats}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:133
+#: ../lib/puppet/pops/time/timespan.rb:135
 msgid "%{klass} cannot be added to a Timespan"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:145
+#: ../lib/puppet/pops/time/timespan.rb:147
 msgid "%{klass} cannot be subtracted from a Timespan"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:158
+#: ../lib/puppet/pops/time/timespan.rb:160
 msgid "A Timestamp cannot be multiplied by %{klass}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:169
+#: ../lib/puppet/pops/time/timespan.rb:171
 msgid "Can not do modulus on a Timespan using a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:189
+#: ../lib/puppet/pops/time/timespan.rb:191
 msgid "A Timespan cannot be divided by %{klass}"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:476
+#: ../lib/puppet/pops/time/timespan.rb:478
 msgid "Format specifiers %L and %N denotes fractions and must be used together with a specifier of higher magnitude"
 msgstr ""
 
-#: ../lib/puppet/pops/time/timespan.rb:552 ../lib/puppet/pops/time/timespan.rb:558
+#: ../lib/puppet/pops/time/timespan.rb:554 ../lib/puppet/pops/time/timespan.rb:560
 msgid "Unable to parse '%{timespan}' using format '%{format}'"
 msgstr ""
 
@@ -7054,11 +7060,11 @@ msgstr ""
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:55
+#: ../lib/puppet/provider/package_targetable.rb:56
 msgid "Provider %{name} package command is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:58
+#: ../lib/puppet/provider/package_targetable.rb:59
 msgid "Provider %{name} package command '%{cmd}' does not exist on this host"
 msgstr ""
 
@@ -7384,7 +7390,7 @@ msgstr ""
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
-#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:270
+#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:274
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
@@ -7724,7 +7730,7 @@ msgstr ""
 msgid "%{name} has not declared what class it wraps"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:32 ../lib/puppet/x509/cert_provider.rb:338
+#: ../lib/puppet/ssl/base.rb:32 ../lib/puppet/x509/cert_provider.rb:342
 msgid "Certname %{name} must not contain unprintable or non-ASCII characters"
 msgstr ""
 
@@ -7932,79 +7938,79 @@ msgstr ""
 msgid "Error registering ssl custom OIDs mapping from file '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:65
+#: ../lib/puppet/ssl/ssl_provider.rb:85
 msgid "CA certs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:66
+#: ../lib/puppet/ssl/ssl_provider.rb:86
 msgid "CRLs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:67
+#: ../lib/puppet/ssl/ssl_provider.rb:87
 msgid "Private key is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:68
+#: ../lib/puppet/ssl/ssl_provider.rb:88
 msgid "Client cert is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:74
+#: ../lib/puppet/ssl/ssl_provider.rb:94
 msgid "Unsupported key '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:78
+#: ../lib/puppet/ssl/ssl_provider.rb:98
 msgid "The certificate for '%{name}' does not match its private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:117
+#: ../lib/puppet/ssl/ssl_provider.rb:137
 msgid "Failed to load private key for host '%{name}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:131
+#: ../lib/puppet/ssl/ssl_provider.rb:151
 msgid "The CSR for host '%{name}' does not match the public key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:195
+#: ../lib/puppet/ssl/ssl_provider.rb:215
 msgid "The issuer '%{issuer}' of certificate '%{subject}' cannot be found locally"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:211
+#: ../lib/puppet/ssl/ssl_provider.rb:231
 msgid "The certificate '%{subject}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:213
+#: ../lib/puppet/ssl/ssl_provider.rb:233
 msgid "The certificate '%{subject}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:215
+#: ../lib/puppet/ssl/ssl_provider.rb:235
 msgid "The CRL issued by '%{issuer}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:217
+#: ../lib/puppet/ssl/ssl_provider.rb:237
 msgid "The CRL issued by '%{issuer}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:219
+#: ../lib/puppet/ssl/ssl_provider.rb:239
 msgid "Invalid signature for certificate '%{subject}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:221
+#: ../lib/puppet/ssl/ssl_provider.rb:241
 msgid "Invalid signature for CRL issued by '%{issuer}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:223
+#: ../lib/puppet/ssl/ssl_provider.rb:243
 msgid "The issuer '%{issuer}' of certificate '%{subject}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:226
+#: ../lib/puppet/ssl/ssl_provider.rb:246
 msgid "The CRL issued by '%{issuer}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:228
+#: ../lib/puppet/ssl/ssl_provider.rb:248
 msgid "Certificate '%{subject}' is revoked"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:232
+#: ../lib/puppet/ssl/ssl_provider.rb:252
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
@@ -8177,64 +8183,72 @@ msgstr ""
 msgid "PP syntax checker: \"%{message}\""
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:86
+#: ../lib/puppet/transaction.rb:90
 msgid "Some pre-run checks failed"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:102
+#: ../lib/puppet/transaction.rb:106
 msgid "Applying configuration version '%{version}'"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:125
+#: ../lib/puppet/transaction.rb:129
 msgid "Provider %{name} is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:141
+#: ../lib/puppet/transaction.rb:145
 msgid "Could not find a suitable provider for %{type}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:148
+#: ../lib/puppet/transaction.rb:152
 msgid "post_resource_eval failed for provider %{provider}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:165
+#: ../lib/puppet/transaction.rb:169
 msgid "resource is part of a dependency cycle"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:167
+#: ../lib/puppet/transaction.rb:171
 msgid "One or more resource dependency cycles detected in graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:182
+#: ../lib/puppet/transaction.rb:186
 msgid "Somehow left a component in the relationship graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:185
+#: ../lib/puppet/transaction.rb:189
 msgid "Starting to evaluate the resource (%{progress} of %{total})"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:188
+#: ../lib/puppet/transaction.rb:192
 msgid "Evaluated in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:301
+#: ../lib/puppet/transaction.rb:308
+msgid "Class dependency %{dep} has failures: %{status}"
+msgstr ""
+
+#: ../lib/puppet/transaction.rb:314
 msgid "Dependency %{dep} has failures: %{status}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:322
+#: ../lib/puppet/transaction.rb:336
 msgid "Prefetch failed for %{type_name} provider '%{name}'"
 msgstr ""
 
 #. TRANSLATORS `prefetch` is a function name and should not be translated
-#: ../lib/puppet/transaction.rb:367 ../lib/puppet/transaction.rb:370
+#: ../lib/puppet/transaction.rb:381 ../lib/puppet/transaction.rb:384
 msgid "Could not prefetch %{type_name} provider '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:403
+#: ../lib/puppet/transaction.rb:421
+msgid "Skipping resources in class because of failed class dependencies"
+msgstr ""
+
+#: ../lib/puppet/transaction.rb:425
 msgid "Skipping because of failed dependencies"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:408
+#: ../lib/puppet/transaction.rb:430
 msgid "Skipping because provider prefetch failed"
 msgstr ""
 
@@ -8804,31 +8818,31 @@ msgstr ""
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:702
+#: ../lib/puppet/type/user.rb:703
 msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:740
+#: ../lib/puppet/type/user.rb:741
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:743
+#: ../lib/puppet/type/user.rb:744
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:747
+#: ../lib/puppet/type/user.rb:748
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:759
+#: ../lib/puppet/type/user.rb:760
 msgid "purge_ssh_keys can only be true for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:766
+#: ../lib/puppet/type/user.rb:767
 msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:781
+#: ../lib/puppet/type/user.rb:782
 msgid "Class name must be provided."
 msgstr ""
 
@@ -9695,55 +9709,55 @@ msgstr ""
 msgid "Invalid tag '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:19
+#: ../lib/puppet/util/windows/adsi.rb:36
 msgid "ADSI connection error: %{e}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:42
+#: ../lib/puppet/util/windows/adsi.rb:59
 msgid "Failed to get computer name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:80
+#: ../lib/puppet/util/windows/adsi.rb:97
 msgid "Must use a valid SID::Principal"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:137
+#: ../lib/puppet/util/windows/adsi.rb:162
 msgid "Value must be in DOMAIN\\%{object_class} style syntax"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:163
+#: ../lib/puppet/util/windows/adsi.rb:188
 msgid "Could not resolve name: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:200
+#: ../lib/puppet/util/windows/adsi.rb:229
 msgid "Subclass must implement class-level method 'list_all'!"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:253
+#: ../lib/puppet/util/windows/adsi.rb:282
 msgid "Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:257
+#: ../lib/puppet/util/windows/adsi.rb:286
 msgid "%{object_class} update failed: %{error}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:283
+#: ../lib/puppet/util/windows/adsi.rb:312
 msgid "Cannot create user if group '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:423
+#: ../lib/puppet/util/windows/adsi.rb:452
 msgid "Unrecognized ADS UserFlags: %{unrecognized_flags}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:467
+#: ../lib/puppet/util/windows/adsi.rb:496
 msgid "Failed to get user name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:504
+#: ../lib/puppet/util/windows/adsi.rb:533
 msgid "Cannot delete user profile for '%{sid}' prior to Vista SP1"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:522
+#: ../lib/puppet/util/windows/adsi.rb:551
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
@@ -10125,72 +10139,72 @@ msgstr ""
 msgid "Puppet::Util::Yaml.load_file is deprecated. Use safe_load_file instead."
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:35
+#: ../lib/puppet/x509/cert_provider.rb:39
 msgid "Failed to save CA certificates to '%{capath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:48
+#: ../lib/puppet/x509/cert_provider.rb:52
 msgid "The CA certificates are missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:52
+#: ../lib/puppet/x509/cert_provider.rb:56
 msgid "Failed to load CA certificates from '%{capath}'"
 msgstr ""
 
 #. TRANSLATORS 'PEM' is an acronym and shouldn't be translated
-#: ../lib/puppet/x509/cert_provider.rb:63
+#: ../lib/puppet/x509/cert_provider.rb:67
 msgid "Failed to parse CA certificates as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:78
+#: ../lib/puppet/x509/cert_provider.rb:82
 msgid "Failed to save CRLs to '%{crlpath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:91
+#: ../lib/puppet/x509/cert_provider.rb:95
 msgid "The CRL is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:95
+#: ../lib/puppet/x509/cert_provider.rb:99
 msgid "Failed to load CRLs from '%{crlpath}'"
 msgstr ""
 
 #. TRANSLATORS 'PEM' is an acronym and shouldn't be translated
-#: ../lib/puppet/x509/cert_provider.rb:106
+#: ../lib/puppet/x509/cert_provider.rb:110
 msgid "Failed to parse CRLs as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:152
+#: ../lib/puppet/x509/cert_provider.rb:156
 msgid "Failed to save private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:171
+#: ../lib/puppet/x509/cert_provider.rb:175
 msgid "The private key is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:175
+#: ../lib/puppet/x509/cert_provider.rb:179
 msgid "Failed to load private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:231
+#: ../lib/puppet/x509/cert_provider.rb:235
 msgid "Failed to save client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:246
+#: ../lib/puppet/x509/cert_provider.rb:250
 msgid "The client certificate is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:250
+#: ../lib/puppet/x509/cert_provider.rb:254
 msgid "Failed to load client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:296
+#: ../lib/puppet/x509/cert_provider.rb:300
 msgid "Failed to save certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:311
+#: ../lib/puppet/x509/cert_provider.rb:315
 msgid "Failed to load certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:322
+#: ../lib/puppet/x509/cert_provider.rb:326
 msgid "Failed to delete certificate request for '%{name}'"
 msgstr ""