foreman_discovery 7.0.1 → 8.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +2 -2
  3. data/app/controllers/discovered_hosts_controller.rb +2 -5
  4. data/app/models/host/discovered.rb +18 -10
  5. data/app/models/setting/discovered.rb +4 -2
  6. data/app/services/foreman_discovery/host_converter.rb +6 -1
  7. data/app/views/api/v2/discovered_hosts/main.json.rabl +4 -0
  8. data/app/views/discovered_hosts/_discovered_hosts_list.html.erb +3 -3
  9. data/app/views/discovery_rules/_form.html.erb +3 -5
  10. data/app/views/discovery_rules/index.html.erb +1 -1
  11. data/db/migrate/20160805104605_rename_lock_template_setting.rb +14 -0
  12. data/db/migrate/20160925213030_change_discovery_widget_names.rb +11 -0
  13. data/db/migrate/20160927164411_define_explicit_length_for_discovery_rule_attributes.rb +7 -0
  14. data/db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb +17 -0
  15. data/lib/foreman_discovery/engine.rb +10 -6
  16. data/lib/foreman_discovery/version.rb +1 -1
  17. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  18. data/locale/ca/foreman_discovery.edit.po +120 -163
  19. data/locale/ca/foreman_discovery.po +36 -12
  20. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  21. data/locale/de/foreman_discovery.edit.po +123 -163
  22. data/locale/de/foreman_discovery.po +38 -14
  23. data/locale/en/foreman_discovery.edit.po +73 -49
  24. data/locale/en/foreman_discovery.po +23 -5
  25. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  26. data/locale/en_GB/foreman_discovery.edit.po +130 -165
  27. data/locale/en_GB/foreman_discovery.po +39 -15
  28. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  29. data/locale/es/foreman_discovery.edit.po +120 -163
  30. data/locale/es/foreman_discovery.po +37 -13
  31. data/locale/foreman_discovery.pot +79 -50
  32. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  33. data/locale/fr/foreman_discovery.edit.po +128 -164
  34. data/locale/fr/foreman_discovery.po +39 -15
  35. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  36. data/locale/gl/foreman_discovery.edit.po +116 -163
  37. data/locale/gl/foreman_discovery.po +36 -12
  38. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  39. data/locale/it/foreman_discovery.edit.po +120 -163
  40. data/locale/it/foreman_discovery.po +37 -13
  41. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  42. data/locale/ja/foreman_discovery.edit.po +122 -163
  43. data/locale/ja/foreman_discovery.po +37 -13
  44. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  45. data/locale/ko/foreman_discovery.edit.po +120 -162
  46. data/locale/ko/foreman_discovery.po +37 -13
  47. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  48. data/locale/pt_BR/foreman_discovery.edit.po +120 -163
  49. data/locale/pt_BR/foreman_discovery.po +39 -15
  50. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  51. data/locale/ru/foreman_discovery.edit.po +123 -164
  52. data/locale/ru/foreman_discovery.po +37 -13
  53. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  54. data/locale/sv_SE/foreman_discovery.edit.po +116 -163
  55. data/locale/sv_SE/foreman_discovery.po +36 -12
  56. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  57. data/locale/zh_CN/foreman_discovery.edit.po +122 -163
  58. data/locale/zh_CN/foreman_discovery.po +37 -13
  59. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  60. data/locale/zh_TW/foreman_discovery.edit.po +122 -163
  61. data/locale/zh_TW/foreman_discovery.po +37 -13
  62. data/test/functional/api/v2/discovered_hosts_controller_test.rb +54 -27
  63. data/test/functional/api/v2/discovery_rules_controller_test.rb +1 -9
  64. data/test/functional/discovered_hosts_controller_test.rb +35 -17
  65. data/test/test_helper_discovery.rb +17 -0
  66. data/test/unit/discovered_extensions_test.rb +1 -9
  67. data/test/unit/discovery_rule_test.rb +51 -0
  68. data/test/unit/discovery_taxonomy_extensions_test.rb +1 -8
  69. data/test/unit/host_discovered_test.rb +16 -50
  70. metadata +7 -19
  71. data/app/models/concerns/discovery_subnet.rb +0 -7
  72. data/app/overrides/subnet_form_with_discovery_proxy.rb +0 -9
