foreman_discovery 15.1.0 → 16.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/foreman/controller/discovered_extensions.rb +4 -0
  3. data/app/controllers/discovered_hosts_controller.rb +1 -0
  4. data/app/models/setting/discovered.rb +26 -33
  5. data/app/services/foreman_discovery/fact_parser.rb +1 -1
  6. data/app/services/foreman_discovery/host_converter.rb +29 -1
  7. data/app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb +6 -14
  8. data/app/services/foreman_discovery/subnet_suggestion.rb +26 -0
  9. data/app/views/discovered_hosts/_discovered_host_modal.html.erb +2 -0
  10. data/config/routes.rb +2 -0
  11. data/extra/discover-host +21 -7
  12. data/lib/foreman_discovery/engine.rb +2 -2
  13. data/lib/foreman_discovery/version.rb +1 -1
  14. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  15. data/locale/ca/foreman_discovery.edit.po +111 -91
  16. data/locale/ca/foreman_discovery.po +17 -2
  17. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  18. data/locale/de/foreman_discovery.edit.po +113 -93
  19. data/locale/de/foreman_discovery.po +19 -4
  20. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  21. data/locale/en/foreman_discovery.edit.po +98 -78
  22. data/locale/en/foreman_discovery.po +16 -1
  23. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  24. data/locale/en_GB/foreman_discovery.edit.po +113 -93
  25. data/locale/en_GB/foreman_discovery.po +19 -4
  26. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  27. data/locale/es/foreman_discovery.edit.po +112 -92
  28. data/locale/es/foreman_discovery.po +18 -3
  29. data/locale/foreman_discovery.pot +99 -79
  30. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  31. data/locale/fr/foreman_discovery.edit.po +112 -92
  32. data/locale/fr/foreman_discovery.po +18 -3
  33. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  34. data/locale/gl/foreman_discovery.edit.po +111 -91
  35. data/locale/gl/foreman_discovery.po +17 -2
  36. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  37. data/locale/it/foreman_discovery.edit.po +112 -92
  38. data/locale/it/foreman_discovery.po +18 -3
  39. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  40. data/locale/ja/foreman_discovery.edit.po +113 -93
  41. data/locale/ja/foreman_discovery.po +19 -4
  42. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  43. data/locale/ko/foreman_discovery.edit.po +112 -92
  44. data/locale/ko/foreman_discovery.po +18 -3
  45. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  46. data/locale/pt_BR/foreman_discovery.edit.po +113 -93
  47. data/locale/pt_BR/foreman_discovery.po +19 -4
  48. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  49. data/locale/ru/foreman_discovery.edit.po +113 -93
  50. data/locale/ru/foreman_discovery.po +19 -4
  51. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  52. data/locale/sv_SE/foreman_discovery.edit.po +112 -92
  53. data/locale/sv_SE/foreman_discovery.po +18 -3
  54. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  55. data/locale/zh_CN/foreman_discovery.edit.po +112 -92
  56. data/locale/zh_CN/foreman_discovery.po +18 -3
  57. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  58. data/locale/zh_TW/foreman_discovery.edit.po +112 -92
  59. data/locale/zh_TW/foreman_discovery.po +18 -3
  60. data/test/facts/bond0-eth0-eth1-active-passive.json +128 -0
  61. data/test/facts/facts_with_lldp_bond_candidate.json +2 -9
  62. data/test/functional/api/v2/discovered_hosts_controller_test.rb +1 -0
  63. data/test/integration/discovered_hosts_test.rb +1 -0
  64. data/test/test_helper_discovery.rb +12 -0
  65. data/test/unit/discovered_extensions_test.rb +49 -0
  66. data/test/unit/discovery_attribute_set_test.rb +1 -0
  67. data/test/unit/discovery_rule_test.rb +1 -0
  68. data/test/unit/host_discovered_test.rb +32 -13
  69. data/test/unit/managed_extensions_test.rb +1 -0
  70. metadata +5 -2
@@ -3,14 +3,14 @@
3
3
  # This file is distributed under the same license as the foreman_discovery package.
4
4
  #
5
5
  # Translators:
6
- # Dominic Cleal <dominic@cleal.org>, 2014
6
+ # 0868a4d1af5275b3f70b0a6dac4c99a4, 2014
7
7
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
8
8
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_discovery 15.0.0\n"
11
+ "Project-Id-Version: foreman_discovery 15.1.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
- "PO-Revision-Date: 2019-04-18 19:36+0000\n"
13
+ "PO-Revision-Date: 2019-10-22 20:43+0000\n"
14
14
  "Last-Translator: Lukáš Zapletal\n"
15
15
  "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
16
16
  "uage/sv_SE/)\n"
@@ -35,6 +35,9 @@ msgstr ""
35
35
  msgid "A summary of discovered hosts"
36
36
  msgstr ""
37
37
 
38
+ msgid "Action with sub plans"
39
+ msgstr ""
40
+
38
41
  msgid "Actions"
39
42
  msgstr "Åtgärder"
40
43
 
@@ -348,6 +351,9 @@ msgstr "IPadress"
348
351
  msgid "IP address"
349
352
  msgstr ""
350
353
 
354
+ msgid "IPAM must be configured for subnet '%s'"
355
+ msgstr ""
356
+
351
357
  msgid "IPMI"
352
358
  msgstr ""
353
359
 
@@ -363,6 +369,12 @@ msgstr ""
363
369
  msgid "Image API returned HTTP/%{code} with '%{body}"
364
370
  msgstr ""
365
371
 
372
+ msgid "Import Puppet classes"
373
+ msgstr ""
374
+
375
+ msgid "Import facts"
376
+ msgstr ""
377
+
366
378
  msgid "In addition to @host attribute function rand for random integers is available. Examples:"
367
379
  msgstr ""
368
380
 
@@ -579,6 +591,9 @@ msgstr ""
579
591
  msgid "Reloading kernel on %s"
580
592
  msgstr ""
581
593
 
594
+ msgid "Remote action:"
595
+ msgstr ""
596
+
582
597
  msgid "Reported in the last 7 days"
583
598
  msgstr ""
584
599
 
@@ -5,11 +5,11 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_discovery 15.0.0\n"
8
+ "Project-Id-Version: foreman_discovery 15.1.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2019-05-13 15:39+0200\n"
11
- "PO-Revision-Date: 2019-04-18 19:36+0000\n"
12
- "Last-Translator: Lukáš Zapletal\n"
10
+ "POT-Creation-Date: 2019-10-22 11:55+0200\n"
11
+ "PO-Revision-Date: 2019-10-22 20:43+0000\n"
12
+ "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
13
13
  "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
14
14
  "MIME-Version: 1.0\n"
15
15
  "Content-Type: text/plain; charset=UTF-8\n"
@@ -97,7 +97,7 @@ msgid "Execute rules against a discovered host"
97
97
  msgstr "对发现主机执行规则"
98
98
 
99
99
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
100
- #: ../app/controllers/discovered_hosts_controller.rb:159
100
+ #: ../app/controllers/discovered_hosts_controller.rb:160
101
101
  msgid "Host %{host} was provisioned with rule %{rule}"
102
102
  msgstr "主机 %{host} 置备了规则 %{rule}"
103
103
 
@@ -106,7 +106,7 @@ msgid "Unable to provision %{host}: %{errors}"
106
106
  msgstr "无法置备 %{host}:%{errors}"
107
107
 
108
108
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
109
- #: ../app/controllers/discovered_hosts_controller.rb:166
109
+ #: ../app/controllers/discovered_hosts_controller.rb:167
110
110
  msgid "No rule found for host %s"
111
111
  msgstr "没有为主机 %s 找到规则"
112
112
 
@@ -115,12 +115,12 @@ msgid "Execute rules against all currently discovered hosts"
115
115
  msgstr "对当前所有发现主机执行规则"
116
116
 
117
117
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:142
118
- #: ../app/controllers/discovered_hosts_controller.rb:172
118
+ #: ../app/controllers/discovered_hosts_controller.rb:173
119
119
  msgid "Errors during auto provisioning: %s"
120
120
  msgstr "自动置备期间出错:%s"
