puppet 7.9.0-universal-darwin → 7.10.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 (182) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +6 -6
  3. data/{ext → examples/enc}/regexp_nodes/classes/databases +0 -0
  4. data/{ext → examples/enc}/regexp_nodes/classes/webservers +0 -0
  5. data/{ext → examples/enc}/regexp_nodes/environment/development +0 -0
  6. data/{ext → examples/enc}/regexp_nodes/parameters/service/prod +0 -0
  7. data/{ext → examples/enc}/regexp_nodes/parameters/service/qa +0 -0
  8. data/{ext → examples/enc}/regexp_nodes/parameters/service/sandbox +0 -0
  9. data/{ext → examples/enc}/regexp_nodes/regexp_nodes.rb +0 -0
  10. data/{ext → examples}/nagios/check_puppet.rb +2 -2
  11. data/ext/README.md +13 -0
  12. data/lib/puppet/configurer.rb +155 -46
  13. data/lib/puppet/defaults.rb +51 -26
  14. data/lib/puppet/environments.rb +66 -26
  15. data/lib/puppet/file_serving/configuration.rb +2 -0
  16. data/lib/puppet/file_serving/configuration/parser.rb +2 -0
  17. data/lib/puppet/file_serving/mount/scripts.rb +24 -0
  18. data/lib/puppet/functions/find_template.rb +2 -2
  19. data/lib/puppet/http/service/compiler.rb +6 -1
  20. data/lib/puppet/indirector/catalog/compiler.rb +21 -3
  21. data/lib/puppet/indirector/catalog/rest.rb +1 -0
  22. data/lib/puppet/indirector/terminus.rb +4 -0
  23. data/lib/puppet/module/plan.rb +0 -1
  24. data/lib/puppet/module/task.rb +1 -1
  25. data/lib/puppet/module_tool/applications/installer.rb +8 -4
  26. data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
  27. data/lib/puppet/node/environment.rb +10 -11
  28. data/lib/puppet/pops/serialization/to_data_converter.rb +18 -6
  29. data/lib/puppet/provider/package/pkg.rb +8 -1
  30. data/lib/puppet/provider/service/launchd.rb +1 -1
  31. data/lib/puppet/provider/service/systemd.rb +1 -1
  32. data/lib/puppet/provider/user/useradd.rb +42 -9
  33. data/lib/puppet/transaction/persistence.rb +11 -1
  34. data/lib/puppet/transaction/report.rb +15 -1
  35. data/lib/puppet/type.rb +1 -1
  36. data/lib/puppet/type/exec.rb +10 -1
  37. data/lib/puppet/type/file.rb +6 -6
  38. data/lib/puppet/type/filebucket.rb +2 -2
  39. data/lib/puppet/version.rb +1 -1
  40. data/locales/puppet.pot +134 -94
  41. data/man/man5/puppet.conf.5 +65 -25
  42. data/man/man8/puppet-agent.8 +1 -1
  43. data/man/man8/puppet-apply.8 +1 -1
  44. data/man/man8/puppet-catalog.8 +1 -1
  45. data/man/man8/puppet-config.8 +1 -1
  46. data/man/man8/puppet-describe.8 +1 -1
  47. data/man/man8/puppet-device.8 +1 -1
  48. data/man/man8/puppet-doc.8 +1 -1
  49. data/man/man8/puppet-epp.8 +1 -1
  50. data/man/man8/puppet-facts.8 +1 -1
  51. data/man/man8/puppet-filebucket.8 +1 -1
  52. data/man/man8/puppet-generate.8 +1 -1
  53. data/man/man8/puppet-help.8 +1 -1
  54. data/man/man8/puppet-lookup.8 +1 -1
  55. data/man/man8/puppet-module.8 +3 -3
  56. data/man/man8/puppet-node.8 +1 -1
  57. data/man/man8/puppet-parser.8 +1 -1
  58. data/man/man8/puppet-plugin.8 +1 -1
  59. data/man/man8/puppet-report.8 +1 -1
  60. data/man/man8/puppet-resource.8 +1 -1
  61. data/man/man8/puppet-script.8 +1 -1
  62. data/man/man8/puppet-ssl.8 +1 -1
  63. data/man/man8/puppet.8 +2 -2
  64. data/spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb +3 -0
  65. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile +4 -0
  66. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile +3 -0
  67. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb +8 -0
  68. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml +25 -0
  69. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po +19 -0
  70. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot +20 -0
  71. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json +8 -0
  72. data/spec/integration/application/agent_spec.rb +102 -52
  73. data/spec/integration/application/filebucket_spec.rb +5 -0
  74. data/spec/integration/configurer_spec.rb +17 -1
  75. data/spec/integration/l10n/compiler_spec.rb +37 -0
  76. data/spec/lib/puppet_spec/modules.rb +13 -2
  77. data/spec/lib/puppet_spec/puppetserver.rb +15 -0
  78. data/spec/shared_behaviours/documentation_on_faces.rb +0 -2
  79. data/spec/shared_contexts/l10n.rb +27 -0
  80. data/spec/spec_helper.rb +1 -10
  81. data/spec/unit/configurer_spec.rb +265 -54
  82. data/spec/unit/environments_spec.rb +150 -1
  83. data/spec/unit/file_serving/configuration/parser_spec.rb +23 -0
  84. data/spec/unit/file_serving/configuration_spec.rb +12 -4
  85. data/spec/unit/file_serving/mount/scripts_spec.rb +69 -0
  86. data/spec/unit/functions/logging_spec.rb +1 -0
  87. data/spec/unit/http/service/compiler_spec.rb +8 -0
  88. data/spec/unit/indirector/catalog/compiler_spec.rb +87 -0
  89. data/spec/unit/indirector/catalog/rest_spec.rb +8 -0
  90. data/spec/unit/interface/action_spec.rb +0 -9
  91. data/spec/unit/module_spec.rb +14 -0
  92. data/spec/unit/module_tool/applications/installer_spec.rb +39 -12
  93. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -11
  94. data/spec/unit/pops/serialization/to_from_hr_spec.rb +58 -0
  95. data/spec/unit/provider/package/pkg_spec.rb +19 -5
  96. data/spec/unit/provider/service/launchd_spec.rb +11 -0
  97. data/spec/unit/provider/service/systemd_spec.rb +1 -1
  98. data/spec/unit/provider/user/useradd_spec.rb +3 -2
  99. metadata +34 -94
  100. data/ext/README.environment +0 -8
  101. data/ext/dbfix.sql +0 -132
  102. data/ext/debian/README.Debian +0 -8
  103. data/ext/debian/README.source +0 -2
  104. data/ext/debian/TODO.Debian +0 -1
  105. data/ext/debian/changelog.erb +0 -1122
  106. data/ext/debian/compat +0 -1
  107. data/ext/debian/control +0 -144
  108. data/ext/debian/copyright +0 -339
  109. data/ext/debian/docs +0 -1
  110. data/ext/debian/fileserver.conf +0 -41
  111. data/ext/debian/puppet-common.dirs +0 -13
  112. data/ext/debian/puppet-common.install +0 -3
  113. data/ext/debian/puppet-common.lintian-overrides +0 -5
  114. data/ext/debian/puppet-common.manpages +0 -28
  115. data/ext/debian/puppet-common.postinst +0 -35
  116. data/ext/debian/puppet-common.postrm +0 -33
  117. data/ext/debian/puppet-el.dirs +0 -1
  118. data/ext/debian/puppet-el.emacsen-install +0 -25
  119. data/ext/debian/puppet-el.emacsen-remove +0 -11
  120. data/ext/debian/puppet-el.emacsen-startup +0 -9
  121. data/ext/debian/puppet-el.install +0 -1
  122. data/ext/debian/puppet-testsuite.install +0 -2
  123. data/ext/debian/puppet-testsuite.lintian-overrides +0 -4
  124. data/ext/debian/puppet.lintian-overrides +0 -3
  125. data/ext/debian/puppet.logrotate +0 -20
  126. data/ext/debian/puppet.postinst +0 -20
  127. data/ext/debian/puppet.postrm +0 -20
  128. data/ext/debian/puppet.preinst +0 -20
  129. data/ext/debian/puppetmaster-common.install +0 -2
  130. data/ext/debian/puppetmaster-common.manpages +0 -2
  131. data/ext/debian/puppetmaster-common.postinst +0 -6
  132. data/ext/debian/puppetmaster-passenger.dirs +0 -4
  133. data/ext/debian/puppetmaster-passenger.postinst +0 -162
  134. data/ext/debian/puppetmaster-passenger.postrm +0 -61
  135. data/ext/debian/puppetmaster.README.debian +0 -17
  136. data/ext/debian/puppetmaster.default +0 -14
  137. data/ext/debian/puppetmaster.init +0 -137
  138. data/ext/debian/puppetmaster.lintian-overrides +0 -3
  139. data/ext/debian/puppetmaster.postinst +0 -20
  140. data/ext/debian/puppetmaster.postrm +0 -5
  141. data/ext/debian/puppetmaster.preinst +0 -22
  142. data/ext/debian/rules +0 -132
  143. data/ext/debian/source/format +0 -1
  144. data/ext/debian/source/options +0 -1
  145. data/ext/debian/vim-puppet.README.Debian +0 -13
  146. data/ext/debian/vim-puppet.dirs +0 -5
  147. data/ext/debian/vim-puppet.yaml +0 -7
  148. data/ext/debian/watch +0 -2
  149. data/ext/freebsd/puppetd +0 -26
  150. data/ext/freebsd/puppetmasterd +0 -26
  151. data/ext/gentoo/conf.d/puppet +0 -5
  152. data/ext/gentoo/conf.d/puppetmaster +0 -12
  153. data/ext/gentoo/init.d/puppet +0 -38
  154. data/ext/gentoo/init.d/puppetmaster +0 -51
  155. data/ext/gentoo/puppet/fileserver.conf +0 -41
  156. data/ext/ips/puppet-agent +0 -44
  157. data/ext/ips/puppet-master +0 -44
  158. data/ext/ips/puppet.p5m.erb +0 -12
  159. data/ext/ips/puppetagent.xml +0 -42
  160. data/ext/ips/puppetmaster.xml +0 -42
  161. data/ext/ips/rules +0 -19
  162. data/ext/ips/transforms +0 -34
  163. data/ext/ldap/puppet.schema +0 -24
  164. data/ext/logcheck/puppet +0 -23
  165. data/ext/osx/file_mapping.yaml +0 -28
  166. data/ext/osx/postflight.erb +0 -109
  167. data/ext/osx/preflight.erb +0 -52
  168. data/ext/osx/prototype.plist.erb +0 -38
  169. data/ext/redhat/fileserver.conf +0 -41
  170. data/ext/redhat/logrotate +0 -21
  171. data/ext/redhat/puppet.spec.erb +0 -841
  172. data/ext/redhat/server.init +0 -128
  173. data/ext/redhat/server.sysconfig +0 -13
  174. data/ext/solaris/pkginfo +0 -6
  175. data/ext/solaris/smf/puppetd.xml +0 -77
  176. data/ext/solaris/smf/puppetmasterd.xml +0 -77
  177. data/ext/solaris/smf/svc-puppetd +0 -71
  178. data/ext/solaris/smf/svc-puppetmasterd +0 -67
  179. data/ext/suse/puppet.spec +0 -310
  180. data/ext/suse/server.init +0 -173
  181. data/ext/yaml_nodes.rb +0 -105
  182. data/spec/unit/indirector/store_configs_spec.rb +0 -7