@@ -1,7 +1,7 @@
1
1
  # SOME DESCRIPTIVE TITLE.
2
2
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
3
  # This file is distributed under the same license as the foreman_discovery package.
4
- #
4
+ #
5
5
  # Translators:
6
6
  # Andi Chandler <andi@gowling.com>, 2015-2016
7
7
  # Dominic Cleal <dominic@cleal.org>, 2013-2015
@@ -12,10 +12,11 @@ msgid ""
12
12
  msgstr ""
13
13
  "Project-Id-Version: foreman_discovery 7.0.0\n"
14
14
  "Report-Msgid-Bugs-To: \n"
15
- "POT-Creation-Date: 2016-08-30 16:48+0200\n"
15
+ "POT-Creation-Date: 2017-01-06 08:26+0100\n"
16
16
  "PO-Revision-Date: 2016-08-31 08:17+0000\n"
17
17
  "Last-Translator: Lukáš Zapletal\n"
18
- "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/foreman/language/en_GB/)\n"
18
+ "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
19
+ "man/language/en_GB/)\n"
19
20
  "MIME-Version: 1.0\n"
20
21
  "Content-Type: text/plain; charset=UTF-8\n"
21
22
  "Content-Transfer-Encoding: 8bit\n"
@@ -26,23 +27,19 @@ msgstr ""
26
27
  msgid "List all discovered hosts"
27
28
  msgstr "List all discovered hosts"
28
29
 
29
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
30
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:15
30
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
31
31
  msgid "filter results"
32
32
  msgstr "filter results"
33
33
 
34
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
35
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:16
34
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
36
35
  msgid "sort results"
37
36
  msgstr "sort results"
38
37
 
39
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
40
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:17
38
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
41
39
  msgid "paginate results"
42
40
  msgstr "paginate results"
43
41
 
44
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
45
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:18
42
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
46
43
  msgid "number of entries per request"
47
44
  msgstr "number of entries per request"
48
45
 
@@ -67,14 +64,11 @@ msgid "not required if it's a virtual machine"
67
64
  msgstr "not required if it's a virtual machine"
68
65
 
69
66
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
70
- msgid ""
71
- "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
67
+ msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
72
68
  msgstr "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
73
69
 
74
70
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
75
- msgid ""
76
- "required if value is not inherited from host group or default password in "
77
- "settings"
71
+ msgid "required if value is not inherited from host group or default password in settings"
78
72
  msgstr "required if value is not inherited from host group or default password in settings"
79
73
 
80
74
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:86
@@ -86,18 +80,14 @@ msgid "Upload facts for a host, creating the host if required"
86
80
  msgstr "Upload facts for a host, creating the host if required"
87
81
 
88
82
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:94
89
- msgid ""
90
- "hash containing facts for the host with minimum set of facts: "
91
- "discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
92
- "eth0 (example in case primary interface is named eth0)"
83
+ msgid "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
93
84
  msgstr "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
94
85
 
95
86
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:111
96
87
  msgid "Execute rules against a discovered host"
97
88
  msgstr "Execute rules against a discovered host"
98
89
 
99
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
100
- #: ../app/controllers/discovered_hosts_controller.rb:165
90
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:117 ../app/controllers/discovered_hosts_controller.rb:162
101
91
  msgid "Host %{host} was provisioned with rule %{rule}"
102
92
  msgstr "Host %{host} was provisioned with rule %{rule}"
103
93
 
@@ -105,8 +95,7 @@ msgstr "Host %{host} was provisioned with rule %{rule}"
105
95
  msgid "Unable to provision %{host}: %{errors}"
106
96
  msgstr "Unable to provision %{host}: %{errors}"
107
97
 
108
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
109
- #: ../app/controllers/discovered_hosts_controller.rb:172
98
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:126 ../app/controllers/discovered_hosts_controller.rb:169
110
99
  msgid "No rule found for host %s"
111
100
  msgstr "No rule found for host %s"
112
101
 
@@ -114,13 +103,11 @@ msgstr "No rule found for host %s"
114
103
  msgid "Execute rules against all currently discovered hosts"