121
121
 
122
122
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
123
- #: ../app/controllers/discovered_hosts_controller.rb:175
123
+ #: ../app/controllers/discovered_hosts_controller.rb:176
124
124
  msgid "No discovered hosts to provision"
125
125
  msgstr "没有要置备的发现主机"
126
126
 
@@ -141,7 +141,7 @@ msgid "Rebooting all discovered hosts"
141
141
  msgstr "重启所有发现主机"
142
142
 
143
143
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:207
144
- #: ../app/controllers/discovered_hosts_controller.rb:128
144
+ #: ../app/controllers/discovered_hosts_controller.rb:129
145
145
  msgid "Discovered hosts are rebooting now"
146
146
  msgstr "现在正在重启发现主机"
147
147
 
@@ -215,11 +215,11 @@ msgstr "无法找到发现规则,未提供主机(检查许可)"
215
215
  msgid "No hostgroup associated with rule '%s'"
216
216
  msgstr "没有主机组与规则 '%s' 关联"
217
217
 
218
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:69
218
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
219
219
  msgid "Errors during reboot: %s"
220
220
  msgstr "重启期间出错:%s"
221
221
 
222
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:87
222
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
223
223
  msgid "No discovered hosts to reboot"
224
224
  msgstr "没有要重启的发现主机"
225
225
 
@@ -227,91 +227,91 @@ msgstr "没有要重启的发现主机"
227
227
  msgid "Successfully provisioned %s"
228
228
  msgstr "已成功置备 %s"
229
229
 
230
- #: ../app/controllers/discovered_hosts_controller.rb:96
230
+ #: ../app/controllers/discovered_hosts_controller.rb:97
231
231
  msgid "Facts refreshed for %s"
232
232
  msgstr "为 %s 刷新详情"
233
233
 
234
- #: ../app/controllers/discovered_hosts_controller.rb:98
234
+ #: ../app/controllers/discovered_hosts_controller.rb:99
235
235
  msgid "Failed to refresh facts for %s"
236
236
  msgstr "为 %s 刷新详情失败"
237
237
 
238
- #: ../app/controllers/discovered_hosts_controller.rb:101
238
+ #: ../app/controllers/discovered_hosts_controller.rb:102
239
239
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
240
240
  msgstr "为 %{hostname} 刷新详情失败,发生错误 %{error_message} "
241
241
 
242
- #: ../app/controllers/discovered_hosts_controller.rb:108
242
+ #: ../app/controllers/discovered_hosts_controller.rb:109
243
243
  msgid "Host of type %s can not be rebooted"
244
244
  msgstr "%s 类型的主机不能重启"
245
245
 
246
- #: ../app/controllers/discovered_hosts_controller.rb:112
246
+ #: ../app/controllers/discovered_hosts_controller.rb:113
247
247
  msgid "Rebooting host %s"
248
248
  msgstr "正在重启主机 %s"
249
249
 
250
- #: ../app/controllers/discovered_hosts_controller.rb:114
250
+ #: ../app/controllers/discovered_hosts_controller.rb:115
251
251
  msgid "Failed to reboot host %s"
252
252
  msgstr "无法重启主机 %s"
253
253
 
254
- #: ../app/controllers/discovered_hosts_controller.rb:117
254
+ #: ../app/controllers/discovered_hosts_controller.rb:118
255
255
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
256
256
  msgstr "无法重启主机 %{hostname},发生错误 %{error_message}"
257
257
 
258
- #: ../app/controllers/discovered_hosts_controller.rb:131
258
+ #: ../app/controllers/discovered_hosts_controller.rb:132
259
259
  msgid "Failed to reboot hosts with error %s"
260
260
  msgstr "无法重启主机,发生错误 %s"
261
261
 
262
- #: ../app/controllers/discovered_hosts_controller.rb:149
262
+ #: ../app/controllers/discovered_hosts_controller.rb:150
263
263
  msgid "Destroyed selected hosts"
264
264
  msgstr "消除所选主机"
265
265
 
266
- #: ../app/controllers/discovered_hosts_controller.rb:151
266
+ #: ../app/controllers/discovered_hosts_controller.rb:152
267
267
  msgid "The following hosts were not deleted: %s"
