puppet 6.18.0-universal-darwin → 6.19.0-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (144) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +8 -10
  3. data/README.md +1 -2
  4. data/Rakefile +4 -12
  5. data/lib/puppet/agent/locker.rb +0 -7
  6. data/lib/puppet/application/agent.rb +8 -3
  7. data/lib/puppet/application/doc.rb +1 -1
  8. data/lib/puppet/application/lookup.rb +5 -5
  9. data/lib/puppet/configurer.rb +39 -7
  10. data/lib/puppet/defaults.rb +55 -29
  11. data/lib/puppet/environments.rb +51 -10
  12. data/lib/puppet/face/catalog.rb +1 -1
  13. data/lib/puppet/face/config.rb +46 -16
  14. data/lib/puppet/face/node.rb +3 -3
  15. data/lib/puppet/face/node/clean.rb +2 -2
  16. data/lib/puppet/face/status.rb +1 -1
  17. data/lib/puppet/file_bucket/dipper.rb +1 -1
  18. data/lib/puppet/functions/new.rb +8 -3
  19. data/lib/puppet/http.rb +1 -0
  20. data/lib/puppet/http/client.rb +1 -1
  21. data/lib/puppet/http/resolver.rb +5 -8
  22. data/lib/puppet/http/resolver/server_list.rb +18 -36
  23. data/lib/puppet/http/resolver/settings.rb +4 -4
  24. data/lib/puppet/http/resolver/srv.rb +5 -5
  25. data/lib/puppet/http/service.rb +3 -1
  26. data/lib/puppet/http/service/compiler.rb +1 -1
  27. data/lib/puppet/http/service/file_server.rb +1 -1
  28. data/lib/puppet/http/service/puppetserver.rb +39 -0
  29. data/lib/puppet/http/session.rb +5 -4
  30. data/lib/puppet/indirector/catalog/compiler.rb +1 -1
  31. data/lib/puppet/indirector/facts/yaml.rb +1 -1
  32. data/lib/puppet/indirector/json.rb +1 -1
  33. data/lib/puppet/indirector/msgpack.rb +1 -1
  34. data/lib/puppet/indirector/request.rb +4 -4
  35. data/lib/puppet/indirector/yaml.rb +1 -1
  36. data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
  37. data/lib/puppet/node/facts.rb +17 -0
  38. data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
  39. data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
  40. data/lib/puppet/pops/types/p_meta_type.rb +1 -1
  41. data/lib/puppet/pops/types/p_type_set_type.rb +4 -0
  42. data/lib/puppet/provider/package/dpkg.rb +1 -1
  43. data/lib/puppet/provider/package/pip2.rb +17 -0
  44. data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
  45. data/lib/puppet/provider/package/yum.rb +1 -0
  46. data/lib/puppet/resource/type.rb +2 -1
  47. data/lib/puppet/rest/route.rb +2 -2
  48. data/lib/puppet/settings.rb +19 -5
  49. data/lib/puppet/transaction/report.rb +11 -7
  50. data/lib/puppet/type/file/source.rb +1 -1
  51. data/lib/puppet/type/filebucket.rb +1 -1
  52. data/lib/puppet/util/connection.rb +8 -8
  53. data/lib/puppet/util/run_mode.rb +5 -1
  54. data/lib/puppet/version.rb +1 -1
  55. data/locales/puppet.pot +153 -156
  56. data/man/man5/puppet.conf.5 +29 -13
  57. data/man/man8/puppet-agent.8 +6 -3
  58. data/man/man8/puppet-apply.8 +1 -1
  59. data/man/man8/puppet-catalog.8 +1 -1
  60. data/man/man8/puppet-config.8 +6 -6
  61. data/man/man8/puppet-describe.8 +1 -1
  62. data/man/man8/puppet-device.8 +1 -1
  63. data/man/man8/puppet-doc.8 +1 -1
  64. data/man/man8/puppet-epp.8 +1 -1
  65. data/man/man8/puppet-facts.8 +1 -1
  66. data/man/man8/puppet-filebucket.8 +1 -1
  67. data/man/man8/puppet-generate.8 +1 -1
  68. data/man/man8/puppet-help.8 +1 -1
  69. data/man/man8/puppet-key.8 +1 -1
  70. data/man/man8/puppet-lookup.8 +1 -1
  71. data/man/man8/puppet-man.8 +1 -1
  72. data/man/man8/puppet-module.8 +1 -1
  73. data/man/man8/puppet-node.8 +4 -4
  74. data/man/man8/puppet-parser.8 +1 -1
  75. data/man/man8/puppet-plugin.8 +1 -1
  76. data/man/man8/puppet-report.8 +1 -1
  77. data/man/man8/puppet-resource.8 +1 -1
  78. data/man/man8/puppet-script.8 +1 -1
  79. data/man/man8/puppet-ssl.8 +1 -1
  80. data/man/man8/puppet-status.8 +2 -2
  81. data/man/man8/puppet.8 +2 -2
  82. data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
  83. data/spec/integration/application/agent_spec.rb +23 -19
  84. data/spec/integration/application/filebucket_spec.rb +7 -7
  85. data/spec/integration/application/plugin_spec.rb +3 -3
  86. data/spec/integration/configurer_spec.rb +14 -0
  87. data/spec/integration/defaults_spec.rb +26 -1
  88. data/spec/integration/util/windows/adsi_spec.rb +2 -2
  89. data/spec/shared_contexts/types_setup.rb +2 -0
  90. data/spec/unit/application/doc_spec.rb +2 -2
  91. data/spec/unit/application/facts_spec.rb +3 -1
  92. data/spec/unit/application_spec.rb +9 -4
  93. data/spec/unit/configurer_spec.rb +39 -6
  94. data/spec/unit/environments_spec.rb +99 -32
  95. data/spec/unit/face/config_spec.rb +56 -0
  96. data/spec/unit/face/node_spec.rb +2 -2
  97. data/spec/unit/file_system_spec.rb +1 -2
  98. data/spec/unit/http/resolver_spec.rb +24 -4
  99. data/spec/unit/http/service/ca_spec.rb +2 -2
  100. data/spec/unit/http/service/compiler_spec.rb +2 -2
  101. data/spec/unit/http/service/file_server_spec.rb +2 -2
  102. data/spec/unit/http/service/puppetserver_spec.rb +82 -0
  103. data/spec/unit/http/service/report_spec.rb +2 -2
  104. data/spec/unit/http/session_spec.rb +8 -20
  105. data/spec/unit/indirector/catalog/json_spec.rb +1 -1
  106. data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
  107. data/spec/unit/indirector/facts/rest_spec.rb +1 -1
  108. data/spec/unit/indirector/json_spec.rb +8 -8
  109. data/spec/unit/indirector/msgpack_spec.rb +8 -8
  110. data/spec/unit/indirector/node/rest_spec.rb +1 -1
  111. data/spec/unit/indirector/request_spec.rb +4 -4
  112. data/spec/unit/indirector/rest_spec.rb +1 -1
  113. data/spec/unit/indirector/status/rest_spec.rb +1 -1
  114. data/spec/unit/indirector/yaml_spec.rb +7 -7
  115. data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
  116. data/spec/unit/provider/exec_spec.rb +4 -3
  117. data/spec/unit/provider/package/dpkg_spec.rb +22 -7
  118. data/spec/unit/provider/package/openbsd_spec.rb +2 -0
  119. data/spec/unit/provider/package/pip2_spec.rb +36 -0
  120. data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
  121. data/spec/unit/provider/package/yum_spec.rb +31 -0
  122. data/spec/unit/provider/service/base_spec.rb +2 -4
  123. data/spec/unit/provider/service/bsd_spec.rb +5 -1
  124. data/spec/unit/provider/service/daemontools_spec.rb +1 -1
  125. data/spec/unit/provider/service/debian_spec.rb +3 -5
  126. data/spec/unit/provider/service/freebsd_spec.rb +1 -1
  127. data/spec/unit/provider/service/gentoo_spec.rb +4 -5
  128. data/spec/unit/provider/service/init_spec.rb +4 -5
  129. data/spec/unit/provider/service/launchd_spec.rb +5 -6
  130. data/spec/unit/provider/service/openrc_spec.rb +4 -5
  131. data/spec/unit/provider/service/openwrt_spec.rb +1 -1
  132. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  133. data/spec/unit/provider/service/runit_spec.rb +2 -1
  134. data/spec/unit/provider/service/smf_spec.rb +1 -1
  135. data/spec/unit/provider/service/src_spec.rb +3 -5
  136. data/spec/unit/provider/service/systemd_spec.rb +3 -1
  137. data/spec/unit/provider/service/upstart_spec.rb +4 -5
  138. data/spec/unit/rest/route_spec.rb +4 -4
  139. data/spec/unit/settings_spec.rb +44 -22
  140. data/spec/unit/transaction/report_spec.rb +2 -0
  141. data/spec/unit/type/file/source_spec.rb +1 -1
  142. data/spec/unit/type/filebucket_spec.rb +1 -1
  143. data/spec/unit/util/run_mode_spec.rb +6 -6
  144. metadata +13 -2