@@ -14,6 +14,8 @@ module Serialization
14
14
  # @option options [Boolean] :local_reference use local references instead of duplicating complex entries
15
15
  # @option options [Boolean] :type_by_reference `true` if Object types are converted to references rather than embedded.
16
16
  # @option options [Boolean] :symbol_as_string `true` if Symbols should be converted to strings (with type loss)
17
+ # @option options [Boolean] :force_symbol `false` if Symbols should not be converted (rich_data and symbol_as_string must be false)
18
+ # @option options [Boolean] :silence_warnings `false` if warnings should be silenced
17
19
  # @option options [String] :message_prefix String to prepend to in warnings and errors
18
20
  # @return [Data] the processed result. An object assignable to `Data`.
19
21
  #
@@ -41,6 +43,12 @@ module Serialization
41
43
  @symbol_as_string = options[:symbol_as_string]
42
44
  @symbol_as_string = false if @symbol_as_string.nil?
43
45
 
46
+ @force_symbol = options[:force_symbol]
47
+ @force_symbol = false if @force_symbol.nil?
48
+
49
+ @silence_warnings = options[:silence_warnings]
50
+ @silence_warnings = false if @silence_warnings.nil?
51
+
44
52
  @rich_data = options[:rich_data]
45
53
  @rich_data = false if @rich_data.nil?
46
54
 
@@ -92,7 +100,11 @@ module Serialization
92
100
  elsif @rich_data
93
101
  { PCORE_TYPE_KEY => PCORE_TYPE_SYMBOL, PCORE_VALUE_KEY => value.to_s }
94
102
  else
95
- unknown_to_string_with_warning(value)
103
+ if @force_symbol
104
+ value
105
+ else
106
+ @silence_warnings ? unknown_to_string(value) : unknown_to_string_with_warning(value)
107
+ end
96
108
  end
97
109
  elsif value.instance_of?(Array)
98
110
  process(value) do