268
268
  msgstr "未删除以下主机:%s"
269
269
 
270
- #: ../app/controllers/discovered_hosts_controller.rb:163
270
+ #: ../app/controllers/discovered_hosts_controller.rb:164
271
271
  msgid "Failed to auto provision host %s: %s"
272
272
  msgstr "无法自动置备主机 %s:%s"
273
273
 
274
- #: ../app/controllers/discovered_hosts_controller.rb:191
274
+ #: ../app/controllers/discovered_hosts_controller.rb:192
275
275
  msgid "Discovered hosts are provisioning now"
276
276
  msgstr "现在发现主机正在置备"
277
277
 
278
- #: ../app/controllers/discovered_hosts_controller.rb:223
278
+ #: ../app/controllers/discovered_hosts_controller.rb:224
279
279
  msgid "Highlights"
280
280
  msgstr "亮点"
281
281
 
282
- #: ../app/controllers/discovered_hosts_controller.rb:223
282
+ #: ../app/controllers/discovered_hosts_controller.rb:224
283
283
  msgid "Storage"
284
284
  msgstr "存储"
285
285
 
286
- #: ../app/controllers/discovered_hosts_controller.rb:223
286
+ #: ../app/controllers/discovered_hosts_controller.rb:224
287
287
  msgid "Hardware"
288
288
  msgstr "硬件"
289
289
 
290
- #: ../app/controllers/discovered_hosts_controller.rb:223
290
+ #: ../app/controllers/discovered_hosts_controller.rb:224
291
291
  msgid "Network"
292
292
  msgstr "网络"
293
293
 
294
- #: ../app/controllers/discovered_hosts_controller.rb:223
294
+ #: ../app/controllers/discovered_hosts_controller.rb:224
295
295
  msgid "Software"
296
296
  msgstr "软件"
297
297
 
298
- #: ../app/controllers/discovered_hosts_controller.rb:223
298
+ #: ../app/controllers/discovered_hosts_controller.rb:224
299
299
  msgid "IPMI"
300
300
  msgstr "IPMI"
301
301
 
302
- #: ../app/controllers/discovered_hosts_controller.rb:223
302
+ #: ../app/controllers/discovered_hosts_controller.rb:224
303
303
  msgid "Miscellaneous"
304
304
  msgstr "杂项"
305
305
 
306
- #: ../app/controllers/discovered_hosts_controller.rb:301
306
+ #: ../app/controllers/discovered_hosts_controller.rb:302
307
307
  msgid "No hosts were found with that id or name"
308
308
  msgstr "未找到符合此 id 或者名称的主机"
309
309
 
310
- #: ../app/controllers/discovered_hosts_controller.rb:305
310
+ #: ../app/controllers/discovered_hosts_controller.rb:306
311
311
  msgid "No hosts selected"
312
312
  msgstr "未选择任何主机"
313
313
 
314
- #: ../app/controllers/discovered_hosts_controller.rb:311
314
+ #: ../app/controllers/discovered_hosts_controller.rb:312
315
315
  msgid "Something went wrong while selecting hosts - %s"
316
316
  msgstr "选择主机时出错 - %s"
317
317
 
@@ -340,7 +340,7 @@ msgstr "刷新详情"
340
340
 
341
341
  #: ../app/helpers/discovered_hosts_helper.rb:16
342
342
  #: ../app/helpers/discovered_hosts_helper.rb:30
343
- #: ../app/models/setting/discovered.rb:26
343
+ #: ../app/models/setting/discovered.rb:22
344
344
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
345
345
  msgid "Reboot"
346
346
  msgstr "重启"
@@ -462,51 +462,51 @@ msgid_plural ""
462
462
  "Host group locations %s must also be associated to the discovery rule"
463
463
  msgstr[0] ""
464
464
 
465
- #: ../app/models/host/discovered.rb:41
465
+ #: ../app/models/host/discovered.rb:40
466
466
  msgid "Fact + prefix"
467
467
  msgstr "Fact + 前缀"
468
468
 
