puppet 6.0.7-universal-darwin → 6.0.8-universal-darwin

data/lib/puppet/transaction/event_manager.rb

@@ -155,11 +155,7 @@ class Puppet::Transaction::EventManager
     return true
   rescue => detail
     resource_error_message = _("Failed to call %{callback}: %{detail}") % { callback: callback, detail: detail }
-    resource.err resource_error_message
-    if not resource.is_a?(Puppet::Type.type(:whit))
-      add_callback_status_event(resource, callback, resource_error_message, "failure")
-    end
-
+    resource.err(resource_error_message)
     transaction.resource_status(resource).failed_to_restart = true
     transaction.resource_status(resource).fail_with_event(resource_error_message)
     resource.log_exception(detail)

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

@@ -320,7 +320,6 @@ module Puppet
       end
     end
 
-
     def chunk_file_from_source
       get_from_source do |response|
         case response.code

data/lib/puppet/util/connection.rb

@@ -22,15 +22,17 @@ module Puppet::Util
     # @return [String] the name of the server for use in the request
     def self.determine_server(setting)
       if setting && setting != :server && Puppet.settings.set_by_config?(setting)
+        Puppet.debug _("Selected server from the %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
         Puppet[setting]
       else
         server = Puppet.lookup(:server) do
           if primary_server = Puppet.settings[:server_list][0]
-            Puppet.debug "Dynamically-bound server lookup failed; using first entry"
+            #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+            Puppet.debug _("Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}") % {server: primary_server[0]}
             primary_server[0]
           else
             setting ||= :server
-            Puppet.debug "Dynamically-bound server lookup failed, falling back to #{setting} setting"
+            Puppet.debug _("Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
             Puppet.settings[setting]
           end
         end
@@ -51,19 +53,26 @@ module Puppet::Util
     def self.determine_port(port_setting, server_setting)
       if (port_setting && port_setting != :masterport && Puppet.settings.set_by_config?(port_setting)) ||
          (server_setting && server_setting != :server && Puppet.settings.set_by_config?(server_setting))
+        Puppet.debug _("Selected port from the %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting].to_i}
         Puppet.settings[port_setting].to_i
       else
         port = Puppet.lookup(:serverport) do
           if primary_server = Puppet.settings[:server_list][0]
-            Puppet.debug "Dynamically-bound port lookup failed; using first entry"
-
             # Port might not be set, so we want to fallback in that
             # case. We know we don't need to use `setting` here, since
             # the default value of every port setting is `masterport`
-            (primary_server[1] || Puppet.settings[:masterport])
+            if primary_server[1]
+              #TRANSLATORS 'server_list' is the name of a setting and should not be translated
+              Puppet.debug _("Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}") % {port: primary_server[1]}
+              primary_server[1]
+            else
+              #TRANSLATORS 'masterport' is the name of a setting and should not be translated
+              Puppet.debug _("Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
+              Puppet.settings[:masterport]
+            end
           else
             port_setting ||= :masterport
-            Puppet.debug "Dynamically-bound port lookup failed; falling back to #{port_setting} setting"
+            Puppet.debug _("Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting]}
             Puppet.settings[port_setting]
           end
         end

data/lib/puppet/util/http_proxy.rb

@@ -182,6 +182,7 @@ module Puppet::Util::HttpProxy
       end
 
       response = proxy.send(:head, current_uri.path, headers)
+      Puppet.debug("HTTP HEAD request to #{current_uri} returned #{response.code} #{response.message}")
 
       if [301, 302, 307].include?(response.code.to_i)
         # handle the redirection
@@ -195,9 +196,9 @@ module Puppet::Util::HttpProxy
         else
           response = proxy.send(method, current_uri.path, headers)
         end
-      end
 
-      Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")
+        Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")
+      end
 
       return response
     end

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.0.7'
+  PUPPETVERSION = '6.0.8'
 
   ##
   # 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 6.0.5-138-ga1ce8e4\n"
+"Project-Id-Version: Puppet automation framework 6.0.7-36-gaf24bc1\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-03-12 16:20+0000\n"
-"PO-Revision-Date: 2019-03-12 16:20+0000\n"
+"POT-Creation-Date: 2019-04-02 23:22+0000\n"
+"PO-Revision-Date: 2019-04-02 23:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -266,23 +266,23 @@ msgstr ""
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:278
+#: ../lib/puppet/application/device.rb:287
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:293
+#: ../lib/puppet/application/device.rb:302
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:318
+#: ../lib/puppet/application/device.rb:327
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:356 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:360 ../lib/puppet/application/resource.rb:196
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:357 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:361 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -372,6 +372,17 @@ msgstr ""
 msgid "Cancelling"
 msgstr ""
 
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/application/filebucket.rb:293
+msgid "Selected server from first entry of the `server_list` setting: %{server}:%{port}"
+msgstr ""
+
+#. TRANSLATORS 'server' is the name of a setting and should not be translated
+#. TRANSLATORS 'server' is the name of a setting and should not be translated
+#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:213
+msgid "Selected server from the `server` setting: %{server}"
+msgstr ""
+
 #: ../lib/puppet/application/lookup.rb:8
 msgid "Run 'puppet lookup --help' for more details"
 msgstr ""
@@ -554,67 +565,69 @@ msgstr ""
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:232
-msgid "Selected puppet server: %{server}:%{port}"
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:233
+msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:264
+#: ../lib/puppet/configurer.rb:265
 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:309
+#: ../lib/puppet/configurer.rb:310
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:314
+#: ../lib/puppet/configurer.rb:315
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:318
+#: ../lib/puppet/configurer.rb:319
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:346
+#: ../lib/puppet/configurer.rb:347
 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:357
+#: ../lib/puppet/configurer.rb:358
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:359
+#: ../lib/puppet/configurer.rb:360
 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:378
+#: ../lib/puppet/configurer.rb:379
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:402
+#: ../lib/puppet/configurer.rb:403
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:406
-msgid "Puppet server %{host}:%{port} is unreachable"
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:407
+msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:418 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:419 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:427
+#: ../lib/puppet/configurer.rb:428
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:439
+#: ../lib/puppet/configurer.rb:440
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:457
+#: ../lib/puppet/configurer.rb:458
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:477
+#: ../lib/puppet/configurer.rb:478
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -697,15 +710,15 @@ 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:650
+#: ../lib/puppet/defaults.rb:670
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:731
+#: ../lib/puppet/defaults.rb:751
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:962 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:982 ../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 ""
 
@@ -2658,7 +2671,22 @@ msgstr ""
 msgid "Error connecting to %{srv_server}:%{srv_port}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:249
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:209
+msgid "Selected server from first entry of the `server_list` setting: %{server}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:225
+msgid "Selected port from the first entry of the `server_list` setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:229
+msgid "Selected port from the `masterport` setting: %{port}"
+msgstr ""
+
+#: ../lib/puppet/indirector/request.rb:260
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
@@ -3790,33 +3818,33 @@ msgstr ""
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:203
+#: ../lib/puppet/network/http/connection.rb:209
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
 #. TRANSLATORS: Used in the phrase:
 #. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:233
+#: ../lib/puppet/network/http/connection.rb:239
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:237
+#: ../lib/puppet/network/http/connection.rb:243
 msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:248
+#: ../lib/puppet/network/http/connection.rb:254
 msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:308
+#: ../lib/puppet/network/http/connection.rb:316
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:310
+#: ../lib/puppet/network/http/connection.rb:318
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:312
+#: ../lib/puppet/network/http/connection.rb:320
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
@@ -7829,7 +7857,7 @@ msgstr[1] ""
 msgid "Failed to call %{callback}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:176
+#: ../lib/puppet/transaction/event_manager.rb:171
 msgid "Would have triggered '%{callback}' from %{count} event"
 msgid_plural "Would have triggered '%{callback}' from %{count} events"
 msgstr[0] ""
@@ -8162,7 +8190,7 @@ msgid "No source for content was stored with the metadata"
 msgstr ""
 
 #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
-#: ../lib/puppet/type/file/source.rb:363
+#: ../lib/puppet/type/file/source.rb:362
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -8691,6 +8719,37 @@ msgstr ""
 msgid "Trollop::die can only be called after Trollop::options"
 msgstr ""
 
+#: ../lib/puppet/util/connection.rb:25
+msgid "Selected server from the %{setting} setting: %{server}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/util/connection.rb:31
+msgid "Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}"
+msgstr ""
+
+#: ../lib/puppet/util/connection.rb:35
+msgid "Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}"
+msgstr ""
+
+#: ../lib/puppet/util/connection.rb:56
+msgid "Selected port from the %{setting} setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/util/connection.rb:66
+msgid "Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}"
+msgstr ""
+
+#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#: ../lib/puppet/util/connection.rb:70
+msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
+msgstr ""
+
+#: ../lib/puppet/util/connection.rb:75
+msgid "Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}"
+msgstr ""
+
 #: ../lib/puppet/util/diff.rb:28
 msgid "Cannot provide diff without the diff/lcs Ruby library"
 msgstr ""
@@ -8847,7 +8906,7 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:205
+#: ../lib/puppet/util/http_proxy.rb:206
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""
 

data/man/man5/puppet.conf.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "March 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "April 2019" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -560,7 +560,10 @@ The name of a registered environment data provider used when obtaining environme
 
 .
 .SS "environment_timeout"
-How long the Puppet master should cache data it loads from an environment\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. A value of \fB0\fR will disable caching\. This setting can also be set to \fBunlimited\fR, which will cache environments until the master is restarted or told to refresh the cache\.
+How long the Puppet master should cache data it loads from an environment\.
+.
+.P
+A value of \fB0\fR will disable caching\. This setting can also be set to \fBunlimited\fR, which will cache environments until the master is restarted or told to refresh the cache\.
 .
 .P
 You should change this setting once your Puppet deployment is doing non\-trivial work\. We chose the default value of \fB0\fR because it lets new users update their code without any extra steps, but it lowers the performance of your Puppet master\.
@@ -571,13 +574,10 @@ We recommend setting this to \fBunlimited\fR and explicitly refreshing your Pupp
 .IP "\(bu" 4
 With Puppet Server, you should refresh environments by calling the \fBenvironment\-cache\fR API endpoint\. See the docs for the Puppet Server administrative API\.
 .
-.IP "\(bu" 4
-With a Rack Puppet master, you should restart the web server or the application server\. Passenger lets you touch a \fBrestart\.txt\fR file to refresh an application without restarting Apache; see the Passenger docs for details\.
-.
 .IP "" 0
 .
 .P
-We don\'t recommend using any value other than \fB0\fR or \fBunlimited\fR, since most Puppet masters use a pool of Ruby interpreters which all have their own cache timers\. When these timers drift out of sync, agents can be served inconsistent catalogs\.
+Any value other than \fB0\fR or \fBunlimited\fR is deprecated, since most Puppet servers use a pool of Ruby interpreters which all have their own cache timers\. When these timers drift out of sync, agents can be served inconsistent catalogs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 0
@@ -670,7 +670,7 @@ Where the fileserver configuration is stored\.
 .IP "" 0
 .
 .SS "filetimeout"
-The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
+The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or puppet\.conf) has changed on disk\. The default will change in a future release to be \'unlimited\', requiring a reload of the Puppet service to pick up changes to its internal configuration\. Currently we do not accept a value of \'unlimited\'\. To reparse files within an environment in Puppet Server please use the environment_cache endpoint
 .
 .IP "\(bu" 4
 \fIDefault\fR: 15s
@@ -876,7 +876,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/6\.0\.7 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.0\.8 Ruby/2\.4\.1\-p111 (x86_64\-linux)
 .
 .IP "" 0
 .