115
104
  msgstr "Execute rules against all currently discovered hosts"
116
105
 
117
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:137
118
- #: ../app/controllers/discovered_hosts_controller.rb:178
106
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:137 ../app/controllers/discovered_hosts_controller.rb:175
119
107
  msgid "Errors during auto provisioning: %s"
120
108
  msgstr "Errors during auto provisioning: %s"
121
109
 
122
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
123
- #: ../app/controllers/discovered_hosts_controller.rb:181
110
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:140 ../app/controllers/discovered_hosts_controller.rb:178
124
111
  msgid "No discovered hosts to provision"
125
112
  msgstr "No discovered hosts to provision"
126
113
 
@@ -140,8 +127,7 @@ msgstr "Rebooting a discovered host"
140
127
  msgid "Rebooting all discovered hosts"
141
128
  msgstr "Rebooting all discovered hosts"
142
129
 
143
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:202
144
- #: ../app/controllers/discovered_hosts_controller.rb:123
130
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:202 ../app/controllers/discovered_hosts_controller.rb:120
145
131
  msgid "Discovered hosts are rebooting now"
146
132
  msgstr "Discovered hosts are rebooting now"
147
133
 
@@ -166,8 +152,7 @@ msgid "the hostgroup that is used to auto provision a host"
166
152
  msgstr "the hostgroup that is used to auto provision a host"
167
153
 
168
154
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
169
- msgid ""
170
- "defines a pattern to assign human-readable hostnames to the matching hosts"
155
+ msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
171
156
  msgstr "defines a pattern to assign human-readable hostnames to the matching hosts"
172
157
 
173
158
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -175,8 +160,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
175
160
  msgstr "enables to limit maximum amount of provisioned hosts per rule"
176
161
 
177
162
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
178
- msgid ""
179
- "puts the rules in order, low numbers go first. Must be greater then zero"
163
+ msgid "puts the rules in order, low numbers go first. Must be greater then zero"
180
164
  msgstr "puts the rules in order, low numbers go first. Must be greater then zero"
181
165
 
182
166
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -215,95 +199,95 @@ msgstr "Errors during reboot: %s"
215
199
  msgid "No discovered hosts to reboot"
216
200
  msgstr "No discovered hosts to reboot"
217
201
 
218
- #: ../app/controllers/discovered_hosts_controller.rb:59
202
+ #: ../app/controllers/discovered_hosts_controller.rb:57
219
203
  msgid "Successfully provisioned %s"
220
204
  msgstr "Successfully provisioned %s"
221
205
 
222
- #: ../app/controllers/discovered_hosts_controller.rb:91
206
+ #: ../app/controllers/discovered_hosts_controller.rb:88
223
207
  msgid "Facts refreshed for %s"
224
208
  msgstr "Facts refreshed for %s"
225
209
 
226
- #: ../app/controllers/discovered_hosts_controller.rb:93
210
+ #: ../app/controllers/discovered_hosts_controller.rb:90
227
211
  msgid "Failed to refresh facts for %s"
228
212
  msgstr "Failed to refresh facts for %s"
229
213
 
230
- #: ../app/controllers/discovered_hosts_controller.rb:96
214
+ #: ../app/controllers/discovered_hosts_controller.rb:93
231
215
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
232
216
  msgstr "Failed to refresh facts for %{hostname} with error %{error_message}"
233
217
 
234
- #: ../app/controllers/discovered_hosts_controller.rb:103
218
+ #: ../app/controllers/discovered_hosts_controller.rb:100
235
219
  msgid "Host of type %s can not be rebooted"
236
220
  msgstr "Host of type %s can not be rebooted"
237
221
 
238
- #: ../app/controllers/discovered_hosts_controller.rb:107
222
+ #: ../app/controllers/discovered_hosts_controller.rb:104
239
223
  msgid "Rebooting host %s"
240
224
  msgstr "Rebooting host %s"
241
225
 
242
- #: ../app/controllers/discovered_hosts_controller.rb:109
226
+ #: ../app/controllers/discovered_hosts_controller.rb:106
243
227
  msgid "Failed to reboot host %s"
244
228
  msgstr "Failed to reboot host %s"
245
229
 
