puppet 7.9.0 → 7.10.0

data/lib/puppet/pops/serialization/to_data_converter.rb

@@ -14,6 +14,8 @@ module Serialization
     # @option options [Boolean] :local_reference use local references instead of duplicating complex entries
     # @option options [Boolean] :type_by_reference `true` if Object types are converted to references rather than embedded.
     # @option options [Boolean] :symbol_as_string `true` if Symbols should be converted to strings (with type loss)
+    # @option options [Boolean] :force_symbol `false` if Symbols should not be converted (rich_data and symbol_as_string must be false)
+    # @option options [Boolean] :silence_warnings `false` if warnings should be silenced
     # @option options [String] :message_prefix String to prepend to in warnings and errors
     # @return [Data] the processed result. An object assignable to `Data`.
     #
@@ -41,6 +43,12 @@ module Serialization
       @symbol_as_string = options[:symbol_as_string]
       @symbol_as_string = false if @symbol_as_string.nil?
 
+      @force_symbol = options[:force_symbol]
+      @force_symbol = false if @force_symbol.nil?
+
+      @silence_warnings = options[:silence_warnings]
+      @silence_warnings = false if @silence_warnings.nil?
+
       @rich_data = options[:rich_data]
       @rich_data = false if @rich_data.nil?
 
@@ -92,7 +100,11 @@ module Serialization
         elsif @rich_data
           { PCORE_TYPE_KEY => PCORE_TYPE_SYMBOL, PCORE_VALUE_KEY => value.to_s }
         else
-          unknown_to_string_with_warning(value)
+          if @force_symbol
+            value
+          else
+            @silence_warnings ? unknown_to_string(value) : unknown_to_string_with_warning(value)
+          end
         end
       elsif value.instance_of?(Array)
         process(value) do
@@ -117,7 +129,11 @@ module Serialization
           { PCORE_TYPE_KEY => PCORE_TYPE_SENSITIVE, PCORE_VALUE_KEY => to_data(value.unwrap) }
         end
       else
-        unknown_to_data(value)
+        if @rich_data
+          value_to_data_hash(value)
+        else
+          @silence_warnings ? unknown_to_string(value) : unknown_to_string_with_warning(value)
+        end
       end
     end
 
@@ -191,10 +207,6 @@ module Serialization
       v
     end
 
-    def unknown_to_data(value)
-      @rich_data ? value_to_data_hash(value) : unknown_to_string_with_warning(value)
-    end
-
     def unknown_key_to_string_with_warning(value)
       str = unknown_to_string(value)
       serialization_issue(Issues::SERIALIZATION_UNKNOWN_KEY_CONVERTED_TO_STRING, :path => path_to_s, :klass => value.class, :value => str)

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

@@ -161,7 +161,14 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
         command = is == :absent ? 'install' : 'update'
         options = ['-n']
         options.concat(join_options(@resource[:install_options])) if @resource[:install_options]
-        status = exec_cmd(command(:pkg), command, *options, "#{name}@#{p[:ensure]}")[:exit]
+
+        begin
+          unhold if properties[:mark] == :hold
+          status = exec_cmd(command(:pkg), command, *options, "#{name}@#{p[:ensure]}")[:exit]
+        ensure
+          hold if properties[:mark] == :hold
+        end
+
         case status
         when 4
           # if the first installable match would cause no changes, we're in sync

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

@@ -138,7 +138,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         Puppet.debug("Reading launchd plist #{filepath}")
         job = read_plist(filepath)
         next if job.nil?
-        if job.has_key?("Label")
+        if job.respond_to?(:key) && job.key?("Label")
           @label_to_path_map[job["Label"]] = filepath
         else
           #TRANSLATORS 'plist' and label' should not be translated

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

@@ -14,7 +14,7 @@ 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"]
+  defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8", "9"]
   defaultfor :osfamily => :redhat, :operatingsystem => :fedora
   defaultfor :osfamily => :suse
   defaultfor :osfamily => :coreos