469
- #: ../app/models/host/discovered.rb:42
469
+ #: ../app/models/host/discovered.rb:41
470
470
  msgid "Random name"
471
471
  msgstr "随机名"
472
472
 
473
- #: ../app/models/host/discovered.rb:43
473
+ #: ../app/models/host/discovered.rb:42
474
474
  msgid "MAC-based name"
475
475
  msgstr "基于 MAC 的名称"
476
476
 
477
- #: ../app/models/host/discovered.rb:52
477
+ #: ../app/models/host/discovered.rb:51
478
478
  msgid "Invalid facts, must be a Hash"
479
479
  msgstr "无效详情,必须是 Hash"
480
480
 
481
- #: ../app/models/host/discovered.rb:57
481
+ #: ../app/models/host/discovered.rb:56
482
482
  msgid ""
483
483
  "Expected discovery_fact '%s' is missing, unable to detect primary interface "
484
484
  "and set hostname"
485
485
  msgstr "期望的 discovery_fact '%s' 缺失,无法检测主接口和设置主机名称"
486
486
 
487
- #: ../app/models/host/discovered.rb:70
487
+ #: ../app/models/host/discovered.rb:69
488
488
  msgid ""
489
489
  "Invalid facts: hash does not contain a valid value for any of the facts in "
490
490
  "the discovery_hostname setting: %s"
491
491
  msgstr "无效详情:hash 不包含 discovery_hostname 设置中任何详情的有效值:%s"
492
492
 
493
- #: ../app/models/host/discovered.rb:96
493
+ #: ../app/models/host/discovered.rb:95
494
494
  msgid "Facts could not be imported"
495
495
  msgstr "无法导入详情"
496
496
 
497
- #: ../app/models/host/discovered.rb:151
497
+ #: ../app/models/host/discovered.rb:150
498
498
  msgid "Could not get facts from proxy %{url}: %{error}"
499
499
  msgstr "无法从代理 %{url} 获得详情:%{error}"
500
500
 
501
- #: ../app/models/host/discovered.rb:159
501
+ #: ../app/models/host/discovered.rb:158
502
502
  msgid "Unable to reboot %{name} via %{url}: %{msg}"
503
503
  msgstr "无法通过 %{url} 重启 %{name} :%{msg}"
504
504
 
505
- #: ../app/models/host/discovered.rb:167
505
+ #: ../app/models/host/discovered.rb:166
506
506
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
507
507
  msgstr "无法通过 %{url} 在 %{name} 上执行 kexec:%{msg}"
508
508
 
509
- #: ../app/models/host/discovered.rb:186
509
+ #: ../app/models/host/discovered.rb:185
510
510
  msgid "Invalid hostname: Could not normalize the hostname"
511
511
  msgstr "无效的主机名:无法标准化主机名"
512
512
 
@@ -534,191 +534,191 @@ msgstr "Init RAM kexec URL 无效:'%s'"
534
534
  msgid "Rebuild DNS for %s"
535
535
  msgstr "为 %s 重建 DNS"
536
536
 
537
- #: ../app/models/setting/discovered.rb:19
537
+ #: ../app/models/setting/discovered.rb:15
538
538
  msgid "The default location to place discovered hosts in"
539
539
  msgstr "找到主机的默认位置"
540
540
 
541
- #: ../app/models/setting/discovered.rb:19
541
+ #: ../app/models/setting/discovered.rb:15
542
542
  msgid "Discovery location"
543
543
  msgstr "发现位置"
544
544
 
545
- #: ../app/models/setting/discovered.rb:20
545
+ #: ../app/models/setting/discovered.rb:16
546
546
  msgid "The default organization to place discovered hosts in"
547
547
  msgstr "找到主机的默认机构"
548
548
 
549
- #: ../app/models/setting/discovered.rb:20
549
+ #: ../app/models/setting/discovered.rb:16
550
550
  msgid "Discovery organization"
551
551
  msgstr "发现机构"
552
552
 
553
- #: ../app/models/setting/discovered.rb:21
553
+ #: ../app/models/setting/discovered.rb:17
554
554
  msgid "Fact name to use for primary interface detection"