246
- #: ../app/controllers/discovered_hosts_controller.rb:112
230
+ #: ../app/controllers/discovered_hosts_controller.rb:109
247
231
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
248
232
  msgstr "Failed to reboot host %{hostname} with error %{error_message}"
249
233
 
250
- #: ../app/controllers/discovered_hosts_controller.rb:126
234
+ #: ../app/controllers/discovered_hosts_controller.rb:123
251
235
  msgid "Failed to reboot hosts with error %s"
252
236
  msgstr "Failed to reboot hosts with error %s"
253
237
 
254
- #: ../app/controllers/discovered_hosts_controller.rb:140
238
+ #: ../app/controllers/discovered_hosts_controller.rb:137
255
239
  msgid "Destroyed selected hosts"
256
240
  msgstr "Destroyed selected hosts"
257
241
 
258
- #: ../app/controllers/discovered_hosts_controller.rb:142
242
+ #: ../app/controllers/discovered_hosts_controller.rb:139
259
243
  msgid "The following hosts were not deleted: %s"
260
244
  msgstr "The following hosts were not deleted: %s"
261
245
 
262
- #: ../app/controllers/discovered_hosts_controller.rb:169
246
+ #: ../app/controllers/discovered_hosts_controller.rb:166
263
247
  msgid "Failed to auto provision host %s: %s"
264
248
  msgstr "Failed to auto provision host %s: %s"
265
249
 
266
- #: ../app/controllers/discovered_hosts_controller.rb:197
250
+ #: ../app/controllers/discovered_hosts_controller.rb:194
267
251
  msgid "Discovered hosts are provisioning now"
268
252
  msgstr "Discovered hosts are provisioning now"
269
253
 
270
- #: ../app/controllers/discovered_hosts_controller.rb:226
254
+ #: ../app/controllers/discovered_hosts_controller.rb:223
271
255
  msgid "Highlights"
272
256
  msgstr "Highlights"
273
257
 
274
- #: ../app/controllers/discovered_hosts_controller.rb:226
258
+ #: ../app/controllers/discovered_hosts_controller.rb:223
275
259
  msgid "Storage"
276
260
  msgstr "Storage"
277
261
 
278
- #: ../app/controllers/discovered_hosts_controller.rb:226
262
+ #: ../app/controllers/discovered_hosts_controller.rb:223
279
263
  msgid "Hardware"
280
264
  msgstr "Hardware"
281
265
 
282
- #: ../app/controllers/discovered_hosts_controller.rb:226
266
+ #: ../app/controllers/discovered_hosts_controller.rb:223
283
267
  msgid "Network"
284
268
  msgstr "Network"
285
269
 
286
- #: ../app/controllers/discovered_hosts_controller.rb:226
270
+ #: ../app/controllers/discovered_hosts_controller.rb:223
287
271
  msgid "Software"
288
272
  msgstr "Software"
289
273
 
290
- #: ../app/controllers/discovered_hosts_controller.rb:226
274
+ #: ../app/controllers/discovered_hosts_controller.rb:223
291
275
  msgid "IPMI"
292
276
  msgstr "IPMI"
293
277
 
294
- #: ../app/controllers/discovered_hosts_controller.rb:226
278
+ #: ../app/controllers/discovered_hosts_controller.rb:223
295
279
  msgid "Miscellaneous"
296
280
  msgstr "Miscellaneous"
297
281
 
298
- #: ../app/controllers/discovered_hosts_controller.rb:303
282
+ #: ../app/controllers/discovered_hosts_controller.rb:300
299
283
  msgid "No hosts were found with that id or name"
300
284
  msgstr "No hosts were found with that id or name"
301
285
 
302
- #: ../app/controllers/discovered_hosts_controller.rb:307
286
+ #: ../app/controllers/discovered_hosts_controller.rb:304
303
287
  msgid "No hosts selected"
304
288
  msgstr "No hosts selected"
305
289
 
306
- #: ../app/controllers/discovered_hosts_controller.rb:313
290
+ #: ../app/controllers/discovered_hosts_controller.rb:310
307
291
  msgid "Something went wrong while selecting hosts - %s"
308
292
  msgstr "Something went wrong while selecting hosts - %s"
309
293
 