@@ -117,7 +129,11 @@ module Serialization
117
129
  { PCORE_TYPE_KEY => PCORE_TYPE_SENSITIVE, PCORE_VALUE_KEY => to_data(value.unwrap) }
118
130
  end
119
131
  else
120
- unknown_to_data(value)
132
+ if @rich_data
133
+ value_to_data_hash(value)
134
+ else
135
+ @silence_warnings ? unknown_to_string(value) : unknown_to_string_with_warning(value)
136
+ end
121
137
  end
122
138
  end
123
139
 
@@ -191,10 +207,6 @@ module Serialization
191
207
  v
192
208
  end
193
209
 
194
- def unknown_to_data(value)
195
- @rich_data ? value_to_data_hash(value) : unknown_to_string_with_warning(value)
196
- end
197
-
198
210
  def unknown_key_to_string_with_warning(value)
199
211
  str = unknown_to_string(value)
200
212
  serialization_issue(Issues::SERIALIZATION_UNKNOWN_KEY_CONVERTED_TO_STRING, :path => path_to_s, :klass => value.class, :value => str)
@@ -161,7 +161,14 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
161
161
  command = is == :absent ? 'install' : 'update'
162
162
  options = ['-n']
163
163
  options.concat(join_options(@resource[:install_options])) if @resource[:install_options]
164
- status = exec_cmd(command(:pkg), command, *options, "#{name}@#{p[:ensure]}")[:exit]
164
+
165
+ begin
166
+ unhold if properties[:mark] == :hold
167
+ status = exec_cmd(command(:pkg), command, *options, "#{name}@#{p[:ensure]}")[:exit]
168
+ ensure
169
+ hold if properties[:mark] == :hold
170
+ end
171
+
165
172
  case status
166
173
  when 4
167
174
  # if the first installable match would cause no changes, we're in sync
@@ -138,7 +138,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
138
138
  Puppet.debug("Reading launchd plist #{filepath}")
139
139
  job = read_plist(filepath)
140
140
  next if job.nil?
141
- if job.has_key?("Label")
141
+ if job.respond_to?(:key) && job.key?("Label")
142
142
  @label_to_path_map[job["Label"]] = filepath
143
143
  else
144
144
  #TRANSLATORS 'plist' and label' should not be translated
@@ -14,7 +14,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
14
14
  confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
15
15
 
16
16
  defaultfor :osfamily => [:archlinux]
17
- defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8"]
17
+ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8", "9"]
18
18
  defaultfor :osfamily => :redhat, :operatingsystem => :fedora
19
19
  defaultfor :osfamily => :suse
20
20
  defaultfor :osfamily => :coreos
@@ -9,7 +9,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
9
9
  install Ruby's shadow password library (often known as `ruby-libshadow`)
10
10
  if you wish to manage user passwords."
11
11
 
12
- commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage"
12
+ commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd => "chpasswd"
13
13
 
14
14
  options :home, :flag => "-d", :method => :dir
15
15
  options :comment, :method => :gecos
@@ -152,6 +152,38 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
152
152
  set(:groups, value)
153
153
  end
154
154
 
155
+ def password=(value)
156
+ user = @resource[:name]
157
+ tempfile = Tempfile.new('puppet', :encoding => Encoding::UTF_8)
158
+ begin
159
+ # Puppet execute does not support strings as input, only files.
160
+ # The password is expected to be in an encrypted format given -e is specified:
161
+ tempfile << "#{user}:#{value}\n"
162
+ tempfile.flush
163
+
164
+ # Options '-e' use encrypted password
165
+ # Must receive "user:enc_password" as input
166
+ # command, arguments = {:failonfail => true, :combine => true}
167
+ cmd = [command(:chpasswd), '-e']
168
+ execute_options = {
169
+ :failonfail => false,
170
+ :combine => true,
171
+ :stdinfile => tempfile.path,
172
+ :sensitive => has_sensitive_data?
173
+ }
174
+ output = execute(cmd, execute_options)
175
+
176
+ rescue => detail
177
+ tempfile.close
178
+ tempfile.delete
179
+ raise Puppet::Error, "Could not set password on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
180
+ end
181
+
182
+ # chpasswd can return 1, even on success (at least on AIX 6.1); empty output
183
+ # indicates success
184
+ raise Puppet::ExecutionFailure, "chpasswd said #{output}" if output != ''
185
+ end
186
+
155
187
  verify :gid, "GID must be an integer" do |value|
156
188
  value.is_a? Integer
157
189
  end
@@ -215,13 +247,15 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
215
247
  end
216
248
  end
217
249
 
250
+ # Add properties and flags but skipping password related properties due to
251
+ # security risks
218
252
  def add_properties
219
253
  cmd = []
220
254
  # validproperties is a list of properties in undefined order
221
255
  # sort them to have a predictable command line in tests
222
256
  Puppet::Type.type(:user).validproperties.sort.each do |property|
223
257
  value = get_value_for_property(property)
224
- next if value.nil?
258
+ next if value.nil? || property == :password
225
259
  # the value needs to be quoted, mostly because -c might
226
260
  # have spaces in it
227
261
  cmd << flag(property) << munge(property, value)
@@ -331,13 +365,12 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
331
365
  if @resource[:shell]
332
366
  check_valid_shell
333
367
  end
334
- super
335
- if @resource.forcelocal? && self.groups?
336
- set(:groups, @resource[:groups])
337
- end
338
- if @resource.forcelocal? && @resource[:expiry]
339
- set(:expiry, @resource[:expiry])
340
- end
368
+ super
369
+ if @resource.forcelocal?
370
+ set(:groups, @resource[:groups]) if self.groups?
371
+ set(:expiry, @resource[:expiry]) if @resource[:expiry]
372
+ end
373
+ set(:password, @resource[:password]) if @resource[:password]
341
374
  end
342
375
 
343
376
  def groups?
@@ -87,7 +87,17 @@ class Puppet::Transaction::Persistence
87
87
 
88
88
  # Save data from internal class to persistence store on disk.
89
89
  def save
90
- Puppet::Util::Yaml.dump(@new_data, Puppet[:transactionstorefile])
90
+ converted_data = Puppet::Pops::Serialization::ToDataConverter.convert(
91
+ @new_data, {
92
+ symbol_as_string: false,
93
+ local_reference: false,
94
+ type_by_reference: true,
95
+ force_symbol: true,
96
+ silence_warnings: true,
97
+ message_prefix: to_s
98
+ }
99
+ )
100
+ Puppet::Util::Yaml.dump(converted_data, Puppet[:transactionstorefile])
91
101
  end
92
102
 
93
103
  # Use the catalog and run_mode to determine if persistence should be enabled or not
@@ -75,6 +75,10 @@ class Puppet::Transaction::Report
75
75
  # @return [String] the environment name
76
76
  attr_accessor :environment
77
77
 