555
555
  msgstr "用于主接口检测的详情名称"
556
556
 
557
- #: ../app/models/setting/discovered.rb:21
557
+ #: ../app/models/setting/discovered.rb:17
558
558
  msgid "Interface fact"
559
559
  msgstr "接口详情"
560
560
 
561
- #: ../app/models/setting/discovered.rb:22
561
+ #: ../app/models/setting/discovered.rb:18
562
562
  msgid ""
563
563
  "Automatic bond interface (if another interface is detected on the same VLAN "
564
564
  "via LLDP)"
565
565
  msgstr "自动绑定接口(如果通过 LLDP 在同一个 VLAN 中发现另外一个接口)"
566
566
 
567
- #: ../app/models/setting/discovered.rb:22
567
+ #: ../app/models/setting/discovered.rb:18
568
568
  msgid "Create bond interfaces"
569
569
  msgstr "创建绑定接口"
570
570
 
571
- #: ../app/models/setting/discovered.rb:23
571
+ #: ../app/models/setting/discovered.rb:19
572
572
  msgid "Clean all reported facts during provisioning (except discovery facts)"
573
573
  msgstr "置备期间清除所有报告的详情(发现详情除外)"
574
574
 
575
- #: ../app/models/setting/discovered.rb:23
575
+ #: ../app/models/setting/discovered.rb:19
576
576
  msgid "Clean all facts"
577
577
  msgstr "清除所有详情"
578
578
 
579
- #: ../app/models/setting/discovered.rb:24
579
+ #: ../app/models/setting/discovered.rb:20
580
580
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
581
581
  msgstr "用于主机名的详情列表(用逗号隔开,首个 wins)"
582
582
 
583
- #: ../app/models/setting/discovered.rb:24
583
+ #: ../app/models/setting/discovered.rb:20
584
584
  msgid "Hostname facts"
585
585
  msgstr "主机名详情"
586
586
 
587
- #: ../app/models/setting/discovered.rb:25
587
+ #: ../app/models/setting/discovered.rb:21
588
588
  msgid ""
589
589
  "Automatically provision newly discovered hosts, according to the "
590
590
  "provisioning rules"
591
591
  msgstr "根据置备规则,自动置备新发现主机"
592
592
 
593
- #: ../app/models/setting/discovered.rb:25
593
+ #: ../app/models/setting/discovered.rb:21
594
594
  msgid "Auto provisioning"
595
595
  msgstr "自动置备"
596
596
 
597
- #: ../app/models/setting/discovered.rb:26
597
+ #: ../app/models/setting/discovered.rb:22
598
598
  msgid "Automatically reboot or kexec discovered host during provisioning"
599
599
  msgstr "置备期间自动重启或 kexec 发现主机"
600
600
 
601
- #: ../app/models/setting/discovered.rb:27
601
+ #: ../app/models/setting/discovered.rb:23
602
602
  msgid "The default prefix to use for the host name, must start with a letter"
603
603
  msgstr "使用的主机名默认前缀必须以字母开头"
604
604
 
605
- #: ../app/models/setting/discovered.rb:27
605
+ #: ../app/models/setting/discovered.rb:23
606
606
  msgid "Hostname prefix"
607
607
  msgstr "主机名前缀"
608
608
 
609
- #: ../app/models/setting/discovered.rb:28
609
+ #: ../app/models/setting/discovered.rb:24
610
610
  msgid "Extra facter columns to show in host lists (separate by comma)"
611
611
  msgstr "在主机列表中显示的额外 facter 列(用逗号隔开)"
612
612
 
613
- #: ../app/models/setting/discovered.rb:28
613
+ #: ../app/models/setting/discovered.rb:24
614
614
  msgid "Fact columns"
615
615
  msgstr "详情列"
616
616
 
617
- #: ../app/models/setting/discovered.rb:29
617
+ #: ../app/models/setting/discovered.rb:25
618
618
  msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
619
619
  msgstr "组织高亮部分详情的正则表达式 - 例如 ^(abc|cde)$"
620
620
 