@@ -319,19 +303,15 @@ msgstr "Rule disabled"
319
303
  msgid "%s ago"
320
304
  msgstr "%s ago"
321
305
 
322
- #: ../app/helpers/discovered_hosts_helper.rb:14
323
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
306
+ #: ../app/helpers/discovered_hosts_helper.rb:14 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
324
307
  msgid "Auto Provision"
325
308
  msgstr "Auto Provision"
326
309
 
327
- #: ../app/helpers/discovered_hosts_helper.rb:15
328
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
310
+ #: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
329
311
  msgid "Refresh facts"
330
312
  msgstr "Refresh facts"
331
313
 
332
- #: ../app/helpers/discovered_hosts_helper.rb:16
333
- #: ../app/models/setting/discovered.rb:23
334
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
314
+ #: ../app/helpers/discovered_hosts_helper.rb:16 ../app/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
335
315
  msgid "Reboot"
336
316
  msgstr "Reboot"
337
317
 
@@ -339,8 +319,7 @@ msgstr "Reboot"
339
319
  msgid "Back"
340
320
  msgstr "Back"
341
321
 
342
- #: ../app/helpers/discovered_hosts_helper.rb:21
343
- #: ../app/helpers/discovered_hosts_helper.rb:38
322
+ #: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:38
344
323
  msgid "Select Action"
345
324
  msgstr "Select Action"
346
325
 
@@ -348,8 +327,7 @@ msgstr "Select Action"
348
327
  msgid "Expand All"
349
328
  msgstr "Expand All"
350
329
 
351
- #: ../app/helpers/discovered_hosts_helper.rb:28
352
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
330
+ #: ../app/helpers/discovered_hosts_helper.rb:28 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
353
331
  msgid "Delete %s?"
354
332
  msgstr "Delete %s?"
355
333
 
@@ -389,7 +367,7 @@ msgstr "Reported in the last 7 days"
389
367
  msgid "Provision"
390
368
  msgstr "Provision"
391
369
 
392
- #: ../app/helpers/discovery_rules_helper.rb:26
370
+ #: ../app/helpers/discovery_rules_helper.rb:26 ../lib/foreman_discovery/engine.rb:163
393
371
  msgid "Discovered Hosts"
394
372
  msgstr "Discovered Hosts"
395
373
 
@@ -434,57 +412,50 @@ msgid "must start with a letter or ERB."
434
412
  msgstr "must start with a letter or ERB."
435
413
 
436
414
  #: ../app/models/discovery_rule.rb:45
437
- msgid ""
438
- "Host group organization %s must also be associated to the discovery rule"
439
- msgid_plural ""
440
- "Host group organizations %s must also be associated to the discovery rule"
415
+ msgid "Host group organization %s must also be associated to the discovery rule"
416
+ msgid_plural "Host group organizations %s must also be associated to the discovery rule"
441
417
  msgstr[0] "Host group organisation %s must also be associated to the discovery rule"
442
418
  msgstr[1] "Host group organisations %s must also be associated to the discovery rule"
443
419
 
444
420
  #: ../app/models/discovery_rule.rb:51
445
421
  msgid "Host group location %s must also be associated to the discovery rule"
446
- msgid_plural ""
447
- "Host group locations %s must also be associated to the discovery rule"
422
+ msgid_plural "Host group locations %s must also be associated to the discovery rule"
448
423
  msgstr[0] "Host group location %s must also be associated to the discovery rule"
449
424
  msgstr[1] "Host group locations %s must also be associated to the discovery rule"
450
425
 
451
- #: ../app/models/host/discovered.rb:33
426
+ #: ../app/models/host/discovered.rb:38
452
427
  msgid "Invalid facts, must be a Hash"
453
428
  msgstr "Invalid facts, must be a Hash"
454
429
 
455
- #: ../app/models/host/discovered.rb:38
456
- msgid ""
457
- "Expected discovery_fact '%s' is missing, unable to detect primary interface "
458
- "and set hostname"
430
+ #: ../app/models/host/discovered.rb:43
431
+ msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
459
432
  msgstr "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
460
433
 