data/lib/puppet/provider/user/useradd.rb

@@ -9,7 +9,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     install Ruby's shadow password library (often known as `ruby-libshadow`)
     if you wish to manage user passwords."
 
-  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage"
+  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd  => "chpasswd"
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
@@ -152,6 +152,38 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     set(:groups, value)
   end
 
+  def password=(value)
+    user = @resource[:name]
+    tempfile = Tempfile.new('puppet', :encoding => Encoding::UTF_8)
+    begin
+      # Puppet execute does not support strings as input, only files.
+      # The password is expected to be in an encrypted format given -e is specified:
+      tempfile << "#{user}:#{value}\n"
+      tempfile.flush
+
+      # Options '-e' use encrypted password
+      # Must receive "user:enc_password" as input
+      # command, arguments = {:failonfail => true, :combine => true}
+      cmd = [command(:chpasswd), '-e']
+      execute_options = {
+        :failonfail => false,
+        :combine => true,
+        :stdinfile => tempfile.path,
+        :sensitive => has_sensitive_data?
+      }
+      output = execute(cmd, execute_options)
+
+    rescue => detail
+      tempfile.close
+      tempfile.delete
+      raise Puppet::Error, "Could not set password on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
+    end
+
+    # chpasswd can return 1, even on success (at least on AIX 6.1); empty output
+    # indicates success
+    raise Puppet::ExecutionFailure, "chpasswd said #{output}" if output != ''
+  end
+
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
@@ -215,13 +247,15 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
   end
 
+  # Add properties and flags but skipping password related properties due to
+  # security risks
   def add_properties
     cmd = []
     # validproperties is a list of properties in undefined order
     # sort them to have a predictable command line in tests
     Puppet::Type.type(:user).validproperties.sort.each do |property|
       value = get_value_for_property(property)
-      next if value.nil?
+      next if value.nil? || property == :password
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       cmd << flag(property) << munge(property, value)
@@ -331,13 +365,12 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     if @resource[:shell]
       check_valid_shell
     end
-     super
-     if @resource.forcelocal? && self.groups?
-       set(:groups, @resource[:groups])
-     end
-     if @resource.forcelocal? && @resource[:expiry]
-       set(:expiry, @resource[:expiry])
-     end
+    super
+    if @resource.forcelocal?
+      set(:groups, @resource[:groups]) if self.groups?
+      set(:expiry, @resource[:expiry]) if @resource[:expiry]
+    end
+    set(:password, @resource[:password]) if @resource[:password]
   end
 
   def groups?

data/lib/puppet/transaction/persistence.rb

@@ -87,7 +87,17 @@ class Puppet::Transaction::Persistence
 
   # Save data from internal class to persistence store on disk.
   def save
-    Puppet::Util::Yaml.dump(@new_data, Puppet[:transactionstorefile])
+    converted_data = Puppet::Pops::Serialization::ToDataConverter.convert(
+      @new_data, {
+        symbol_as_string: false,
+        local_reference: false,
+        type_by_reference: true,
+        force_symbol: true,
+        silence_warnings: true,
+        message_prefix: to_s
+      }
+    )
+    Puppet::Util::Yaml.dump(converted_data, Puppet[:transactionstorefile])
   end
 
   # Use the catalog and run_mode to determine if persistence should be enabled or not

data/lib/puppet/transaction/report.rb

@@ -75,6 +75,10 @@ class Puppet::Transaction::Report
   # @return [String] the environment name
   attr_accessor :environment
 
+  # The name of the environment the agent initially started in
+  # @return [String] the environment name
+  attr_accessor :initial_environment
+
   # Whether there are changes that we decided not to apply because of noop
   # @return [Boolean]
   #
@@ -375,7 +379,17 @@ class Puppet::Transaction::Report
   # @api public
   #
   def raw_summary