621
- #: ../app/models/setting/discovered.rb:29
621
+ #: ../app/models/setting/discovered.rb:25
622
622
  msgid "Highlighted facts"
623
623
  msgstr "高亮详情"
624
624
 
625
- #: ../app/models/setting/discovered.rb:30
625
+ #: ../app/models/setting/discovered.rb:26
626
626
  msgid "Regex to organize facts for storage section"
627
627
  msgstr "组织存储部分详情的正则表达式"
628
628
 
629
- #: ../app/models/setting/discovered.rb:30
629
+ #: ../app/models/setting/discovered.rb:26
630
630
  msgid "Storage facts"
631
631
  msgstr "存储详情"
632
632
 
633
- #: ../app/models/setting/discovered.rb:31
633
+ #: ../app/models/setting/discovered.rb:27
634
634
  msgid "Regex to organize facts for software section"
635
635
  msgstr "组织软件部分详情的正则表达式"
636
636
 
637
- #: ../app/models/setting/discovered.rb:31
637
+ #: ../app/models/setting/discovered.rb:27
638
638
  msgid "Software facts"
639
639
  msgstr "软件详情"
640
640
 
641
- #: ../app/models/setting/discovered.rb:32
641
+ #: ../app/models/setting/discovered.rb:28
642
642
  msgid "Regex to organize facts for hardware section"
643
643
  msgstr "组织硬件部分详情的正则表达式"
644
644
 
645
- #: ../app/models/setting/discovered.rb:32
645
+ #: ../app/models/setting/discovered.rb:28
646
646
  msgid "Hardware facts"
647
647
  msgstr "硬件详情"
648
648
 
649
- #: ../app/models/setting/discovered.rb:33
649
+ #: ../app/models/setting/discovered.rb:29
650
650
  msgid "Regex to organize facts for network section"
651
651
  msgstr "组织网络部分详情的正则表达式"
652
652
 
653
- #: ../app/models/setting/discovered.rb:33
653
+ #: ../app/models/setting/discovered.rb:29
654
654
  msgid "Network facts"
655
655
  msgstr "网络详情"
656
656
 
657
- #: ../app/models/setting/discovered.rb:34
657
+ #: ../app/models/setting/discovered.rb:30
658
658
  msgid "Regex to organize facts for ipmi section"
659
659
  msgstr "组织 ipmi 部分详情的正则表达式"
660
660
 
661
- #: ../app/models/setting/discovered.rb:34
661
+ #: ../app/models/setting/discovered.rb:30
662
662
  msgid "IPMI facts"
663
663
  msgstr "IPMI 详情"
664
664
 
665
- #: ../app/models/setting/discovered.rb:35
665
+ #: ../app/models/setting/discovered.rb:31
666
666
  msgid ""
667
667
  "Automatically generate PXE configuration to pin a newly discovered host to "
668
668
  "discovery"
669
669
  msgstr "自动生成 PXE 配置,以将新发现主机固定至发现"
670
670
 
671
- #: ../app/models/setting/discovered.rb:35
671
+ #: ../app/models/setting/discovered.rb:31
672
672
  msgid "Lock PXE"
673
673
  msgstr "锁定 PXE"
674
674
 
675
- #: ../app/models/setting/discovered.rb:36
675
+ #: ../app/models/setting/discovered.rb:32
676
676
  msgid "PXELinux template to be used when pinning a host to discovery"
677
677
  msgstr "将主机固定至发现时使用的 PXELinux 模板"
678
678
 
679
- #: ../app/models/setting/discovered.rb:36
679
+ #: ../app/models/setting/discovered.rb:32
680
680
  msgid "Locked PXELinux template name"
681
681
  msgstr "锁定的 PXELinux 模板名称"
682
682
 
683
- #: ../app/models/setting/discovered.rb:37
683
+ #: ../app/models/setting/discovered.rb:33
684
684
  msgid "PXEGrub template to be used when pinning a host to discovery"
685
685
  msgstr "将主机固定至发现时使用的 PXEGrub 模板"
686
686
 
687
- #: ../app/models/setting/discovered.rb:37
687
+ #: ../app/models/setting/discovered.rb:33
688
688
  msgid "Locked PXEGrub template name"