461
- #: ../app/models/host/discovered.rb:45
462
- msgid ""
463
- "Invalid facts: hash does not contain a valid value for any of the facts in "
464
- "the discovery_hostname setting: %s"
434
+ #: ../app/models/host/discovered.rb:50
435
+ msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
465
436
  msgstr "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
466
437
 
467
- #: ../app/models/host/discovered.rb:62
438
+ #: ../app/models/host/discovered.rb:67
468
439
  msgid "Facts could not be imported"
469
440
  msgstr "Facts could not be imported"
470
441
 
471
- #: ../app/models/host/discovered.rb:112
442
+ #: ../app/models/host/discovered.rb:117
472
443
  msgid "Unable to assign subnet, primary interface is missing IP address"
473
444
  msgstr "Unable to assign subnet, primary interface is missing IP address"
474
445
 
475
- #: ../app/models/host/discovered.rb:166
446
+ #: ../app/models/host/discovered.rb:174
476
447
  msgid "Could not get facts from proxy %{url}: %{error}"
477
448
  msgstr "Could not get facts from proxy %{url}: %{error}"
478
449
 
479
- #: ../app/models/host/discovered.rb:182
450
+ #: ../app/models/host/discovered.rb:190
480
451
  msgid "Unable to reboot %{name} via %{url}: %{msg}"
481
452
  msgstr "Unable to reboot %{name} via %{url}: %{msg}"
482
453
 
483
- #: ../app/models/host/discovered.rb:190
454
+ #: ../app/models/host/discovered.rb:198
484
455
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
485
456
  msgstr "Unable to perform kexec on %{name} via %{url}: %{msg}"
486
457
 
487
- #: ../app/models/host/discovered.rb:209
458
+ #: ../app/models/host/discovered.rb:217
488
459
  msgid "Invalid hostname: Could not normalize the hostname"
489
460
  msgstr "Invalid hostname: Could not normalise the hostname"
490
461
 
@@ -529,9 +500,7 @@ msgid "Hostname facts"
529
500
  msgstr "Hostname facts"
530
501
 
531
502
  #: ../app/models/setting/discovered.rb:22
532
- msgid ""
533
- "Automatically provision newly discovered hosts, according to the "
534
- "provisioning rules"
503
+ msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
535
504
  msgstr "Automatically provision newly discovered hosts, according to the provisioning rules"
536
505
 
537
506
  #: ../app/models/setting/discovered.rb:22
@@ -607,9 +576,7 @@ msgid "IPMI facts"
607
576
  msgstr "IPMI facts"
608
577
 
609
578
  #: ../app/models/setting/discovered.rb:32
610
- msgid ""
611
- "Automatically generate PXE configuration to pin a newly discovered host to "
612
- "discovery"
579
+ msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
613
580
  msgstr "Automatically generate PXE configuration to pin a newly discovered host to discovery"
614
581
 
615
582
  #: ../app/models/setting/discovered.rb:32
@@ -617,41 +584,55 @@ msgid "Lock PXE"
617
584
  msgstr "Lock PXE"
618
585
 
619
586
  #: ../app/models/setting/discovered.rb:33
620
- msgid "PXE template to be used when pinning a host to discovery"
621
- msgstr "PXE template to be used when pinning a host to discovery"
587
+ msgid "PXELinux template to be used when pinning a host to discovery"
588
+ msgstr ""
622
589
 
623
590
  #: ../app/models/setting/discovered.rb:33
624
- msgid "Locked template name"
625
- msgstr "Locked template name"
591
+ msgid "Locked PXELinux template name"
592
+ msgstr ""
626
593
 
627
594
  #: ../app/models/setting/discovered.rb:34
628
- msgid "Force DNS entries creation when provisioning discovered host"
595
+ msgid "PXEGrub template to be used when pinning a host to discovery"
629
596
  msgstr ""
630
597
 
631
598
  #: ../app/models/setting/discovered.rb:34
599
+ msgid "Locked PXEGrub template name"
600
+ msgstr ""
601
+
602
+ #: ../app/models/setting/discovered.rb:35
603
+ msgid "PXEGrub2 template to be used when pinning a host to discovery"
604
+ msgstr ""
605
+
606
+ #: ../app/models/setting/discovered.rb:35
607
+ msgid "Locked PXEGrub2 template name"
608
+ msgstr ""
609
+
610
+ #: ../app/models/setting/discovered.rb:36
611
+ msgid "Force DNS entries creation when provisioning discovered host"
612
+ msgstr ""
613
+
614
+ #: ../app/models/setting/discovered.rb:36
632
615
  msgid "Force DNS"