-    report = { "version" => { "config" => configuration_version, "puppet" => Puppet.version  } }
+    report = {
+      "version" => {
+        "config" => configuration_version,
+        "puppet" => Puppet.version
+      },
+      "application" => {
+        "run_mode" => Puppet.run_mode.name.to_s,
+        "initial_environment" => initial_environment,
+        "converged_environment" => environment
+      }
+    }
 
     @metrics.each do |name, metric|
       key = metric.name.to_s

data/lib/puppet/type.rb

@@ -1272,7 +1272,7 @@ class Type
       like it does when running normally. However, if a resource attribute is not in
       the desired state (as declared in the catalog), Puppet will take no
       action, and will instead report the changes it _would_ have made. These
-      simulated changes will appear in the report sent to the puppet master, or
+      simulated changes will appear in the report sent to the primary Puppet server, or
       be shown on the console if running puppet agent or puppet apply in the
       foreground. The simulated changes will not send refresh events to any
       subscribing or notified resources, although Puppet will log that a refresh

data/lib/puppet/type/exec.rb

@@ -11,7 +11,10 @@ module Puppet
 
       * The command itself is already idempotent. (For example, `apt-get update`.)
       * The exec has an `onlyif`, `unless`, or `creates` attribute, which prevents
-        Puppet from running the command unless some condition is met.
+        Puppet from running the command unless some condition is met. The
+        `onlyif` and `unless` commands of an `exec` are used in the process of
+        determining whether the `exec` is already in sync, therefore they must be run
+        during a noop Puppet run.
       * The exec has `refreshonly => true`, which allows Puppet to run the
         command only when some other resource is changed. (See the notes on refreshing
         below.) 
@@ -456,6 +459,9 @@ module Puppet
         `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
         must fully qualify the command's name.
 
+        Since this command is used in the process of determining whether the
+        `exec` is already in sync, it must be run during a noop Puppet run.
+
         This parameter can also take an array of commands. For example:
 
             unless => ['test -f /tmp/file1', 'test -f /tmp/file2'],
@@ -516,6 +522,9 @@ module Puppet
         `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
         must fully qualify the command's name.
 
+        Since this command is used in the process of determining whether the
+        `exec` is already in sync, it must be run during a noop Puppet run.
+
         This parameter can also take an array of commands. For example:
 
             onlyif => ['test -f /tmp/file1', 'test -f /tmp/file2'],

data/lib/puppet/type/file.rb

@@ -91,23 +91,23 @@ Puppet::Type.newtype(:file) do
 
       Backing up to a local filebucket isn't particularly useful. If you want
       to make organized use of backups, you will generally want to use the
-      puppet master server's filebucket service. This requires declaring a
+      primary Puppet server's filebucket service. This requires declaring a
       filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
           # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
-            server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
+            server => 'puppet.example.com', # Optional; defaults to the configured primary Puppet server.
           }
 
           File { backup => main, }
 
-      If you are using multiple puppet master servers, you will want to
+      If you are using multiple primary servers, you will want to
       centralize the contents of the filebucket. Either configure your load
-      balancer to direct all filebucket traffic to a single master, or use
+      balancer to direct all filebucket traffic to a single primary server, or use
       something like an out-of-band rsync task to synchronize the content on all
-      masters.
+      primary servers.
 
       > **Note**: Enabling and using the backup option, and by extension the 
         filebucket resource, requires appropriate planning and management to ensure 
@@ -359,7 +359,7 @@ Puppet::Type.newtype(:file) do
       This command must have a fully qualified path, and should contain a
       percent (`%`) token where it would expect an input file. It must exit `0`
       if the syntax is correct, and non-zero otherwise. The command will be
-      run on the target system while applying the catalog, not on the puppet master.
+      run on the target system while applying the catalog, not on the primary Puppet server.
 
       Example:
 

data/lib/puppet/type/filebucket.rb

@@ -4,7 +4,7 @@ module Puppet
   Type.newtype(:filebucket) do
     @doc = <<-EOT
       A repository for storing and retrieving file content by MD5 checksum. Can