78
+ # The name of the environment the agent initially started in
79
+ # @return [String] the environment name
80
+ attr_accessor :initial_environment
81
+
78
82
  # Whether there are changes that we decided not to apply because of noop
79
83
  # @return [Boolean]
80
84
  #
@@ -375,7 +379,17 @@ class Puppet::Transaction::Report
375
379
  # @api public
376
380
  #
377
381
  def raw_summary
378
- report = { "version" => { "config" => configuration_version, "puppet" => Puppet.version } }
382
+ report = {
383
+ "version" => {
384
+ "config" => configuration_version,
385
+ "puppet" => Puppet.version
386
+ },
387
+ "application" => {
388
+ "run_mode" => Puppet.run_mode.name.to_s,
389
+ "initial_environment" => initial_environment,
390
+ "converged_environment" => environment
391
+ }
392
+ }
379
393
 
380
394
  @metrics.each do |name, metric|
381
395
  key = metric.name.to_s
data/lib/puppet/type.rb CHANGED
@@ -1272,7 +1272,7 @@ class Type
1272
1272
  like it does when running normally. However, if a resource attribute is not in
1273
1273
  the desired state (as declared in the catalog), Puppet will take no
1274
1274
  action, and will instead report the changes it _would_ have made. These
1275
- simulated changes will appear in the report sent to the puppet master, or
1275
+ simulated changes will appear in the report sent to the primary Puppet server, or
1276
1276
  be shown on the console if running puppet agent or puppet apply in the
1277
1277
  foreground. The simulated changes will not send refresh events to any
1278
1278
  subscribing or notified resources, although Puppet will log that a refresh
@@ -11,7 +11,10 @@ module Puppet
11
11
 
12
12
  * The command itself is already idempotent. (For example, `apt-get update`.)
13
13
  * The exec has an `onlyif`, `unless`, or `creates` attribute, which prevents
14
- Puppet from running the command unless some condition is met.
14
+ Puppet from running the command unless some condition is met. The
15
+ `onlyif` and `unless` commands of an `exec` are used in the process of
16
+ determining whether the `exec` is already in sync, therefore they must be run
17
+ during a noop Puppet run.
15
18
  * The exec has `refreshonly => true`, which allows Puppet to run the
16
19
  command only when some other resource is changed. (See the notes on refreshing
17
20
  below.)
@@ -456,6 +459,9 @@ module Puppet
456
459
  `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
457
460
  must fully qualify the command's name.
458
461
 
462
+ Since this command is used in the process of determining whether the
463
+ `exec` is already in sync, it must be run during a noop Puppet run.
464
+
459
465
  This parameter can also take an array of commands. For example:
460
466
 
461
467
  unless => ['test -f /tmp/file1', 'test -f /tmp/file2'],
@@ -516,6 +522,9 @@ module Puppet
516
522
  `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
517
523
  must fully qualify the command's name.
518
524
 
525
+ Since this command is used in the process of determining whether the
526
+ `exec` is already in sync, it must be run during a noop Puppet run.
527
+
519
528
  This parameter can also take an array of commands. For example:
520
529
 
521
530
  onlyif => ['test -f /tmp/file1', 'test -f /tmp/file2'],
@@ -91,23 +91,23 @@ Puppet::Type.newtype(:file) do
91
91
 
92
92
  Backing up to a local filebucket isn't particularly useful. If you want
93
93
  to make organized use of backups, you will generally want to use the
94
- puppet master server's filebucket service. This requires declaring a
94
+ primary Puppet server's filebucket service. This requires declaring a
95
95
  filebucket resource and a resource default for the `backup` attribute
96
96
  in site.pp:
97
97
 
98
98
  # /etc/puppetlabs/puppet/manifests/site.pp
99
99
  filebucket { 'main':
100
100
  path => false, # This is required for remote filebuckets.
101
- server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
101
+ server => 'puppet.example.com', # Optional; defaults to the configured primary Puppet server.
102
102
  }
103
103
 
104
104
  File { backup => main, }
105
105
 
106
- If you are using multiple puppet master servers, you will want to
106
+ If you are using multiple primary servers, you will want to
107
107
  centralize the contents of the filebucket. Either configure your load
108
- balancer to direct all filebucket traffic to a single master, or use
108
+ balancer to direct all filebucket traffic to a single primary server, or use
109
109
  something like an out-of-band rsync task to synchronize the content on all
110
- masters.
110
+ primary servers.
111
111
 
112
112
  > **Note**: Enabling and using the backup option, and by extension the
113
113
  filebucket resource, requires appropriate planning and management to ensure
@@ -359,7 +359,7 @@ Puppet::Type.newtype(:file) do
359
359
  This command must have a fully qualified path, and should contain a
360
360
  percent (`%`) token where it would expect an input file. It must exit `0`
361
361
  if the syntax is correct, and non-zero otherwise. The command will be
362
- run on the target system while applying the catalog, not on the puppet master.
362
+ run on the target system while applying the catalog, not on the primary Puppet server.
363
363
 
364
364
  Example:
365
365
 
@@ -4,7 +4,7 @@ module Puppet
4
4
  Type.newtype(:filebucket) do
5
5
  @doc = <<-EOT
6
6
  A repository for storing and retrieving file content by MD5 checksum. Can
7
- be local to each agent node, or centralized on a puppet master server. All
7
+ be local to each agent node, or centralized on a primary Puppet server. All
8
8
  puppet servers provide a filebucket service that agent nodes can access
9
9
  via HTTP, but you must declare a filebucket resource before any agents
10
10
  will do so.
@@ -25,7 +25,7 @@ module Puppet
25
25
  # /etc/puppetlabs/puppet/manifests/site.pp
26
26
  filebucket { 'main':
27
27
  path => false, # This is required for remote filebuckets.
28
- server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
28
+ server => 'puppet.example.com', # Optional; defaults to the configured primary server.
29
29
  }
30
30
 
31
31
  File { backup => main, }
@@ -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 = '7.9.0'
9
+ PUPPETVERSION = '7.10.0'
10
10
 
11
11
  ##
12
12
  # version is a public API method intended to always provide a fast and
data/locales/puppet.pot CHANGED
@@ -6,11 +6,11 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: Puppet automation framework 7.8.0-115-g2e290b736f\n"
9
+ "Project-Id-Version: Puppet automation framework 7.9.0-154-gc8aa8b2175\n"
10
10
  "\n"
11
11
  "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
12
- "POT-Creation-Date: 2021-07-06 12:22+0000\n"
13
- "PO-Revision-Date: 2021-07-06 12:22+0000\n"
12
+ "POT-Creation-Date: 2021-08-11 13:52+0000\n"
13
+ "PO-Revision-Date: 2021-08-11 13:52+0000\n"
14
14
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15
15
  "Language-Team: LANGUAGE <LL@li.org>\n"
16
16
  "Language: \n"
@@ -534,93 +534,133 @@ msgstr ""
534
534
  msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