633
616
  msgstr ""
634
617
 
635
- #: ../app/models/setting/discovered.rb:41
618
+ #: ../app/models/setting/discovered.rb:43
636
619
  msgid "The default location to place discovered hosts in"
637
620
  msgstr "The default location to place discovered hosts in"
638
621
 
639
- #: ../app/models/setting/discovered.rb:41
622
+ #: ../app/models/setting/discovered.rb:43
640
623
  msgid "Discovery location"
641
624
  msgstr "Discovery location"
642
625
 
643
- #: ../app/models/setting/discovered.rb:49
626
+ #: ../app/models/setting/discovered.rb:51
644
627
  msgid "The default organization to place discovered hosts in"
645
628
  msgstr "The default organisation to place discovered hosts in"
646
629
 
647
- #: ../app/models/setting/discovered.rb:49
630
+ #: ../app/models/setting/discovered.rb:51
648
631
  msgid "Discovery organization"
649
632
  msgstr "Discovery organisation"
650
633
 
651
634
  #: ../app/services/foreman_discovery/fact_parser.rb:9
652
- msgid ""
653
- "Unable to detect primary interface using MAC '%{mac}' specified by "
654
- "discovery_fact '%{fact}'"
635
+ msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
655
636
  msgstr "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
656
637
 
657
638
  #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
@@ -670,25 +651,15 @@ msgstr "No discovered hosts available"
670
651
  msgid "Host"
671
652
  msgstr "Host"
672
653
 
673
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
674
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
675
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
676
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:18
677
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:10
654
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
678
655
  msgid "Model"
679
656
  msgstr "Model"
680
657
 
681
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
682
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
683
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:20
684
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:12
658
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
685
659
  msgid "CPUs"
686
660
  msgstr "CPUs"
687
661
 
688
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
689
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
690
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:21
691
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:13
662
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
692
663
  msgid "Memory"
693
664
  msgstr "Memory"
694
665
 
@@ -704,8 +675,7 @@ msgstr "Quick create"
704
675
  msgid "Create host"
705
676
  msgstr "Create host"
706
677
 
707
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
708
- #: ../lib/foreman_discovery/engine.rb:147
678
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2 ../lib/foreman_discovery/engine.rb:148
709
679
  msgid "Discovered hosts"
710
680
  msgstr "Discovered hosts"
711
681
 
@@ -717,38 +687,27 @@ msgstr "Select all items in this page"
717
687
  msgid "items selected. Uncheck to Clear"
718
688
  msgstr "items selected. Uncheck to Clear"
719
689
 
720
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
721
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
722
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:17
723
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:9
690
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
724
691
  msgid "Name"
725
692
  msgstr "Name"
726
693
 
727
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
728
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:19
729
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:11
694
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
730
695
  msgid "IP Address"
731
696
  msgstr "IP Address"
732
697
 
733
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
734
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:22
735
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:14
698
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11 ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
736
699
  msgid "Disk count"
737
700
  msgstr "Disk count"
738
701
 
739
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
740
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:23
741
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:15
702
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12 ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
742
703
  msgid "Disks size"
743
704
  msgstr "Disks size"
744
705
 
745
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
746
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
706
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
747
707
  msgid "Location"
748
708
  msgstr "Location"
749
709
 
750
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
751
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
710
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovered_hosts/_selected_hosts.html.erb:13
752
711
  msgid "Organization"
753
712
  msgstr "Organisation"
754
713
 
@@ -785,9 +744,7 @@ msgid "Warning"
785
744
  msgstr "Warning"
786
745
 
787
746
  #: ../app/views/discovered_hosts/multiple_destroy.html.erb:5
788
- msgid ""
789
- "This might take a while, as all hosts, facts and reports will be destroyed "
790
- "as well"
747
+ msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
791
748
  msgstr "This might take a while, as all hosts, facts and reports will be destroyed as well"