-      be local to each agent node, or centralized on a puppet master server. All
+      be local to each agent node, or centralized on a primary Puppet server. All
       puppet servers provide a filebucket service that agent nodes can access
       via HTTP, but you must declare a filebucket resource before any agents
       will do so.
@@ -25,7 +25,7 @@ module Puppet
           # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
-            server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
+            server => 'puppet.example.com', # Optional; defaults to the configured primary server.
           }
 
           File { backup => main, }

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 = '7.9.0'
+  PUPPETVERSION = '7.10.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 7.8.0-115-g2e290b736f\n"
+"Project-Id-Version: Puppet automation framework 7.9.0-154-gc8aa8b2175\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-07-06 12:22+0000\n"
-"PO-Revision-Date: 2021-07-06 12:22+0000\n"
+"POT-Creation-Date: 2021-08-11 13:52+0000\n"
+"PO-Revision-Date: 2021-08-11 13:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -534,93 +534,133 @@ msgstr ""
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:182
+#: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:272
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:175
+#: ../lib/puppet/configurer.rb:130
+msgid "The current total number of facts: %{size} exceeds the number of facts limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:134
+msgid "Fact %{name} with length: '%{length}' exceeds the length limit: %{limit}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:138
+msgid "The current number of top level facts: %{size} exceeds the top facts limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:142
+msgid "Fact value '%{value}' with the value length: '%{length}' exceeds the value length limit: %{max_length}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:146
+msgid "Payload with the current size of: '%{payload}' exceeds the payload size limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:184
+msgid "The size of the payload is %{payload}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:214
+msgid "The total number of facts registered is %{number_of_facts}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:265
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:191
+#: ../lib/puppet/configurer.rb:281
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:225
+#: ../lib/puppet/configurer.rb:315
 msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:239
+#: ../lib/puppet/configurer.rb:329
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:275
+#: ../lib/puppet/configurer.rb:366
 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:320
-msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
+#: ../lib/puppet/configurer.rb:389
+msgid "Environment not passed via CLI and no catalog was given, attempting to find out the last server-specified environment"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:335
-msgid "Using configured environment '%{env}'"
+#: ../lib/puppet/configurer.rb:394
+msgid "Could not find a usable environment in the lastrunfile. Either the file does not exist, does not have the required keys, or the values of 'initial_environment' and 'converged_environment' are identical."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:339
-msgid "Unable to fetch my node definition, but the agent run will continue:"
+#: ../lib/puppet/configurer.rb:398
+msgid "Using environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:367
+#: ../lib/puppet/configurer.rb:429
 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:378
+#: ../lib/puppet/configurer.rb:440
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:380
+#: ../lib/puppet/configurer.rb:442
 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:434
+#: ../lib/puppet/configurer.rb:505
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
+#: ../lib/puppet/configurer.rb:536
+msgid "Environment '%{environment}' not found on server, skipping initial pluginsync."
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:553 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
 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:467 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