535
535
  msgstr ""
536
536
 
537
- #: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:182
537
+ #: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:272
538
538
  msgid "Using cached catalog from environment '%{catalog_env}'"
539
539
  msgstr ""
540
540
 
541
- #: ../lib/puppet/configurer.rb:175
541
+ #: ../lib/puppet/configurer.rb:130
542
+ msgid "The current total number of facts: %{size} exceeds the number of facts limit: %{max_size}"
543
+ msgstr ""
544
+
545
+ #: ../lib/puppet/configurer.rb:134
546
+ msgid "Fact %{name} with length: '%{length}' exceeds the length limit: %{limit}"
547
+ msgstr ""
548
+
549
+ #: ../lib/puppet/configurer.rb:138
550
+ msgid "The current number of top level facts: %{size} exceeds the top facts limit: %{max_size}"
551
+ msgstr ""
552
+
553
+ #: ../lib/puppet/configurer.rb:142
554
+ msgid "Fact value '%{value}' with the value length: '%{length}' exceeds the value length limit: %{max_length}"
555
+ msgstr ""
556
+
557
+ #: ../lib/puppet/configurer.rb:146
558
+ msgid "Payload with the current size of: '%{payload}' exceeds the payload size limit: %{max_size}"
559
+ msgstr ""
560
+
561
+ #: ../lib/puppet/configurer.rb:184
562
+ msgid "The size of the payload is %{payload}"
563
+ msgstr ""
564
+
565
+ #: ../lib/puppet/configurer.rb:214
566
+ msgid "The total number of facts registered is %{number_of_facts}"
567
+ msgstr ""
568
+
569
+ #: ../lib/puppet/configurer.rb:265
542
570
  msgid "Could not retrieve catalog; skipping run"
543
571
  msgstr ""
544
572
 
545
- #: ../lib/puppet/configurer.rb:191
573
+ #: ../lib/puppet/configurer.rb:281
546
574
  msgid "Applied catalog in %{seconds} seconds"
547
575
  msgstr ""
548
576
 
549
- #: ../lib/puppet/configurer.rb:225
577
+ #: ../lib/puppet/configurer.rb:315
550
578
  msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
551
579
  msgstr ""
552
580
 
553
581
  #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
554
- #: ../lib/puppet/configurer.rb:239
582
+ #: ../lib/puppet/configurer.rb:329
555
583
  msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
556
584
  msgstr ""
557
585
 
558
- #: ../lib/puppet/configurer.rb:275
586
+ #: ../lib/puppet/configurer.rb:366
559
587
  msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
560
588
  msgstr ""
561
589
 
562
- #: ../lib/puppet/configurer.rb:320
563
- msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
590
+ #: ../lib/puppet/configurer.rb:389
591
+ msgid "Environment not passed via CLI and no catalog was given, attempting to find out the last server-specified environment"
564
592
  msgstr ""
565
593
 
566
- #: ../lib/puppet/configurer.rb:335
567
- msgid "Using configured environment '%{env}'"
594
+ #: ../lib/puppet/configurer.rb:394
595
+ 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."
568
596
  msgstr ""
569
597
 
570
- #: ../lib/puppet/configurer.rb:339
571
- msgid "Unable to fetch my node definition, but the agent run will continue:"
598
+ #: ../lib/puppet/configurer.rb:398
599
+ msgid "Using environment '%{env}'"
572
600
  msgstr ""
573
601
 
574
- #: ../lib/puppet/configurer.rb:367
602
+ #: ../lib/puppet/configurer.rb:429
575
603
  msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
576
604
  msgstr ""
577
605
 
578
- #: ../lib/puppet/configurer.rb:378
606
+ #: ../lib/puppet/configurer.rb:440
579
607
  msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
580
608
  msgstr ""
581
609
 
582
- #: ../lib/puppet/configurer.rb:380
610
+ #: ../lib/puppet/configurer.rb:442
583
611
  msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
584
612
  msgstr ""
585
613
 
586
- #: ../lib/puppet/configurer.rb:434
614
+ #: ../lib/puppet/configurer.rb:505
587
615
  msgid "Failed to apply catalog: %{detail}"
588
616
  msgstr ""
589
617
 
590
- #: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
618
+ #: ../lib/puppet/configurer.rb:536
619
+ msgid "Environment '%{environment}' not found on server, skipping initial pluginsync."
620
+ msgstr ""
621
+
622
+ #: ../lib/puppet/configurer.rb:553 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
591
623
  msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
592
624
  msgstr ""
593
625
 
594
626
  #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
595
- #: ../lib/puppet/configurer.rb:467 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
627
+ #: ../lib/puppet/configurer.rb:557 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
596
628
  msgid "Unable to connect to server from server_list setting: %{detail}"
597
629
  msgstr ""
598
630
 
599
- #: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
631
+ #: ../lib/puppet/configurer.rb:573
632
+ msgid "Found last server-specified environment: %{environment}"
633
+ msgstr ""
634
+
635
+ #: ../lib/puppet/configurer.rb:576
636
+ msgid "Could not find last server-specified environment: %{detail}"
637
+ msgstr ""
638
+
639
+ #: ../lib/puppet/configurer.rb:586 ../lib/puppet/face/report.rb:47
600
640
  msgid "Could not send report: %{detail}"
601
641
  msgstr ""
602
642
 
603
- #: ../lib/puppet/configurer.rb:487
643
+ #: ../lib/puppet/configurer.rb:595
604
644
  msgid "Could not save last run local report: %{detail}"
605
645
  msgstr ""
606
646
 
607
- #: ../lib/puppet/configurer.rb:506
647
+ #: ../lib/puppet/configurer.rb:614
608
648
  msgid "Uploading facts for %{node} to %{server}"
609
649
  msgstr ""
610
650
 
611
- #: ../lib/puppet/configurer.rb:514
651
+ #: ../lib/puppet/configurer.rb:622
612
652
  msgid "Failed to submit facts: %{detail}"
613
653
  msgstr ""
614
654
 
615
- #: ../lib/puppet/configurer.rb:529
655
+ #: ../lib/puppet/configurer.rb:637
616
656
  msgid "Could not run command from %{setting}: %{detail}"
617
657
  msgstr ""
618
658
 
619
- #: ../lib/puppet/configurer.rb:547
659
+ #: ../lib/puppet/configurer.rb:655
620
660
  msgid "Could not retrieve catalog from cache: %{detail}"
621
661
  msgstr ""
622
662
 
623
- #: ../lib/puppet/configurer.rb:568
663
+ #: ../lib/puppet/configurer.rb:677
624
664
  msgid "Could not retrieve catalog from remote server: %{detail}"
625
665
  msgstr ""
626
666
 