@@ -63,9 +63,11 @@ class Puppet::Transaction::Report
63
63
  # or 'on_failure'
64
64
  attr_accessor :cached_catalog_status
65
65
 
66
- # Contains the name and port of the master that was successfully contacted
66
+ # Contains the name and port of the server that was successfully contacted
67
67
  # @return [String] a string of the format 'servername:port'
68
- attr_accessor :master_used
68
+ attr_accessor :server_used
69
+ alias :master_used :server_used
70
+ alias :master_used= :server_used=
69
71
 
70
72
  # The host name for which the report is generated
71
73
  # @return [String] the host name
@@ -224,7 +226,7 @@ class Puppet::Transaction::Report
224
226
  @external_times ||= {}
225
227
  @host = Puppet[:node_name_value]
226
228
  @time = start_time
227
- @report_format = 10
229
+ @report_format = 11
228
230
  @puppet_version = Puppet.version
229
231
  @configuration_version = configuration_version
230
232
  @transaction_uuid = transaction_uuid
@@ -232,7 +234,7 @@ class Puppet::Transaction::Report
232
234
  @job_id = job_id
233
235
  @catalog_uuid = nil
234
236
  @cached_catalog_status = nil
235
- @master_used = nil
237
+ @server_used = nil
236
238
  @environment = environment
237
239
  @status = 'failed' # assume failed until the report is finalized
238
240
  @noop = Puppet[:noop]
@@ -256,8 +258,10 @@ class Puppet::Transaction::Report
256
258
  @time = data['time']
257
259
  @corrective_change = data['corrective_change']
258
260
 
259
- if data['master_used']
260
- @master_used = data['master_used']
261
+ if data['server_used']
262
+ @server_used = data['server_used']
263
+ elsif data['master_used']
264
+ @server_used = data['master_used']
261
265
  end
262
266
 
263
267
  if data['catalog_uuid']
@@ -322,7 +326,7 @@ class Puppet::Transaction::Report
322
326
  }
323
327
 
324
328
  # The following is include only when set
325
- hash['master_used'] = @master_used unless @master_used.nil?
329
+ hash['master_used'] = hash['server_used'] = @server_used unless @server_used.nil?
326
330
  hash['catalog_uuid'] = @catalog_uuid unless @catalog_uuid.nil?
327
331
  hash['code_id'] = @code_id unless @code_id.nil?
328
332
  hash['job_id'] = @job_id unless @job_id.nil?
@@ -225,7 +225,7 @@ module Puppet
225
225
  end
226
226
 
227
227
  def port
228
- (uri and uri.port) or Puppet.settings[:masterport]
228
+ (uri and uri.port) or Puppet.settings[:serverport]
229
229
  end
230
230
 
231
231
  def uri
@@ -57,7 +57,7 @@ module Puppet
57
57
  This setting is _only_ consulted if the `path` attribute is set to `false`.
58
58
 
59
59
  If this attribute is not specified, the first entry in the `server_list`
60
- configuration setting is used, followed by the value of the `masterport`
60
+ configuration setting is used, followed by the value of the `serverport`
61
61
  setting if `server_list` is not set."
62
62
  end
63
63
 
@@ -8,7 +8,7 @@ module Puppet::Util
8
8
  # The logic for server and port is kind of gross. In summary:
9
9
  # IF an endpoint-specific setting is requested AND that setting has been set by the user
10
10
  # Use that setting.
11
- # The defaults for these settings are the "normal" server/masterport settings, so
11
+ # The defaults for these settings are the "normal" server/serverport settings, so
12
12
  # when they are unset we instead want to "fall back" to the failover-selected
13
13
  # host/port pair.
14
14
  # ELSE IF we have a failover-selected host/port
@@ -17,7 +17,7 @@ module Puppet::Util
17
17
  # Use the first entry - failover hasn't happened yet, but that
18
18
  # setting is still authoritative
19
19
  # ELSE
20
- # Go for the legacy server/masterport settings, and hope for the best
20
+ # Go for the legacy server/serverport settings, and hope for the best
21
21
 
22
22
  # Determines which server to use based on the specified setting, taking into
23
23
  # account HA fallback from server_list.
@@ -55,7 +55,7 @@ module Puppet::Util
55
55
  # @param [Symbol] server_setting The server setting assoicated with this route.
56
56
  # @return [Integer] the port to use for use in the request
57
57
  def self.determine_port(port_setting, server_setting)
58
- if (port_setting && port_setting != :masterport && Puppet.settings.set_by_config?(port_setting)) ||
58
+ if (port_setting && port_setting != :serverport && Puppet.settings.set_by_config?(port_setting)) ||
59
59
  (server_setting && server_setting != :server && Puppet.settings.set_by_config?(server_setting))