689
689
  msgstr "锁定的 PXEGrub 模板名称"
690
690
 
691
- #: ../app/models/setting/discovered.rb:38
691
+ #: ../app/models/setting/discovered.rb:34
692
692
  msgid "PXEGrub2 template to be used when pinning a host to discovery"
693
693
  msgstr "将主机固定至发现时使用的 PXEGrub2 模板"
694
694
 
695
- #: ../app/models/setting/discovered.rb:38
695
+ #: ../app/models/setting/discovered.rb:34
696
696
  msgid "Locked PXEGrub2 template name"
697
697
  msgstr "锁定的 PXEGrub2 模板名称"
698
698
 
699
- #: ../app/models/setting/discovered.rb:39
699
+ #: ../app/models/setting/discovered.rb:35
700
700
  msgid "Force DNS entries creation when provisioning discovered host"
701
701
  msgstr "置备发现主机时强制 DNS 条目创建"
702
702
 
703
- #: ../app/models/setting/discovered.rb:39
703
+ #: ../app/models/setting/discovered.rb:35
704
704
  msgid "Force DNS"
705
705
  msgstr "强制 DNS"
706
706
 
707
- #: ../app/models/setting/discovered.rb:40
707
+ #: ../app/models/setting/discovered.rb:36
708
708
  msgid ""
709
709
  "Do not allow to discover existing managed host matching MAC of a "
710
710
  "provisioning NIC (errors out early)"
711
711
  msgstr "不允许发现匹配一个置备 NIC 的 MAC 的已存在的管理的主机(早期出现错误)"
712
712
 
713
- #: ../app/models/setting/discovered.rb:40
713
+ #: ../app/models/setting/discovered.rb:36
714
714
  msgid "Error on existing NIC"
715
715
  msgstr "已存在的 NIC 上的错误"
716
716
 
717
- #: ../app/models/setting/discovered.rb:41
717
+ #: ../app/models/setting/discovered.rb:37
718
718
  msgid "Discovery hostname naming pattern"
719
719
  msgstr "发现主机名的名称特征"
720
720
 
721
- #: ../app/models/setting/discovered.rb:41
721
+ #: ../app/models/setting/discovered.rb:37
722
722
  msgid "Type of name generator"
723
723
  msgstr "名称生成器类型"
724
724
 
@@ -736,6 +736,10 @@ msgid ""
736
736
  "%{filter}"
737
737
  msgstr "无法找到带有 '%{fact}' 指定的 %{mac} 的主 NIC。NIC 过滤:%{filter}"
738
738
 
739
+ #: ../app/services/foreman_discovery/host_converter.rb:39
740
+ msgid "IPAM must be configured for subnet '%s'"
741
+ msgstr ""
742
+
739
743
  #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
740
744
  msgid "Image API returned HTTP/%{code} with '%{body}"
741
745
  msgstr "镜像 API 返回 HTTP/%{code} 与 '%{body}"
@@ -774,11 +778,11 @@ msgstr "CPU"
774
778
  msgid "Memory"
775
779
  msgstr "内存"
776
780
 
777
- #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
781
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:25
778
782
  msgid "Customize Host"
779
783
  msgstr "自定义主机"
780
784
 
781
- #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
785
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:26
782
786
  msgid "Create Host"
783
787
  msgstr "创建主机"
784
788
 
@@ -1088,3 +1092,19 @@ msgid ""
1088
1092
  "ID of Discovery Proxy to use within this subnet for managing connection to "
1089
1093
  "discovered hosts"
1090
1094
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
1095
+
1096
+ #: action_names.rb:2
1097
+ msgid "Import Puppet classes"
1098
+ msgstr "导入 Puppet 类"
1099
+
1100
+ #: action_names.rb:3
1101
+ msgid "Import facts"
1102
+ msgstr "导入 fact"
1103
+
1104
+ #: action_names.rb:4
1105
+ msgid "Action with sub plans"
1106
+ msgstr "带有子计划的操作"
1107
+
1108
+ #: action_names.rb:5
1109
+ msgid "Remote action:"
1110
+ msgstr "远程操作:"