@@ -720,7 +760,7 @@ msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{all
720
760
  msgstr ""
721
761
 
722
762
  #. TRANSLATORS 'pluginsync' is a setting and should not be translated
723
- #: ../lib/puppet/defaults.rb:1919
763
+ #: ../lib/puppet/defaults.rb:1944
724
764
  msgid "Setting 'pluginsync' is deprecated."
725
765
  msgstr ""
726
766
 
@@ -1589,15 +1629,15 @@ msgstr ""
1589
1629
  msgid "Relative paths must not be fully qualified"
1590
1630
  msgstr ""
1591
1631
 
1592
- #: ../lib/puppet/file_serving/configuration.rb:55
1632
+ #: ../lib/puppet/file_serving/configuration.rb:56
1593
1633
  msgid "Cannot find file: Invalid mount '%{mount_name}'"
1594
1634
  msgstr ""
1595
1635
 
1596
- #: ../lib/puppet/file_serving/configuration.rb:56
1636
+ #: ../lib/puppet/file_serving/configuration.rb:57
1597
1637
  msgid "Cannot find file: Invalid relative path '%{path}'"
1598
1638
  msgstr ""
1599
1639
 
1600
- #: ../lib/puppet/file_serving/configuration.rb:104
1640
+ #: ../lib/puppet/file_serving/configuration.rb:106
1601
1641
  msgid "Error parsing fileserver configuration: %{detail}; using old configuration"
1602
1642
  msgstr ""
1603
1643
 
@@ -1625,11 +1665,11 @@ msgstr ""
1625
1665
  msgid "%{mount} is already mounted at %{name} at %{error_location}"
1626
1666
  msgstr ""
1627
1667
 
1628
- #: ../lib/puppet/file_serving/configuration/parser.rb:98
1668
+ #: ../lib/puppet/file_serving/configuration/parser.rb:100
1629
1669
  msgid "Removing mount \"%{mount}\": %{detail}"
1630
1670
  msgstr ""
1631
1671
 
1632
- #: ../lib/puppet/file_serving/configuration/parser.rb:102
1672
+ #: ../lib/puppet/file_serving/configuration/parser.rb:104
1633
1673
  msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
1634
1674
  msgstr ""
1635
1675
 
@@ -1719,7 +1759,7 @@ msgstr ""
1719
1759
  msgid "No client; expanding '%{path}' with local host"
1720
1760
  msgstr ""
1721
1761
 
1722
- #: ../lib/puppet/file_serving/mount/modules.rb:8
1762
+ #: ../lib/puppet/file_serving/mount/modules.rb:8 ../lib/puppet/file_serving/mount/scripts.rb:6
1723
1763
  msgid "No module specified"
1724
1764
  msgstr ""
1725
1765
 
@@ -2284,120 +2324,120 @@ msgstr ""
2284
2324
  msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
2285
2325
  msgstr ""
2286
2326
 
2287
- #: ../lib/puppet/indirector/catalog/compiler.rb:71
2327
+ #: ../lib/puppet/indirector/catalog/compiler.rb:85
2288
2328
  msgid "Setup server facts for compiling"
2289
2329
  msgstr ""
2290
2330
 
2291
- #: ../lib/puppet/indirector/catalog/compiler.rb:95
2331
+ #: ../lib/puppet/indirector/catalog/compiler.rb:113
2292
2332
  msgid "Unsupported facts format"
2293
2333
  msgstr ""
2294
2334
 
2295
2335
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2296
- #: ../lib/puppet/indirector/catalog/compiler.rb:136
2336
+ #: ../lib/puppet/indirector/catalog/compiler.rb:154
2297
2337
  msgid "Not inlining absent resource"
2298
2338
  msgstr ""
2299
2339
 
2300
2340
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2301
- #: ../lib/puppet/indirector/catalog/compiler.rb:139
2341
+ #: ../lib/puppet/indirector/catalog/compiler.rb:157
2302
2342
  msgid "Not inlining resource without sources"
2303
2343
  msgstr ""
2304
2344
 
2305
2345
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2306
- #: ../lib/puppet/indirector/catalog/compiler.rb:142
2346
+ #: ../lib/puppet/indirector/catalog/compiler.rb:160
2307
2347
  msgid "Not inlining unsupported source scheme"
2308
2348
  msgstr ""
2309
2349
 
2310
2350
  #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
2311
- #: ../lib/puppet/indirector/catalog/compiler.rb:164
2351
+ #: ../lib/puppet/indirector/catalog/compiler.rb:182
2312
2352
  msgid "Not inlining file outside environment"
2313
2353
  msgstr ""
2314
2354
 
2315
2355
  #. TRANSLATORS Inlining refers to adding additional metadata
2316
- #: ../lib/puppet/indirector/catalog/compiler.rb:170
2356
+ #: ../lib/puppet/indirector/catalog/compiler.rb:188
2317
2357
  msgid "Inlining file metadata"
2318
2358
  msgstr ""
2319
2359
 
2320
- #: ../lib/puppet/indirector/catalog/compiler.rb:260
2360
+ #: ../lib/puppet/indirector/catalog/compiler.rb:278
2321
2361
  msgid "Could not get metadata for %{resource}"
2322
2362
  msgstr ""
2323
2363
 
2324
- #: ../lib/puppet/indirector/catalog/compiler.rb:281
2364
+ #: ../lib/puppet/indirector/catalog/compiler.rb:299
2325
2365
  msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
2326
2366
  msgstr ""
2327
2367
 
2328
- #: ../lib/puppet/indirector/catalog/compiler.rb:288
2368
+ #: ../lib/puppet/indirector/catalog/compiler.rb:306
2329
2369
  msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2330
2370
  msgstr ""
2331
2371
 
2332
- #: ../lib/puppet/indirector/catalog/compiler.rb:289
2372
+ #: ../lib/puppet/indirector/catalog/compiler.rb:307
2333
2373
  msgid "Compiled static catalog for %{node} in environment %{environment}"
2334
2374
  msgstr ""
2335
2375
 
2336
- #: ../lib/puppet/indirector/catalog/compiler.rb:291
2376
+ #: ../lib/puppet/indirector/catalog/compiler.rb:309
2337
2377
  msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
2338
2378
  msgstr ""
2339
2379
 
2340
- #: ../lib/puppet/indirector/catalog/compiler.rb:292
2380
+ #: ../lib/puppet/indirector/catalog/compiler.rb:310
2341
2381
  msgid "Compiled static catalog for %{node}"
2342
2382
  msgstr ""
2343
2383
 
2344
- #: ../lib/puppet/indirector/catalog/compiler.rb:297
2384
+ #: ../lib/puppet/indirector/catalog/compiler.rb:315
2345
2385
  msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2346
2386
  msgstr ""
2347
2387
 
2348
- #: ../lib/puppet/indirector/catalog/compiler.rb:298
2388
+ #: ../lib/puppet/indirector/catalog/compiler.rb:316
2349
2389
  msgid "Compiled catalog for %{node} in environment %{environment}"
2350
2390
  msgstr ""
2351
2391
 
2352
- #: ../lib/puppet/indirector/catalog/compiler.rb:300
2392
+ #: ../lib/puppet/indirector/catalog/compiler.rb:318
2353
2393
  msgid "Compiled catalog for %{node} in %%{seconds} seconds"
2354
2394
  msgstr ""
2355
2395
 
2356
- #: ../lib/puppet/indirector/catalog/compiler.rb:301
2396
+ #: ../lib/puppet/indirector/catalog/compiler.rb:319
2357
2397
  msgid "Compiled catalog for %{node}"
2358
2398
  msgstr ""
2359
2399
 
2360
2400
  #. TRANSLATORS Inlined refers to adding additional metadata
2361
- #: ../lib/puppet/indirector/catalog/compiler.rb:323
2401
+ #: ../lib/puppet/indirector/catalog/compiler.rb:341
2362
2402
  msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
2363
2403
  msgstr ""
2364
2404
 
2365
2405
  #. TRANSLATORS Inlined refers to adding additional metadata
2366
- #: ../lib/puppet/indirector/catalog/compiler.rb:325
2406
+ #: ../lib/puppet/indirector/catalog/compiler.rb:343
2367
2407
  msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
2368
2408
  msgstr ""
2369
2409
 
2370
2410
  #. TRANSLATORS Inlined refers to adding additional metadata
2371
- #: ../lib/puppet/indirector/catalog/compiler.rb:328
2411
+ #: ../lib/puppet/indirector/catalog/compiler.rb:346
2372
2412
  msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
2373
2413
  msgstr ""
2374
2414
 
2375
2415
  #. TRANSLATORS Inlined refers to adding additional metadata
2376
- #: ../lib/puppet/indirector/catalog/compiler.rb:330
2416
+ #: ../lib/puppet/indirector/catalog/compiler.rb:348
2377
2417
  msgid "Inlined resource metadata into static catalog for %{node}"
2378
2418
  msgstr ""
2379
2419
 
2380
- #: ../lib/puppet/indirector/catalog/compiler.rb:347
2420
+ #: ../lib/puppet/indirector/catalog/compiler.rb:365
2381
2421
  msgid "Found node information"
2382
2422
  msgstr ""
2383
2423
 
2384
- #: ../lib/puppet/indirector/catalog/compiler.rb:355
2424
+ #: ../lib/puppet/indirector/catalog/compiler.rb:373
2385
2425
  msgid "Failed when searching for node %{name}: %{detail}"
2386
2426
  msgstr ""
2387
2427
 
2388
- #: ../lib/puppet/indirector/catalog/compiler.rb:375
2428
+ #: ../lib/puppet/indirector/catalog/compiler.rb:393
2389
2429
  msgid "Invalid option use_node for a remote request"
2390
2430
  msgstr ""
2391
2431
 
2392
- #: ../lib/puppet/indirector/catalog/compiler.rb:394
2432
+ #: ../lib/puppet/indirector/catalog/compiler.rb:412
2393
2433
  msgid "Could not find node '%{name}'; cannot compile"
2394
2434
  msgstr ""
2395
2435
 
2396
- #: ../lib/puppet/indirector/catalog/compiler.rb:427
2436
+ #: ../lib/puppet/indirector/catalog/compiler.rb:445
2397
2437
  msgid "Could not retrieve fact servername"
2398
2438
  msgstr ""
2399
2439
 
2400
- #: ../lib/puppet/indirector/catalog/compiler.rb:436
2440
+ #: ../lib/puppet/indirector/catalog/compiler.rb:454
2401
2441
  msgid "Could not retrieve either serverip or serverip6 fact"
2402
2442
  msgstr ""
2403
2443
 
@@ -2409,7 +2449,7 @@ msgstr ""
2409
2449
  msgid "Unable to serialize catalog to json, retrying with pson"
2410
2450
  msgstr ""
2411
2451
 
2412
- #: ../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
2452
+ #: ../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
2413
2453
  msgid "Find %{uri} resulted in 404 with the message: %{body}"
2414
2454
  msgstr ""
2415
2455
 
@@ -2780,11 +2820,11 @@ msgstr ""
2780
2820
  msgid "Cannot create instances of abstract terminus types"
2781
2821
  msgstr ""
2782
2822
 
2783
- #: ../lib/puppet/indirector/terminus.rb:163
2823
+ #: ../lib/puppet/indirector/terminus.rb:167
2784
2824
  msgid "Instance name %{name} does not match requested key %{key}"
2785
2825
  msgstr ""
2786
2826
 
2787
- #: ../lib/puppet/indirector/terminus.rb:169
2827
+ #: ../lib/puppet/indirector/terminus.rb:173
2788
2828
  msgid "Invalid instance type %{klass}, expected %{model_type}"
2789
2829
  msgstr ""
2790
2830
 
@@ -2853,8 +2893,8 @@ msgstr ""
2853
2893
  msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
2854
2894
  msgstr ""
2855
2895
 
2856
- #. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
2857
2896
  #. TRANSLATORS 'Puppet.settings' should not be translated
2897
+ #. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
2858
2898
  #: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
2859
2899
  msgid "Global option %{option} does not exist in Puppet.settings"
2860
2900
  msgstr ""
@@ -3094,19 +3134,19 @@ msgstr ""
3094
3134
  msgid "Plan %{plan_name} not found in module %{module_name}."
3095
3135
  msgstr ""
3096
3136
 
3097
- #: ../lib/puppet/module/plan.rb:64
3137
+ #: ../lib/puppet/module/plan.rb:63
3098
3138
  msgid "Plan names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
3099
3139
  msgstr ""
3100
3140
 
3101
- #: ../lib/puppet/module/plan.rb:66
3141
+ #: ../lib/puppet/module/plan.rb:65
3102
3142
  msgid "Plan name cannot have extension %{ext}, must be .pp or .yaml"
3103
3143
  msgstr ""
3104
3144
 
3105
- #: ../lib/puppet/module/plan.rb:69
3145
+ #: ../lib/puppet/module/plan.rb:68
3106
3146
  msgid "Plan name cannot be a reserved word, but was '%{name}'"
3107
3147
  msgstr ""
3108
3148
 
3109
- #: ../lib/puppet/module/plan.rb:72
3149
+ #: ../lib/puppet/module/plan.rb:71
3110
3150
  msgid "Plan name cannot be a Puppet data type, but was '%{name}'"
3111
3151
  msgstr ""
3112
3152
 
@@ -3210,11 +3250,11 @@ msgstr ""
3210
3250
  msgid "Resolving dependencies ..."
3211
3251
  msgstr ""
3212
3252
 
3213
- #: ../lib/puppet/module_tool/applications/installer.rb:212
3253
+ #: ../lib/puppet/module_tool/applications/installer.rb:216
3214
3254
  msgid "Preparing to install ..."
3215
3255
  msgstr ""
3216
3256
 
3217
- #: ../lib/puppet/module_tool/applications/installer.rb:215
3257
+ #: ../lib/puppet/module_tool/applications/installer.rb:219
3218
3258
  msgid "Installing -- do not interrupt ..."
3219
3259
  msgstr ""
3220
3260
 
@@ -3884,7 +3924,7 @@ msgstr ""
3884
3924
  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."
3885
3925
  msgstr ""
3886
3926
 
3887
- #: ../lib/puppet/node/environment.rb:575 ../lib/puppet/pops/loaders.rb:301
3927
+ #: ../lib/puppet/node/environment.rb:574 ../lib/puppet/pops/loaders.rb:301
3888
3928
  msgid "Could not parse for environment %{env}: %{detail}"
3889
3929
  msgstr ""
3890
3930
 
@@ -6592,19 +6632,19 @@ msgstr ""
6592
6632
  msgid "Implicit version %{should} has %{n} possible matches"
6593
6633
  msgstr ""
6594
6634
 
6595
- #: ../lib/puppet/provider/package/pkg.rb:170
6635
+ #: ../lib/puppet/provider/package/pkg.rb:177
6596
6636
  msgid "Selecting version '%{version}' for implicit '%{should}'"
6597
6637
  msgstr ""
6598
6638
 
6599
- #: ../lib/puppet/provider/package/pkg.rb:175
6639
+ #: ../lib/puppet/provider/package/pkg.rb:182
6600
6640
  msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
6601
6641
  msgstr ""
6602
6642
 
6603
- #: ../lib/puppet/provider/package/pkg.rb:194
6643
+ #: ../lib/puppet/provider/package/pkg.rb:201
6604
6644
  msgid "pkg warning: %{warnings}"
6605
6645
  msgstr ""
6606
6646
 
6607
- #: ../lib/puppet/provider/package/pkg.rb:238 ../lib/puppet/provider/package/pkg.rb:264
6647
+ #: ../lib/puppet/provider/package/pkg.rb:245 ../lib/puppet/provider/package/pkg.rb:271
6608
6648
  msgid "Unable to update %{package}"
6609
6649
  msgstr ""
6610
6650
 
@@ -7968,72 +8008,72 @@ msgstr ""
7968
8008
  msgid "Could not set %{attribute} on %{class_name}: %{detail}"
7969
8009
  msgstr ""
7970
8010
 
7971
- #: ../lib/puppet/type/exec.rb:118
8011
+ #: ../lib/puppet/type/exec.rb:121
7972
8012
  msgid "executed successfully"
7973
8013
  msgstr ""
7974
8014
 
7975
- #: ../lib/puppet/type/exec.rb:152
8015
+ #: ../lib/puppet/type/exec.rb:155
7976
8016
  msgid "Command exceeded timeout"
7977
8017
  msgstr ""
7978
8018
 
7979
- #: ../lib/puppet/type/exec.rb:181
8019
+ #: ../lib/puppet/type/exec.rb:184
7980
8020
  msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
7981
8021
  msgstr ""
7982
8022
 
7983
- #: ../lib/puppet/type/exec.rb:183
8023
+ #: ../lib/puppet/type/exec.rb:186
7984
8024
  msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
7985
8025
  msgstr ""
7986
8026
 
7987
- #: ../lib/puppet/type/exec.rb:205
8027
+ #: ../lib/puppet/type/exec.rb:208
7988
8028
  msgid "Command must be a String or Array<String>, got value of class %{klass}"
7989
8029
  msgstr ""
7990
8030
 
7991
- #: ../lib/puppet/type/exec.rb:238
8031
+ #: ../lib/puppet/type/exec.rb:241
7992
8032
  msgid "Unable to execute commands as other users on Windows"
7993
8033
  msgstr ""
7994
8034
 
7995
- #: ../lib/puppet/type/exec.rb:240
8035
+ #: ../lib/puppet/type/exec.rb:243
7996
8036
  msgid "Only root can execute commands as other users"
7997
8037
  msgstr ""
7998
8038
 
7999
- #: ../lib/puppet/type/exec.rb:296
8039
+ #: ../lib/puppet/type/exec.rb:299
8000
8040
  msgid "Invalid environment setting '%{value}'"
8001
8041
  msgstr ""
8002
8042
 
8003
- #: ../lib/puppet/type/exec.rb:309
8043
+ #: ../lib/puppet/type/exec.rb:312
8004
8044
  msgid "The umask specification is invalid: %{value}"
8005
8045
  msgstr ""
8006
8046
 
8007
- #: ../lib/puppet/type/exec.rb:325
8047
+ #: ../lib/puppet/type/exec.rb:328
8008
8048
  msgid "The timeout must be a number."
8009
8049
  msgstr ""
8010
8050
 
8011
- #: ../lib/puppet/type/exec.rb:342
8051
+ #: ../lib/puppet/type/exec.rb:345
8012
8052
  msgid "Tries must be an integer"
8013
8053
  msgstr ""
8014
8054
 
8015
- #: ../lib/puppet/type/exec.rb:346
8055
+ #: ../lib/puppet/type/exec.rb:349
8016
8056
  msgid "Tries must be an integer >= 1"
8017
8057
  msgstr ""
8018
8058
 
8019
- #: ../lib/puppet/type/exec.rb:359
8059
+ #: ../lib/puppet/type/exec.rb:362
8020
8060
  msgid "try_sleep must be a number"
8021
8061
  msgstr ""
8022
8062
 
8023
- #: ../lib/puppet/type/exec.rb:363
8063
+ #: ../lib/puppet/type/exec.rb:366
8024
8064
  msgid "try_sleep cannot be a negative number"
8025
8065
  msgstr ""
8026
8066
 
8027
8067
  #. TRANSLATORS 'creates' is a parameter name and should not be translated
8028
- #: ../lib/puppet/type/exec.rb:435
8068
+ #: ../lib/puppet/type/exec.rb:438
8029
8069
  msgid "Checking that 'creates' path '%{creates_path}' exists"
8030
8070
  msgstr ""
8031
8071
 
8032
- #: ../lib/puppet/type/exec.rb:484 ../lib/puppet/type/exec.rb:544
8072
+ #: ../lib/puppet/type/exec.rb:490 ../lib/puppet/type/exec.rb:553
8033
8073
  msgid "Check %{value} exceeded timeout"
8034
8074
  msgstr ""
8035
8075
 
8036
- #: ../lib/puppet/type/exec.rb:636
8076
+ #: ../lib/puppet/type/exec.rb:645
8037
8077
  msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
8038
8078
  msgstr ""
8039
8079