792
749
 
793
750
  #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -830,13 +787,11 @@ msgstr "Summary report for discovered hosts from Foreman"
830
787
  msgid "<b>Foreman</b> Discovered hosts summary"
831
788
  msgstr "<b>Foreman</b> Discovered hosts summary"
832
789
 
833
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:10
834
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:5
790
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:10 ../app/views/discovered_mailer/discovered_summary.text.erb:5
835
791
  msgid "Summary from %{time} ago to %{now}"
836
792
  msgstr "Summary from %{time} ago to %{now}"
837
793
 
838
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:11
839
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:3
794
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:11 ../app/views/discovered_mailer/discovered_summary.text.erb:3
840
795
  msgid "Discovered hosts from Foreman server at %{foreman_url}"
841
796
  msgstr "Discovered hosts from Foreman server at %{foreman_url}"
842
797
 
@@ -889,33 +844,23 @@ msgid "Rule priority (lower integer means higher priority)"
889
844
  msgstr "Rule priority (lower integer means higher priority)"
890
845
 
891
846
  #: ../app/views/discovery_rules/_template_inline.erb:2
892
- msgid ""
893
- "Specify target hostname template pattern in the same syntax as in "
894
- "Provisioning Templates (ERB)."
847
+ msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
895
848
  msgstr "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
896
849
 
897
850
  #: ../app/views/discovery_rules/_template_inline.erb:4
898
- msgid ""
899
- "Domain will be appended automatically. A hostname based on MAC address will "
900
- "be used when left blank."
851
+ msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
901
852
  msgstr "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
902
853
 
903
854
  #: ../app/views/discovery_rules/_template_inline.erb:5
904
- msgid ""
905
- "In addition to @host attribute function rand for random integers is "
906
- "available. Examples:"
855
+ msgid "In addition to @host attribute function rand for random integers is available. Examples:"
907
856
  msgstr "In addition to @host attribute function rand for random integers is available. Examples:"
908
857
 
909
858
  #: ../app/views/discovery_rules/_template_inline.erb:8
910
- msgid ""
911
- "When creating hostname patterns, make sure the resulting host names are "
912
- "unique."
859
+ msgid "When creating hostname patterns, make sure the resulting host names are unique."
913
860
  msgstr "When creating hostname patterns, make sure the resulting host names are unique."
914
861
 
915
862
  #: ../app/views/discovery_rules/_template_inline.erb:9
916
- msgid ""
917
- "Hostnames must not start with numbers. A good approach is to use unique "
918
- "information provided by facter (MAC address, BIOS or serial ID)."
863
+ msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
919
864
  msgstr "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
920
865
 
921
866
  #: ../app/views/discovery_rules/edit.html.erb:1
@@ -962,10 +907,30 @@ msgstr "New Discovery Rule"
962
907
  msgid "A summary of discovered hosts"
963
908
  msgstr "A summary of discovered hosts"
964
909
 
965
- #: ../lib/foreman_discovery/engine.rb:152
910
+ #: ../lib/foreman_discovery/engine.rb:153
966
911
  msgid "Discovery rules"
967
912
  msgstr "Discovery rules"
968
913
 
914
+ #: ../lib/foreman_discovery/engine.rb:176
915
+ msgid "Discovery Proxy"
916
+ msgstr ""
917
+
918
+ #: ../lib/foreman_discovery/engine.rb:177
919
+ msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
920
+ msgstr ""
921
+
922
+ #: ../lib/foreman_discovery/engine.rb:178
923
+ msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
924
+ msgstr ""
925
+
926
+ #: ../app/models/setting/discovered.rb:33
927
+ #~ msgid "PXE template to be used when pinning a host to discovery"
928
+ #~ msgstr "PXE template to be used when pinning a host to discovery"
929
+
930
+ #: ../app/models/setting/discovered.rb:33
931
+ #~ msgid "Locked template name"
932
+ #~ msgstr "Locked template name"
933
+
969
934
  #: ../lib/foreman_discovery/engine.rb:162
970
- msgid "Discovery widget"
971
- msgstr "Discovery widget"
935
+ #~ msgid "Discovery widget"
936
+ #~ msgstr "Discovery widget"