60
60
  debug_once _("Selected port from the %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting].to_i}
61
61
  Puppet.settings[port_setting].to_i
@@ -65,18 +65,18 @@ module Puppet::Util
65
65
  if primary_server
66
66
  # Port might not be set, so we want to fallback in that
67
67
  # case. We know we don't need to use `setting` here, since
68
- # the default value of every port setting is `masterport`
68
+ # the default value of every port setting is `serverport`
69
69
  if primary_server[1]
70
70
  #TRANSLATORS 'server_list' is the name of a setting and should not be translated
71
71
  debug_once _("Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}") % {port: primary_server[1]}
72
72
  primary_server[1]
73
73
  else
74
- #TRANSLATORS 'masterport' is the name of a setting and should not be translated
75
- debug_once _("Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
76
- Puppet.settings[:masterport]
74
+ #TRANSLATORS 'serverport' is the name of a setting and should not be translated
75
+ debug_once _("Dynamically-bound port lookup failed; falling back to `serverport` setting: %{port}") % {port: Puppet.settings[:serverport]}
76
+ Puppet.settings[:serverport]
77
77
  end
78
78
  else
79
- port_setting ||= :masterport
79
+ port_setting ||= :serverport
80
80
  debug_once _("Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting]}
81
81
  Puppet.settings[port_setting]
82
82
  end
@@ -18,8 +18,12 @@ module Puppet
18
18
  end
19
19
  end
20
20
 
21
+ def server?
22
+ name == :master || name == :server
23
+ end
24
+
21
25
  def master?
22
- name == :master
26
+ name == :master || name == :server
23
27
  end
24
28
 
25
29
  def agent?
@@ -6,7 +6,7 @@
6
6
  # Raketasks and such to set the version based on the output of `git describe`
7
7
 
8
8
  module Puppet
9
- PUPPETVERSION = '6.18.0'
9
+ PUPPETVERSION = '6.19.0'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
@@ -6,11 +6,11 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 6.17.0-93-gddd91ef701\n"
9
+ "Project-Id-Version: Puppet automation framework 6.18.0-104-g9f65e07e38\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2020-07-30 16:49+0000\n"
13
- "PO-Revision-Date: 2020-07-30 16:49+0000\n"
12
+ "POT-Creation-Date: 2020-10-13 14:34+0000\n"
13
+ "PO-Revision-Date: 2020-10-13 14:34+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -120,16 +120,6 @@ msgstr ""
120
120
  msgid "Failed to acquire lock"
121
121
  msgstr ""
122
122
 
123
- #. TRANSLATORS 'Puppet::Agent::Locker.running?' is a method name and should not be translated
124
- #: ../lib/puppet/agent/locker.rb:33
125
- msgid "Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe."
126
- msgstr ""
127
-
128
- #. TRANSLATORS 'LockError' should not be translated
129
- #: ../lib/puppet/agent/locker.rb:35
130
- msgid "The only safe way to know if the lock is locked is to try lock and perform some action and then handle the LockError that may result."
131
- msgstr ""
132
-
133
123
  #: ../lib/puppet/application.rb:238
134
124
  msgid "Unable to find application '%{application_name}'. %{error}"
135
125
  msgstr ""
@@ -194,19 +184,19 @@ msgstr ""
194
184
  msgid "The puppet agent daemon"
195
185
  msgstr ""
196
186
 
197
- #: ../lib/puppet/application/agent.rb:409
187
+ #: ../lib/puppet/application/agent.rb:414
198
188
  msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
199
189
  msgstr ""
200
190
 
201
- #: ../lib/puppet/application/agent.rb:414
191
+ #: ../lib/puppet/application/agent.rb:419
202
192
  msgid "Failed to generate fingerprint: %{message}"
203
193
  msgstr ""
204
194
 
205
- #: ../lib/puppet/application/agent.rb:437
195
+ #: ../lib/puppet/application/agent.rb:442
206
196
  msgid "Starting Puppet client version %{version}"
207
197
  msgstr ""
208
198
 
209
- #: ../lib/puppet/application/agent.rb:453
199
+ #: ../lib/puppet/application/agent.rb:458
210
200
  msgid "The puppet agent command does not take parameters"
211
201
  msgstr ""
212
202
 
@@ -400,31 +390,31 @@ msgid ""
400
390
  "%{run_help}"
401
391
  msgstr ""
402
392
 
403
- #: ../lib/puppet/application/lookup.rb:99
393
+ #: ../lib/puppet/application/lookup.rb:105
404
394
  msgid "Interactive Hiera lookup"
405
395
  msgstr ""
406
396
 
407
- #: ../lib/puppet/application/lookup.rb:266
397
+ #: ../lib/puppet/application/lookup.rb:272
408
398
  msgid ""
409
399
  "The options %{deep_merge_opts} are only available with '--merge deep'\n"
410
400
  "%{run_help}"
411
401
  msgstr ""
412
402
 
413
- #: ../lib/puppet/application/lookup.rb:277
403
+ #: ../lib/puppet/application/lookup.rb:283
414
404
  msgid ""
415
405
  "The --merge option only accepts %{strategies}, or %{last_strategy}\n"
416
406
  "%{run_help}"
417
407
  msgstr ""
418
408
 
419
- #: ../lib/puppet/application/lookup.rb:302
409
+ #: ../lib/puppet/application/lookup.rb:308
420
410
  msgid "No keys were given to lookup."
421
411
  msgstr ""
422
412
 
423
- #: ../lib/puppet/application/lookup.rb:310
413
+ #: ../lib/puppet/application/lookup.rb:316
424
414
  msgid "Unknown rendering format '%{format}'"
425
415
  msgstr ""
426
416
 
427
- #: ../lib/puppet/application/lookup.rb:360 ../lib/puppet/face/epp.rb:520
417
+ #: ../lib/puppet/application/lookup.rb:366 ../lib/puppet/face/epp.rb:520
428
418
  msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
429
419
  msgstr ""
430
420
 
@@ -536,101 +526,105 @@ msgstr ""
536
526
  msgid "Cannot remove %{file}: %{detail}"
537
527
  msgstr ""
538
528
 
539
- #: ../lib/puppet/configurer.rb:72
529
+ #: ../lib/puppet/configurer.rb:80
540
530
  msgid "Using cached catalog from environment '%{environment}'"
541
531
  msgstr ""
542
532
 
543
- #: ../lib/puppet/configurer.rb:78
533
+ #: ../lib/puppet/configurer.rb:86
544
534
  msgid "Not using cache on failed catalog"
545
535
  msgstr ""
546
536
 
547
- #: ../lib/puppet/configurer.rb:87
537
+ #: ../lib/puppet/configurer.rb:95
548
538
  msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
549
539
  msgstr ""
550
540
 
551
- #: ../lib/puppet/configurer.rb:92 ../lib/puppet/configurer.rb:174
541
+ #: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:182
552
542
  msgid "Using cached catalog from environment '%{catalog_env}'"
553
543
  msgstr ""
554
544
 
555
- #: ../lib/puppet/configurer.rb:167
545
+ #: ../lib/puppet/configurer.rb:175
556
546
  msgid "Could not retrieve catalog; skipping run"
557
547
  msgstr ""
558
548
 
559
- #: ../lib/puppet/configurer.rb:183
549
+ #: ../lib/puppet/configurer.rb:191
560
550
  msgid "Applied catalog in %{seconds} seconds"
561
551
  msgstr ""
562
552
 
563
- #: ../lib/puppet/configurer.rb:219 ../lib/puppet/http/resolver/server_list.rb:68
564
- msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
553
+ #: ../lib/puppet/configurer.rb:228
554
+ msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
555
+ msgstr ""
556
+
557
+ #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
558
+ #: ../lib/puppet/configurer.rb:231
559
+ msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
565
560
  msgstr ""
566
561
 
567
- #: ../lib/puppet/configurer.rb:256
562
+ #: ../lib/puppet/configurer.rb:280
568
563
  msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
569
564
  msgstr ""
570
565
 
571
- #: ../lib/puppet/configurer.rb:301
566
+ #: ../lib/puppet/configurer.rb:325
572
567
  msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
573
568
  msgstr ""
574
569
 
575
- #: ../lib/puppet/configurer.rb:316
570
+ #: ../lib/puppet/configurer.rb:340
576
571
  msgid "Using configured environment '%{env}'"
577
572
  msgstr ""
578
573
 
579
- #: ../lib/puppet/configurer.rb:320
574
+ #: ../lib/puppet/configurer.rb:344
580
575
  msgid "Unable to fetch my node definition, but the agent run will continue:"
581
576
  msgstr ""
582
577
 
583
- #: ../lib/puppet/configurer.rb:348
578
+ #: ../lib/puppet/configurer.rb:372
584
579
  msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
585
580
  msgstr ""
586
581
 
587
- #: ../lib/puppet/configurer.rb:359
582
+ #: ../lib/puppet/configurer.rb:383
588
583
  msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
589
584
  msgstr ""
590
585
 
591
- #: ../lib/puppet/configurer.rb:361
586
+ #: ../lib/puppet/configurer.rb:385
592
587
  msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
593
588
  msgstr ""
594
589
 
595
- #: ../lib/puppet/configurer.rb:402
590
+ #: ../lib/puppet/configurer.rb:426
596
591
  msgid "Failed to apply catalog: %{detail}"
597
592
  msgstr ""
598
593
 
599
- #: ../lib/puppet/configurer.rb:431 ../lib/puppet/http/resolver/server_list.rb:89
594
+ #: ../lib/puppet/configurer.rb:455 ../lib/puppet/http/resolver/server_list.rb:67
600
595
  msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
601
596
  msgstr ""
602
597
 
603
598
  #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
604
- #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
605
- #: ../lib/puppet/configurer.rb:435 ../lib/puppet/http/resolver/server_list.rb:95
599
+ #: ../lib/puppet/configurer.rb:459 ../lib/puppet/http/resolver/server_list.rb:70
606
600
  msgid "Unable to connect to server from server_list setting: %{detail}"
607
601
  msgstr ""
608
602
 
609
- #: ../lib/puppet/configurer.rb:446 ../lib/puppet/face/report.rb:47
603
+ #: ../lib/puppet/configurer.rb:470 ../lib/puppet/face/report.rb:47
610
604
  msgid "Could not send report: %{detail}"
611
605
  msgstr ""
612
606
 
613
- #: ../lib/puppet/configurer.rb:455
607
+ #: ../lib/puppet/configurer.rb:479
614
608
  msgid "Could not save last run local report: %{detail}"
615
609
  msgstr ""
616
610
 
617
- #: ../lib/puppet/configurer.rb:474
611
+ #: ../lib/puppet/configurer.rb:498
618
612
  msgid "Uploading facts for %{node} to %{server}"
619
613
  msgstr ""
620
614
 
621
- #: ../lib/puppet/configurer.rb:482
615
+ #: ../lib/puppet/configurer.rb:506
622
616
  msgid "Failed to submit facts: %{detail}"
623
617
  msgstr ""
624
618
 
625
- #: ../lib/puppet/configurer.rb:497
619
+ #: ../lib/puppet/configurer.rb:521
626
620
  msgid "Could not run command from %{setting}: %{detail}"
627
621
  msgstr ""
628
622
 
629
- #: ../lib/puppet/configurer.rb:515
623
+ #: ../lib/puppet/configurer.rb:539
630
624
  msgid "Could not retrieve catalog from cache: %{detail}"
631
625
  msgstr ""
632
626
 
633
- #: ../lib/puppet/configurer.rb:536
627
+ #: ../lib/puppet/configurer.rb:560
634
628
  msgid "Could not retrieve catalog from remote server: %{detail}"
635
629
  msgstr ""
636
630
 
@@ -717,24 +711,24 @@ msgid "Convert custom terminus to hiera 5 API."
717
711
  msgstr ""
718
712
 
719
713
  #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
720
- #: ../lib/puppet/defaults.rb:747
714
+ #: ../lib/puppet/defaults.rb:771
721
715
  msgid "Setting 'environment_data_provider' is deprecated."
722
716
  msgstr ""
723
717
 
724
- #: ../lib/puppet/defaults.rb:830
718
+ #: ../lib/puppet/defaults.rb:854
725
719
  msgid "Certificate names must be lower case"
726
720
  msgstr ""
727
721
 
728
- #: ../lib/puppet/defaults.rb:1024
722
+ #: ../lib/puppet/defaults.rb:1048
729
723
  msgid "Setting 'ssl_client_ca_auth' is deprecated."
730
724
  msgstr ""
731
725
 
732
- #: ../lib/puppet/defaults.rb:1103 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
726
+ #: ../lib/puppet/defaults.rb:1127 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
733
727
  msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
734
728
  msgstr ""
735
729
 
736
730
  #. TRANSLATORS 'pluginsync' is a setting and should not be translated
737
- #: ../lib/puppet/defaults.rb:1969
731
+ #: ../lib/puppet/defaults.rb:2005
738
732
  msgid "Setting 'pluginsync' is deprecated."
739
733
  msgstr ""
740
734
 
@@ -836,7 +830,7 @@ msgstr ""
836
830
 
837
831
  #: ../lib/puppet/face/config.rb:146
838
832
  msgid ""
839
- "The environment should be set in either the `[user]`, `[agent]`, or `[master]`\n"
833
+ "The environment should be set in either the `[user]`, `[agent]`, or `[server]`\n"
840
834
  "section. Variables set in the `[agent]` section are used when running\n"
841
835
  "`puppet agent`. Variables set in the `[user]` section are used when running\n"
842
836
  "various other puppet subcommands, like `puppet apply` and `puppet module`; these\n"
@@ -846,25 +840,28 @@ msgid ""
846
840
  "https://puppet.com/docs/puppet/latest/configuration.html#environment\n"
847
841
  msgstr ""
848
842
 
849
- #: ../lib/puppet/face/config.rb:174
843
+ #: ../lib/puppet/face/config.rb:176
844
+ msgid "Deleted setting from '%{section_name}': '%{setting_string}', and adding it to 'server' section"
845
+ msgstr ""
846
+
847
+ #: ../lib/puppet/face/config.rb:191
850
848
  msgid "Delete a Puppet setting."
851
849
  msgstr ""
852
850
 
853
- #: ../lib/puppet/face/config.rb:175
851
+ #: ../lib/puppet/face/config.rb:192
854
852
  msgid "<setting>"
855
853
  msgstr ""
856
854
 
857
- #. TRANSLATORS 'main' is a specific section name and should not be translated
858
- #: ../lib/puppet/face/config.rb:212
855
+ #: ../lib/puppet/face/config.rb:226 ../lib/puppet/face/config.rb:230 ../lib/puppet/face/config.rb:241
859
856
  msgid "Deleted setting from '%{section_name}': '%{setting_string}'"
860
857
  msgstr ""
861
858
 
862
- #: ../lib/puppet/face/config.rb:215
859
+ #: ../lib/puppet/face/config.rb:244
863
860
  msgid "No setting found in configuration file for section '%{section_name}' setting name '%{name}'"
864
861
  msgstr ""
865
862
 
866
863
  #. TRANSLATORS the 'puppet.conf' is a specific file and should not be translated
867
- #: ../lib/puppet/face/config.rb:222
864
+ #: ../lib/puppet/face/config.rb:252
868
865
  msgid "The puppet.conf file does not exist %{puppet_conf}"
869
866
  msgstr ""
870
867
 
@@ -2283,15 +2280,15 @@ msgstr ""
2283
2280
  msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
2284
2281
  msgstr ""
2285
2282
 
2286
- #: ../lib/puppet/http/service.rb:119
2283
+ #: ../lib/puppet/http/service.rb:121
2287
2284
  msgid "Ignoring extra header \"%{name}\" as it was previously set."
2288
2285
  msgstr ""
2289
2286
 
2290
- #: ../lib/puppet/http/service.rb:122
2287
+ #: ../lib/puppet/http/service.rb:124
2291
2288
  msgid "Ignoring extra header \"%{name}\" as it has no value."
2292
2289
  msgstr ""
2293
2290
 
2294
- #: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:288
2291
+ #: ../lib/puppet/http/service.rb:147 ../lib/puppet/indirector/rest.rb:288
2295
2292
  msgid "No content type in http response; cannot parse"
2296
2293
  msgstr ""
2297
2294
 
@@ -2604,7 +2601,7 @@ msgstr ""
2604
2601
  msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
2605
2602
  msgstr ""
2606
2603
 
2607
- #: ../lib/puppet/indirector/file_metadata/http.rb:31
2604
+ #: ../lib/puppet/indirector/file_metadata/http.rb:32
2608
2605
  msgid "cannot lookup multiple files"
2609
2606
  msgstr ""
2610
2607
 
@@ -2815,9 +2812,9 @@ msgstr ""
2815
2812
  msgid "Selected port from the first entry of the `server_list` setting: %{port}"
2816
2813
  msgstr ""
2817
2814
 
2818
- #. TRANSLATORS 'masterport' is the name of a setting and should not be translated
2815
+ #. TRANSLATORS 'serverport' is the name of a setting and should not be translated
2819
2816
  #: ../lib/puppet/indirector/request.rb:235
2820
- msgid "Selected port from the `masterport` setting: %{port}"
2817
+ msgid "Selected port from the `serverport` setting: %{port}"
2821
2818
  msgstr ""
2822
2819
 
2823
2820
  #: ../lib/puppet/indirector/request.rb:266
@@ -4172,7 +4169,7 @@ msgstr ""
4172
4169
  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."
4173
4170
  msgstr ""
4174
4171
 
4175
- #: ../lib/puppet/node/environment.rb:562 ../lib/puppet/pops/loaders.rb:301
4172
+ #: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:301
4176
4173
  msgid "Could not parse for environment %{env}: %{detail}"
4177
4174
  msgstr ""
4178
4175
 
@@ -4204,54 +4201,54 @@ msgstr ""
4204
4201
 
4205
4202
  #. TRANSLATORS: do not translate the variable names in this error message
4206
4203
  #. TRANSLATORS: do not translate the variable names in this error message
4207
- #: ../lib/puppet/pal/pal_impl.rb:73 ../lib/puppet/pal/pal_impl.rb:171
4204
+ #: ../lib/puppet/pal/pal_impl.rb:75 ../lib/puppet/pal/pal_impl.rb:173
4208
4205
  msgid "manifest_file or code_string cannot be given when configured_by_env is true"
4209
4206
  msgstr ""
4210
4207
 
4211
- #: ../lib/puppet/pal/pal_impl.rb:219
4208
+ #: ../lib/puppet/pal/pal_impl.rb:221
4212
4209
  msgid "temporary environment name"
4213
4210
  msgstr ""
4214
4211
 
4215
4212
  #. TRANSLATORS: do not translate variable name string in these assertions
4216
- #: ../lib/puppet/pal/pal_impl.rb:224
4213
+ #: ../lib/puppet/pal/pal_impl.rb:226
4217
4214
  msgid "A block must be given to 'in_tmp_environment'"
4218
4215
  msgstr ""
4219
4216
 
4220
4217
  #. TRANSLATORS terms in the assertions below are names of terms in code
4221
- #: ../lib/puppet/pal/pal_impl.rb:278
4218
+ #: ../lib/puppet/pal/pal_impl.rb:280
4222
4219
  msgid "A block must be given to 'in_environment'"
4223
4220
  msgstr ""
4224
4221
 
4225
4222
  #. TRANSLATORS 'in_environment' is a name, do not translate
4226
- #: ../lib/puppet/pal/pal_impl.rb:283
4223
+ #: ../lib/puppet/pal/pal_impl.rb:285
4227
4224
  msgid "The environment directory '%{env_dir}' does not exist"
4228
4225
  msgstr ""
4229
4226
 
4230
- #: ../lib/puppet/pal/pal_impl.rb:306
4227
+ #: ../lib/puppet/pal/pal_impl.rb:308
4231
4228
  msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
4232
4229
  msgstr ""
4233
4230
 
4234
- #: ../lib/puppet/pal/pal_impl.rb:360
4231
+ #: ../lib/puppet/pal/pal_impl.rb:362
4235
4232
  msgid "Given variables must be a hash, got %{type}"
4236
4233
  msgstr ""
4237
4234
 
4238
- #: ../lib/puppet/pal/pal_impl.rb:366
4235
+ #: ../lib/puppet/pal/pal_impl.rb:368
4239
4236
  msgid "Given variable '%{varname}' has illegal name"
4240
4237
  msgstr ""
4241
4238
 
4242
- #: ../lib/puppet/pal/pal_impl.rb:370
4239
+ #: ../lib/puppet/pal/pal_impl.rb:372
4243
4240
  msgid "Given value for '%{varname}' has illegal type - got: %{type}"
4244
4241
  msgstr ""
4245
4242
 
4246
- #: ../lib/puppet/pal/pal_impl.rb:485
4243
+ #: ../lib/puppet/pal/pal_impl.rb:509
4247
4244
  msgid "Puppet Pal: %{what}"
4248
4245
  msgstr ""
4249
4246
 
4250
- #: ../lib/puppet/pal/pal_impl.rb:499
4247
+ #: ../lib/puppet/pal/pal_impl.rb:523
4251
4248
  msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
4252
4249
  msgstr ""
4253
4250
 
4254
- #: ../lib/puppet/pal/pal_impl.rb:506
4251
+ #: ../lib/puppet/pal/pal_impl.rb:530
4255
4252
  msgid "A block must be given"
4256
4253
  msgstr ""
4257
4254
 
@@ -4556,31 +4553,31 @@ msgstr ""
4556
4553
  msgid "The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'."
4557
4554
  msgstr ""
4558
4555
 
4559
- #: ../lib/puppet/parser/functions.rb:186
4556
+ #: ../lib/puppet/parser/functions.rb:190
4560
4557
  msgid "Overwriting previous definition for function %{name}"
4561
4558
  msgstr ""
4562
4559
 
4563
- #: ../lib/puppet/parser/functions.rb:192
4560
+ #: ../lib/puppet/parser/functions.rb:196
4564
4561
  msgid "Invalid statement type %{type}"
4565
4562
  msgstr ""
4566
4563
 
4567
- #: ../lib/puppet/parser/functions.rb:204
4564
+ #: ../lib/puppet/parser/functions.rb:208
4568
4565
  msgid "Called %{name}"
4569
4566
  msgstr ""
4570
4567
 
4571
- #: ../lib/puppet/parser/functions.rb:207
4568
+ #: ../lib/puppet/parser/functions.rb:211
4572
4569
  msgid "%{name}(): Wrong number of arguments given (%{arg_count} for %{arity})"
4573
4570
  msgstr ""
4574
4571
 
4575
- #: ../lib/puppet/parser/functions.rb:209
4572
+ #: ../lib/puppet/parser/functions.rb:213
4576
4573
  msgid "%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})"
4577
4574
  msgstr ""
4578
4575
 
4579
- #: ../lib/puppet/parser/functions.rb:215
4576
+ #: ../lib/puppet/parser/functions.rb:219
4580
4577
  msgid "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
4581
4578
  msgstr ""
4582
4579
 
4583
- #: ../lib/puppet/parser/functions.rb:314
4580
+ #: ../lib/puppet/parser/functions.rb:318
4584
4581
  msgid "%{name}() can only be called using the 4.x function API. See Scope#call_function"
4585
4582
  msgstr ""
4586
4583
 
@@ -5958,23 +5955,23 @@ msgstr ""
5958
5955
  msgid "Unknown Explain type %{qualifier_type}"
5959
5956
  msgstr ""
5960
5957
 
5961
- #: ../lib/puppet/pops/lookup/hiera_config.rb:85
5958
+ #: ../lib/puppet/pops/lookup/hiera_config.rb:86
5962
5959
  msgid "Using of legacy data provider function '%{function_name}'. Please convert to a 'data_hash' function"
5963
5960
  msgstr ""
5964
5961
 
5965
- #: ../lib/puppet/pops/lookup/hiera_config.rb:142
5962
+ #: ../lib/puppet/pops/lookup/hiera_config.rb:143
5966
5963
  msgid "%{config_path}: File exists but does not contain a valid YAML hash. Falling back to Hiera version 3 default config"
5967
5964
  msgstr ""
5968
5965
 
5969
- #: ../lib/puppet/pops/lookup/hiera_config.rb:200
5966
+ #: ../lib/puppet/pops/lookup/hiera_config.rb:201
5970
5967
  msgid "Hiera configuration recreated due to change of scope variables used in interpolation expressions"
5971
5968
  msgstr ""
5972
5969
 
5973
- #: ../lib/puppet/pops/lookup/hiera_config.rb:428
5970
+ #: ../lib/puppet/pops/lookup/hiera_config.rb:429
5974
5971
  msgid "%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5"
5975
5972
  msgstr ""
5976
5973
 
5977
- #: ../lib/puppet/pops/lookup/hiera_config.rb:528
5974
+ #: ../lib/puppet/pops/lookup/hiera_config.rb:529
5978
5975
  msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
5979
5976
  msgstr ""
5980
5977
 
@@ -6787,7 +6784,7 @@ msgstr ""
6787
6784
  msgid "Could not list installed Packages: %{detail}"
6788
6785
  msgstr ""
6789
6786
 
6790
- #: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:332
6787
+ #: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:333
6791
6788
  msgid "Tried to get latest on a missing package"
6792
6789
  msgstr ""
6793
6790
 
@@ -6867,7 +6864,7 @@ msgstr ""
6867
6864
  msgid "source is defined but does not have trailing slash, ignoring %{source}"
6868
6865
  msgstr ""
6869
6866
 
6870
- #: ../lib/puppet/provider/package/gem.rb:102
6867
+ #: ../lib/puppet/provider/package/gem.rb:102 ../lib/puppet/provider/package/puppetserver_gem.rb:61
6871
6868
  msgid "Could not list gems: %{detail}"
6872
6869
  msgstr ""
6873
6870
 
@@ -6875,19 +6872,19 @@ msgstr ""
6875
6872
  msgid "Could not match %{desc}"
6876
6873
  msgstr ""
6877
6874
 
6878
- #: ../lib/puppet/provider/package/gem.rb:206
6875
+ #: ../lib/puppet/provider/package/gem.rb:206 ../lib/puppet/provider/package/puppetserver_gem.rb:93
6879
6876
  msgid "Invalid source '%{uri}': %{detail}"
6880
6877
  msgstr ""
6881
6878
 
6882
- #: ../lib/puppet/provider/package/gem.rb:217
6879
+ #: ../lib/puppet/provider/package/gem.rb:217 ../lib/puppet/provider/package/puppetserver_gem.rb:104
6883
6880
  msgid "puppet:// URLs are not supported as gem sources"
6884
6881
  msgstr ""
6885
6882
 
6886
- #: ../lib/puppet/provider/package/gem.rb:233
6883
+ #: ../lib/puppet/provider/package/gem.rb:233 ../lib/puppet/provider/package/puppetserver_gem.rb:115
6887
6884
  msgid "Could not install: %{output}"
6888
6885
  msgstr ""
6889
6886
 
6890
- #: ../lib/puppet/provider/package/gem.rb:259
6887
+ #: ../lib/puppet/provider/package/gem.rb:259 ../lib/puppet/provider/package/puppetserver_gem.rb:125
6891
6888
  msgid "Could not uninstall: %{output}"
6892
6889
  msgstr ""
6893
6890
 
@@ -7282,15 +7279,15 @@ msgstr ""
7282
7279
  msgid "ruby-shadow doesn't support %{method}"
7283
7280
  msgstr ""
7284
7281
 
7285
- #: ../lib/puppet/provider/user/windows_adsi.rb:128
7282
+ #: ../lib/puppet/provider/user/windows_adsi.rb:145
7286
7283
  msgid "The user account '%s' is disabled; The password will still be changed"
7287
7284
  msgstr ""
7288
7285
 
7289
- #: ../lib/puppet/provider/user/windows_adsi.rb:130
7286
+ #: ../lib/puppet/provider/user/windows_adsi.rb:147
7290
7287
  msgid "The user account '%s' is locked out; The password will still be changed"
7291
7288
  msgstr ""
7292
7289
 
7293
- #: ../lib/puppet/provider/user/windows_adsi.rb:132
7290
+ #: ../lib/puppet/provider/user/windows_adsi.rb:149
7294
7291
  msgid "The user account '%s' is expired; The password will still be changed"
7295
7292
  msgstr ""
7296
7293
 
@@ -7496,67 +7493,67 @@ msgstr ""
7496
7493
  msgid "Could not evaluate: %{detail}"
7497
7494
  msgstr ""
7498
7495
 
7499
- #: ../lib/puppet/resource/type.rb:81
7496
+ #: ../lib/puppet/resource/type.rb:82
7500
7497
  msgid "Invalid export in %{reference}: %{ex} is not a resource"
7501
7498
  msgstr ""
7502
7499
 
7503
- #: ../lib/puppet/resource/type.rb:82
7500
+ #: ../lib/puppet/resource/type.rb:83
7504
7501
  msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
7505
7502
  msgstr ""
7506
7503
 
7507
- #: ../lib/puppet/resource/type.rb:86
7504
+ #: ../lib/puppet/resource/type.rb:87
7508
7505
  msgid "Resource type %{res_type} does not produce %{ex_type}"
7509
7506
  msgstr ""
7510
7507
 
7511
- #: ../lib/puppet/resource/type.rb:147
7508
+ #: ../lib/puppet/resource/type.rb:148
7512
7509
  msgid "Invalid resource supertype '%{type}'"
7513
7510
  msgstr ""
7514
7511
 
7515
- #: ../lib/puppet/resource/type.rb:199
7512
+ #: ../lib/puppet/resource/type.rb:200
7516
7513
  msgid "%{name} is not a class; cannot add code to it"
7517
7514
  msgstr ""
7518
7515
 
7519
- #: ../lib/puppet/resource/type.rb:200
7516
+ #: ../lib/puppet/resource/type.rb:201
7520
7517
  msgid "%{name} is not a class; cannot add code from it"
7521
7518
  msgstr ""
7522
7519
 
7523
- #: ../lib/puppet/resource/type.rb:204
7520
+ #: ../lib/puppet/resource/type.rb:205
7524
7521
  msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
7525
7522
  msgstr ""
7526
7523
 
7527
- #: ../lib/puppet/resource/type.rb:208
7524
+ #: ../lib/puppet/resource/type.rb:209
7528
7525
  msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
7529
7526
  msgstr ""
7530
7527
 
7531
- #: ../lib/puppet/resource/type.rb:239
7528
+ #: ../lib/puppet/resource/type.rb:240
7532
7529
  msgid "Cannot create resources for defined resource types"
7533
7530
  msgstr ""
7534
7531
 
7535
- #: ../lib/puppet/resource/type.rb:294
7532
+ #: ../lib/puppet/resource/type.rb:295
7536
7533
  msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
7537
7534
  msgstr ""
7538
7535
 
7539
- #: ../lib/puppet/resource/type.rb:310
7536
+ #: ../lib/puppet/resource/type.rb:311
7540
7537
  msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
7541
7538
  msgstr ""
7542
7539
 
7543
- #: ../lib/puppet/resource/type.rb:437
7540
+ #: ../lib/puppet/resource/type.rb:438
7544
7541
  msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
7545
7542
  msgstr ""
7546
7543
 
7547
- #: ../lib/puppet/resource/type.rb:440
7544
+ #: ../lib/puppet/resource/type.rb:441
7548
7545
  msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
7549
7546
  msgstr ""
7550
7547
 
7551
- #: ../lib/puppet/resource/type.rb:482
7548
+ #: ../lib/puppet/resource/type.rb:483
7552
7549
  msgid "Could not find scope for %{class_name}"
7553
7550
  msgstr ""
7554
7551
 
7555
- #: ../lib/puppet/resource/type.rb:503
7552
+ #: ../lib/puppet/resource/type.rb:504
7556
7553
  msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
7557
7554
  msgstr ""
7558
7555
 
7559
- #: ../lib/puppet/resource/type.rb:505
7556
+ #: ../lib/puppet/resource/type.rb:506
7560
7557
  msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
7561
7558
  msgstr ""
7562
7559
 
@@ -7648,49 +7645,49 @@ msgstr ""
7648
7645
  msgid "Invalid setting type '%{type}'"
7649
7646
  msgstr ""
7650
7647
 
7651
- #: ../lib/puppet/settings.rb:894
7648
+ #: ../lib/puppet/settings.rb:903
7652
7649
  msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
7653
7650
  msgstr ""
7654
7651
 
7655
- #: ../lib/puppet/settings.rb:957
7652
+ #: ../lib/puppet/settings.rb:966
7656
7653
  msgid "setting definition for '%{name}' is not a hash!"
7657
7654
  msgstr ""
7658
7655
 
7659
- #: ../lib/puppet/settings.rb:962
7656
+ #: ../lib/puppet/settings.rb:971
7660
7657
  msgid "Setting %{name} is already defined"
7661
7658
  msgstr ""
7662
7659
 
7663
- #: ../lib/puppet/settings.rb:968
7660
+ #: ../lib/puppet/settings.rb:977
7664
7661
  msgid "Setting %{name} is already using short name '%{short}'"
7665
7662
  msgstr ""
7666
7663
 
7667
- #: ../lib/puppet/settings.rb:1227
7664
+ #: ../lib/puppet/settings.rb:1241
7668
7665
  msgid "Setting %{name} is deprecated."
7669
7666
  msgstr ""
7670
7667
 
7671
7668
  #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
7672
- #: ../lib/puppet/settings.rb:1232
7669
+ #: ../lib/puppet/settings.rb:1246
7673
7670
  msgid "Setting %{name} is deprecated in puppet.conf."
7674
7671
  msgstr ""
7675
7672
 
7676
- #: ../lib/puppet/settings.rb:1403
7673
+ #: ../lib/puppet/settings.rb:1417
7677
7674
  msgid "Error converting value for param '%{name}': %{detail}"
7678
7675
  msgstr ""
7679
7676
 
7680
- #: ../lib/puppet/settings.rb:1427
7677
+ #: ../lib/puppet/settings.rb:1441
7681
7678
  msgid "Could not find value for %{expression}"
7682
7679
  msgstr ""
7683
7680
 
7684
7681
  #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
7685
- #: ../lib/puppet/settings.rb:1437
7682
+ #: ../lib/puppet/settings.rb:1451
7686
7683
  msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
7687
7684
  msgstr ""
7688
7685
 
7689
- #: ../lib/puppet/settings.rb:1438
7686
+ #: ../lib/puppet/settings.rb:1452
7690
7687
  msgid "Its value will remain %{value}."
7691
7688
  msgstr ""
7692
7689
 
7693
- #: ../lib/puppet/settings.rb:1469
7690
+ #: ../lib/puppet/settings.rb:1483
7694
7691
  msgid "Attempt to assign a value to unknown setting %{name}"
7695
7692
  msgstr ""
7696
7693
 
@@ -8755,7 +8752,7 @@ msgid "Not managing symlink mode"
8755
8752
  msgstr ""
8756
8753
 
8757
8754
  #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
8758
- #: ../lib/puppet/type/file/source.rb:368
8755
+ #: ../lib/puppet/type/file/source.rb:373
8759
8756
  msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
8760
8757
  msgstr ""
8761
8758
 
@@ -8867,15 +8864,15 @@ msgstr ""
8867
8864
  msgid "Setting enable to %{value} is only supported on Microsoft Windows."
8868
8865
  msgstr ""
8869
8866
 
8870
- #: ../lib/puppet/type/service.rb:162
8867
+ #: ../lib/puppet/type/service.rb:166
8871
8868
  msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
8872
8869
  msgstr ""
8873
8870
 
8874
- #: ../lib/puppet/type/service.rb:163 ../lib/puppet/type/user.rb:256
8871
+ #: ../lib/puppet/type/service.rb:167 ../lib/puppet/type/user.rb:271
8875
8872
  msgid "Passwords cannot include ':'"
8876
8873
  msgstr ""
8877
8874
 
8878
- #: ../lib/puppet/type/service.rb:300
8875
+ #: ../lib/puppet/type/service.rb:304
8879
8876
  msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
8880
8877
  msgstr ""
8881
8878
 
@@ -8910,81 +8907,81 @@ msgstr ""
8910
8907
  msgid "File does not exist"
8911
8908
  msgstr ""
8912
8909
 
8913
- #: ../lib/puppet/type/user.rb:167
8910
+ #: ../lib/puppet/type/user.rb:182
8914
8911
  msgid "Could not find group(s) %{groups}"
8915
8912
  msgstr ""
8916
8913
 
8917
- #: ../lib/puppet/type/user.rb:276
8914
+ #: ../lib/puppet/type/user.rb:291
8918
8915
  msgid "Password minimum age must be provided as a number."
8919
8916
  msgstr ""
8920
8917
 
8921
- #: ../lib/puppet/type/user.rb:295
8918
+ #: ../lib/puppet/type/user.rb:310
8922
8919
  msgid "Password maximum age must be provided as a number."
8923
8920
  msgstr ""
8924
8921
 
8925
- #: ../lib/puppet/type/user.rb:326
8922
+ #: ../lib/puppet/type/user.rb:341
8926
8923
  msgid "Group names must be provided, not GID numbers."
8927
8924
  msgstr ""
8928
8925
 
8929
- #: ../lib/puppet/type/user.rb:328
8926
+ #: ../lib/puppet/type/user.rb:343
8930
8927
  msgid "Group names must be provided as an array, not a comma-separated list."
8931
8928
  msgstr ""
8932
8929
 
8933
- #: ../lib/puppet/type/user.rb:329
8930
+ #: ../lib/puppet/type/user.rb:344
8934
8931
  msgid "Group names must not be empty. If you want to specify \"no groups\" pass an empty array"
8935
8932
  msgstr ""
8936
8933
 
8937
- #: ../lib/puppet/type/user.rb:422
8934
+ #: ../lib/puppet/type/user.rb:437
8938
8935
  msgid "User provider %{name} can not manage home directories"
8939
8936
  msgstr ""
8940
8937
 
8941
8938
  #. TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
8942
8939
  #. TRANSLATORS separated by dashes.
8943
- #: ../lib/puppet/type/user.rb:439
8940
+ #: ../lib/puppet/type/user.rb:454
8944
8941
  msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
8945
8942
  msgstr ""
8946
8943
 
8947
- #: ../lib/puppet/type/user.rb:506
8944
+ #: ../lib/puppet/type/user.rb:521
8948
8945
  msgid "Role names must be provided, not numbers"
8949
8946
  msgstr ""
8950
8947
 
8951
- #: ../lib/puppet/type/user.rb:508
8948
+ #: ../lib/puppet/type/user.rb:523
8952
8949
  msgid "Role names must be provided as an array, not a comma-separated list"
8953
8950
  msgstr ""
8954
8951
 
8955
- #: ../lib/puppet/type/user.rb:545
8952
+ #: ../lib/puppet/type/user.rb:560
8956
8953
  msgid "Auth names must be provided, not numbers"
8957
8954
  msgstr ""
8958
8955
 
8959
- #: ../lib/puppet/type/user.rb:547
8956
+ #: ../lib/puppet/type/user.rb:562
8960
8957
  msgid "Auth names must be provided as an array, not a comma-separated list"
8961
8958
  msgstr ""
8962
8959
 
8963
- #: ../lib/puppet/type/user.rb:571
8960
+ #: ../lib/puppet/type/user.rb:586
8964
8961
  msgid "Profile names must be provided, not numbers"
8965
8962
  msgstr ""
8966
8963
 
8967
- #: ../lib/puppet/type/user.rb:573
8964
+ #: ../lib/puppet/type/user.rb:588
8968
8965
  msgid "Profile names must be provided as an array, not a comma-separated list"
8969
8966
  msgstr ""
8970
8967
 
8971
- #: ../lib/puppet/type/user.rb:684
8968
+ #: ../lib/puppet/type/user.rb:699
8972
8969
  msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
8973
8970
  msgstr ""
8974
8971
 
8975
- #: ../lib/puppet/type/user.rb:722
8972
+ #: ../lib/puppet/type/user.rb:737
8976
8973
  msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
8977
8974
  msgstr ""
8978
8975
 
8979
- #: ../lib/puppet/type/user.rb:725
8976
+ #: ../lib/puppet/type/user.rb:740
8980
8977
  msgid "Paths to keyfiles must be absolute, not %{entry}"
8981
8978
  msgstr ""
8982
8979
 
8983
- #: ../lib/puppet/type/user.rb:729
8980
+ #: ../lib/puppet/type/user.rb:744
8984
8981
  msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
8985
8982
  msgstr ""
8986
8983
 
8987
- #: ../lib/puppet/type/user.rb:757
8984
+ #: ../lib/puppet/type/user.rb:772
8988
8985
  msgid "Class name must be provided."
8989
8986
  msgstr ""
8990
8987
 
@@ -9083,11 +9080,11 @@ msgstr ""
9083
9080
  msgid "Failed to abandon a child process contract"
9084
9081
  msgstr ""
9085
9082
 
9086
- #: ../lib/puppet/util/autoload.rb:75
9083
+ #: ../lib/puppet/util/autoload.rb:83
9087
9084
  msgid "Could not autoload %{name}: %{detail}"
9088
9085
  msgstr ""
9089
9086
 
9090
- #: ../lib/puppet/util/autoload.rb:182
9087
+ #: ../lib/puppet/util/autoload.rb:184
9091
9088
  msgid "Autoload paths cannot be fully qualified"
9092
9089
  msgstr ""
9093
9090
 
@@ -9322,9 +9319,9 @@ msgstr ""
9322
9319
  msgid "Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}"
9323
9320
  msgstr ""
9324
9321
 
9325
- #. TRANSLATORS 'masterport' is the name of a setting and should not be translated
9322
+ #. TRANSLATORS 'serverport' is the name of a setting and should not be translated
9326
9323
  #: ../lib/puppet/util/connection.rb:75
9327
- msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
9324
+ msgid "Dynamically-bound port lookup failed; falling back to `serverport` setting: %{port}"
9328
9325
  msgstr ""
9329
9326
 
9330
9327
  #: ../lib/puppet/util/connection.rb:80
@@ -9907,7 +9904,7 @@ msgstr ""
9907
9904
  msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
9908
9905
  msgstr ""
9909
9906
 
9910
- #: ../lib/puppet/util/windows/api_types.rb:216
9907
+ #: ../lib/puppet/util/windows/api_types.rb:230
9911
9908
  msgid "Bad GUID format."
9912
9909
  msgstr ""
9913
9910