+#: ../lib/puppet/configurer.rb:557 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:573
+msgid "Found last server-specified environment: %{environment}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:576
+msgid "Could not find last server-specified environment: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:586 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:487
+#: ../lib/puppet/configurer.rb:595
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:614
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:514
+#: ../lib/puppet/configurer.rb:622
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:529
+#: ../lib/puppet/configurer.rb:637
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:547
+#: ../lib/puppet/configurer.rb:655
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:568
+#: ../lib/puppet/configurer.rb:677
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -720,7 +760,7 @@ msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{all
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1919
+#: ../lib/puppet/defaults.rb:1944
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -1589,15 +1629,15 @@ msgstr ""
 msgid "Relative paths must not be fully qualified"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:55
+#: ../lib/puppet/file_serving/configuration.rb:56
 msgid "Cannot find file: Invalid mount '%{mount_name}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:56
+#: ../lib/puppet/file_serving/configuration.rb:57
 msgid "Cannot find file: Invalid relative path '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:104
+#: ../lib/puppet/file_serving/configuration.rb:106
 msgid "Error parsing fileserver configuration: %{detail}; using old configuration"
 msgstr ""
 
@@ -1625,11 +1665,11 @@ msgstr ""
 msgid "%{mount} is already mounted at %{name} at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:98
+#: ../lib/puppet/file_serving/configuration/parser.rb:100
 msgid "Removing mount \"%{mount}\": %{detail}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:102
+#: ../lib/puppet/file_serving/configuration/parser.rb:104
 msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
 msgstr ""
 
@@ -1719,7 +1759,7 @@ msgstr ""
 msgid "No client; expanding '%{path}' with local host"
 msgstr ""
 
-#: ../lib/puppet/file_serving/mount/modules.rb:8
+#: ../lib/puppet/file_serving/mount/modules.rb:8 ../lib/puppet/file_serving/mount/scripts.rb:6
 msgid "No module specified"
 msgstr ""
 
@@ -2284,120 +2324,120 @@ msgstr ""
 msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:71
+#: ../lib/puppet/indirector/catalog/compiler.rb:85
 msgid "Setup server facts for compiling"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:95
+#: ../lib/puppet/indirector/catalog/compiler.rb:113
 msgid "Unsupported facts format"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:136
+#: ../lib/puppet/indirector/catalog/compiler.rb:154
 msgid "Not inlining absent resource"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:139
+#: ../lib/puppet/indirector/catalog/compiler.rb:157
 msgid "Not inlining resource without sources"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:142
+#: ../lib/puppet/indirector/catalog/compiler.rb:160
 msgid "Not inlining unsupported source scheme"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:164
+#: ../lib/puppet/indirector/catalog/compiler.rb:182
 msgid "Not inlining file outside environment"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:170
+#: ../lib/puppet/indirector/catalog/compiler.rb:188
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:260
+#: ../lib/puppet/indirector/catalog/compiler.rb:278
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:281
+#: ../lib/puppet/indirector/catalog/compiler.rb:299
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:306
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:289
+#: ../lib/puppet/indirector/catalog/compiler.rb:307
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:309
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:292
+#: ../lib/puppet/indirector/catalog/compiler.rb:310
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:315
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:298
+#: ../lib/puppet/indirector/catalog/compiler.rb:316
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:300
+#: ../lib/puppet/indirector/catalog/compiler.rb:318
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:301
+#: ../lib/puppet/indirector/catalog/compiler.rb:319
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:323
+#: ../lib/puppet/indirector/catalog/compiler.rb:341
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:325
+#: ../lib/puppet/indirector/catalog/compiler.rb:343
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:328
+#: ../lib/puppet/indirector/catalog/compiler.rb:346
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:330
+#: ../lib/puppet/indirector/catalog/compiler.rb:348
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:347
+#: ../lib/puppet/indirector/catalog/compiler.rb:365
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:355
+#: ../lib/puppet/indirector/catalog/compiler.rb:373
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:375
+#: ../lib/puppet/indirector/catalog/compiler.rb:393
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:394
+#: ../lib/puppet/indirector/catalog/compiler.rb:412
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:427
+#: ../lib/puppet/indirector/catalog/compiler.rb:445
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:436
+#: ../lib/puppet/indirector/catalog/compiler.rb:454
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2409,7 +2449,7 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/rest.rb:32 ../lib/puppet/indirector/facts/rest.rb:20 ../lib/puppet/indirector/file_content/rest.rb:29 ../lib/puppet/indirector/file_metadata/rest.rb:26 ../lib/puppet/indirector/node/rest.rb:23
+#: ../lib/puppet/indirector/catalog/rest.rb:33 ../lib/puppet/indirector/facts/rest.rb:20 ../lib/puppet/indirector/file_content/rest.rb:29 ../lib/puppet/indirector/file_metadata/rest.rb:26 ../lib/puppet/indirector/node/rest.rb:23
 msgid "Find %{uri} resulted in 404 with the message: %{body}"
 msgstr ""
 
@@ -2780,11 +2820,11 @@ msgstr ""
 msgid "Cannot create instances of abstract terminus types"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:163
+#: ../lib/puppet/indirector/terminus.rb:167
 msgid "Instance name %{name} does not match requested key %{key}"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:169
+#: ../lib/puppet/indirector/terminus.rb:173
 msgid "Invalid instance type %{klass}, expected %{model_type}"
 msgstr ""
 
@@ -2853,8 +2893,8 @@ msgstr ""
 msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
 msgstr ""
 
-#. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
 #. TRANSLATORS 'Puppet.settings' should not be translated
+#. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
 #: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
 msgid "Global option %{option} does not exist in Puppet.settings"
 msgstr ""
@@ -3094,19 +3134,19 @@ msgstr ""
 msgid "Plan %{plan_name} not found in module %{module_name}."
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:64
+#: ../lib/puppet/module/plan.rb:63
 msgid "Plan names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:66
+#: ../lib/puppet/module/plan.rb:65
 msgid "Plan name cannot have extension %{ext}, must be .pp or .yaml"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:69
+#: ../lib/puppet/module/plan.rb:68
 msgid "Plan name cannot be a reserved word, but was '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:72
+#: ../lib/puppet/module/plan.rb:71
 msgid "Plan name cannot be a Puppet data type, but was '%{name}'"
 msgstr ""
 
@@ -3210,11 +3250,11 @@ msgstr ""
 msgid "Resolving dependencies ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:212
+#: ../lib/puppet/module_tool/applications/installer.rb:216
 msgid "Preparing to install ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:215
+#: ../lib/puppet/module_tool/applications/installer.rb:219
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
@@ -3884,7 +3924,7 @@ msgstr ""
 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:575 ../lib/puppet/pops/loaders.rb:301
+#: ../lib/puppet/node/environment.rb:574 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -6592,19 +6632,19 @@ msgstr ""
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:170
+#: ../lib/puppet/provider/package/pkg.rb:177
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:175
+#: ../lib/puppet/provider/package/pkg.rb:182
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:194
+#: ../lib/puppet/provider/package/pkg.rb:201
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:238 ../lib/puppet/provider/package/pkg.rb:264
+#: ../lib/puppet/provider/package/pkg.rb:245 ../lib/puppet/provider/package/pkg.rb:271
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -7968,72 +8008,72 @@ msgstr ""
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:118
+#: ../lib/puppet/type/exec.rb:121
 msgid "executed successfully"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:152
+#: ../lib/puppet/type/exec.rb:155
 msgid "Command exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:181
+#: ../lib/puppet/type/exec.rb:184
 msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:183
+#: ../lib/puppet/type/exec.rb:186
 msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:205
+#: ../lib/puppet/type/exec.rb:208
 msgid "Command must be a String or Array<String>, got value of class %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:238
+#: ../lib/puppet/type/exec.rb:241
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:240
+#: ../lib/puppet/type/exec.rb:243
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:296
+#: ../lib/puppet/type/exec.rb:299
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:309
+#: ../lib/puppet/type/exec.rb:312
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:325
+#: ../lib/puppet/type/exec.rb:328
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:342
+#: ../lib/puppet/type/exec.rb:345
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:346
+#: ../lib/puppet/type/exec.rb:349
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:359
+#: ../lib/puppet/type/exec.rb:362
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:363
+#: ../lib/puppet/type/exec.rb:366
 msgid "try_sleep cannot be a negative number"
 msgstr ""
 
 #. TRANSLATORS 'creates' is a parameter name and should not be translated
-#: ../lib/puppet/type/exec.rb:435
+#: ../lib/puppet/type/exec.rb:438
 msgid "Checking that 'creates' path '%{creates_path}' exists"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:484 ../lib/puppet/type/exec.rb:544
+#: ../lib/puppet/type/exec.rb:490 ../lib/puppet/type/exec.rb:553
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:636
+#: ../lib/puppet/type/exec.rb:645
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""