foreman_discovery 8.0.0 → 8.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb +2 -0
- data/app/models/host/discovered.rb +3 -7
- data/lib/foreman_discovery/version.rb +1 -1
- data/locale/ca/foreman_discovery.edit.po +129 -57
- data/locale/de/foreman_discovery.edit.po +130 -61
- data/locale/en/foreman_discovery.edit.po +10 -10
- data/locale/en_GB/foreman_discovery.edit.po +129 -65
- data/locale/es/foreman_discovery.edit.po +129 -57
- data/locale/fr/foreman_discovery.edit.po +138 -73
- data/locale/gl/foreman_discovery.edit.po +129 -53
- data/locale/it/foreman_discovery.edit.po +129 -57
- data/locale/ja/foreman_discovery.edit.po +129 -59
- data/locale/ko/foreman_discovery.edit.po +128 -57
- data/locale/pt_BR/foreman_discovery.edit.po +129 -57
- data/locale/ru/foreman_discovery.edit.po +130 -60
- data/locale/sv_SE/foreman_discovery.edit.po +129 -53
- data/locale/zh_CN/foreman_discovery.edit.po +129 -59
- data/locale/zh_TW/foreman_discovery.edit.po +129 -59
- data/test/unit/host_discovered_test.rb +9 -0
- metadata +19 -3
@@ -1,17 +1,16 @@
|
|
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
|
msgid ""
|
7
7
|
msgstr ""
|
8
|
-
"Project-Id-Version: foreman_discovery
|
8
|
+
"Project-Id-Version: foreman_discovery 8.0.0\n"
|
9
9
|
"Report-Msgid-Bugs-To: \n"
|
10
10
|
"POT-Creation-Date: 2017-01-06 08:26+0100\n"
|
11
|
-
"PO-Revision-Date:
|
11
|
+
"PO-Revision-Date: 2017-01-06 08:44+0000\n"
|
12
12
|
"Last-Translator: Lukáš Zapletal\n"
|
13
|
-
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/
|
14
|
-
"uage/zh_TW/)\n"
|
13
|
+
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
|
15
14
|
"MIME-Version: 1.0\n"
|
16
15
|
"Content-Type: text/plain; charset=UTF-8\n"
|
17
16
|
"Content-Transfer-Encoding: 8bit\n"
|
@@ -22,19 +21,23 @@ msgstr ""
|
|
22
21
|
msgid "List all discovered hosts"
|
23
22
|
msgstr "列出所有發現的主機"
|
24
23
|
|
25
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
|
24
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
|
25
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
|
26
26
|
msgid "filter results"
|
27
27
|
msgstr "篩選結果"
|
28
28
|
|
29
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
|
29
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
|
30
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
|
30
31
|
msgid "sort results"
|
31
32
|
msgstr "排序結果"
|
32
33
|
|
33
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
|
34
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
|
35
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
|
34
36
|
msgid "paginate results"
|
35
37
|
msgstr "編頁結果"
|
36
38
|
|
37
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
|
39
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
|
40
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
|
38
41
|
msgid "number of entries per request"
|
39
42
|
msgstr "每個請求的項目數量"
|
40
43
|
|
@@ -59,11 +62,14 @@ msgid "not required if it's a virtual machine"
|
|
59
62
|
msgstr "若是虛擬機器則不需要"
|
60
63
|
|
61
64
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
|
62
|
-
msgid "
|
65
|
+
msgid ""
|
66
|
+
"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
|
63
67
|
msgstr "用來追蹤協調流程任務狀態的 UUID,GET /api/orchestration/:UUID/tasks"
|
64
68
|
|
65
69
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
|
66
|
-
msgid "
|
70
|
+
msgid ""
|
71
|
+
"required if value is not inherited from host group or default password in "
|
72
|
+
"settings"
|
67
73
|
msgstr "若值並非從主機群組或設定中的預設密碼所繼承的話則需要"
|
68
74
|
|
69
75
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:86
|
@@ -75,14 +81,18 @@ msgid "Upload facts for a host, creating the host if required"
|
|
75
81
|
msgstr "上傳主機的詳情,並視需求建立主機"
|
76
82
|
|
77
83
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:94
|
78
|
-
msgid "
|
84
|
+
msgid ""
|
85
|
+
"hash containing facts for the host with minimum set of facts: "
|
86
|
+
"discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
|
87
|
+
"eth0 (example in case primary interface is named eth0)"
|
79
88
|
msgstr "包含主機詳情的雜湊,其中有最基本的詳情:discovery_bootif、macaddress_eth0、ipaddress、ipaddress_eth0、interfaces:eth0(大部分範例中,主介面的名稱都是 eth0)"
|
80
89
|
|
81
90
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:111
|
82
91
|
msgid "Execute rules against a discovered host"
|
83
92
|
msgstr "針對於一部發現的主機執行規則"
|
84
93
|
|
85
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
|
94
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
|
95
|
+
#: ../app/controllers/discovered_hosts_controller.rb:162
|
86
96
|
msgid "Host %{host} was provisioned with rule %{rule}"
|
87
97
|
msgstr "主機 %{host} 已透過規則 %{rule} 佈建"
|
88
98
|
|
@@ -90,7 +100,8 @@ msgstr "主機 %{host} 已透過規則 %{rule} 佈建"
|
|
90
100
|
msgid "Unable to provision %{host}: %{errors}"
|
91
101
|
msgstr "無法供給 %{host}:%{errors}"
|
92
102
|
|
93
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
|
103
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
|
104
|
+
#: ../app/controllers/discovered_hosts_controller.rb:169
|
94
105
|
msgid "No rule found for host %s"
|
95
106
|
msgstr "未找到主機 %s 的規則"
|
96
107
|
|
@@ -98,11 +109,13 @@ msgstr "未找到主機 %s 的規則"
|
|
98
109
|
msgid "Execute rules against all currently discovered hosts"
|
99
110
|
msgstr "針對於所有目前已發現的主機執行規則"
|
100
111
|
|
101
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:137
|
112
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:137
|
113
|
+
#: ../app/controllers/discovered_hosts_controller.rb:175
|
102
114
|
msgid "Errors during auto provisioning: %s"
|
103
115
|
msgstr "進行自動佈建時發生了錯誤:%s"
|
104
116
|
|
105
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
|
117
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
|
118
|
+
#: ../app/controllers/discovered_hosts_controller.rb:178
|
106
119
|
msgid "No discovered hosts to provision"
|
107
120
|
msgstr "未發現可佈建的主機"
|
108
121
|
|
@@ -122,7 +135,8 @@ msgstr "重新啟動一部已發現的主機"
|
|
122
135
|
msgid "Rebooting all discovered hosts"
|
123
136
|
msgstr "重新啟動所有已發現的主機"
|
124
137
|
|
125
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:202
|
138
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:202
|
139
|
+
#: ../app/controllers/discovered_hosts_controller.rb:120
|
126
140
|
msgid "Discovered hosts are rebooting now"
|
127
141
|
msgstr "發現的主機正在重新啟動"
|
128
142
|
|
@@ -147,7 +161,8 @@ msgid "the hostgroup that is used to auto provision a host"
|
|
147
161
|
msgstr "用來自動佈建一部主機的主機群組"
|
148
162
|
|
149
163
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:35
|
150
|
-
msgid "
|
164
|
+
msgid ""
|
165
|
+
"defines a pattern to assign human-readable hostnames to the matching hosts"
|
151
166
|
msgstr "定義一項模式來為相符的主機指定易讀的主機名稱"
|
152
167
|
|
153
168
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:36
|
@@ -155,7 +170,8 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
|
|
155
170
|
msgstr "啟用來限制每個規則所能搭配的最大已佈建主機之數量"
|
156
171
|
|
157
172
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:37
|
158
|
-
msgid "
|
173
|
+
msgid ""
|
174
|
+
"puts the rules in order, low numbers go first. Must be greater then zero"
|
159
175
|
msgstr "按照順序排序規則,數字較小的優先。必須大於零"
|
160
176
|
|
161
177
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:38
|
@@ -298,15 +314,19 @@ msgstr "規則已停用"
|
|
298
314
|
msgid "%s ago"
|
299
315
|
msgstr "%s 之前"
|
300
316
|
|
301
|
-
#: ../app/helpers/discovered_hosts_helper.rb:14
|
317
|
+
#: ../app/helpers/discovered_hosts_helper.rb:14
|
318
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
|
302
319
|
msgid "Auto Provision"
|
303
320
|
msgstr "自動佈建"
|
304
321
|
|
305
|
-
#: ../app/helpers/discovered_hosts_helper.rb:15
|
322
|
+
#: ../app/helpers/discovered_hosts_helper.rb:15
|
323
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
|
306
324
|
msgid "Refresh facts"
|
307
325
|
msgstr "刷新詳情"
|
308
326
|
|
309
|
-
#: ../app/helpers/discovered_hosts_helper.rb:16
|
327
|
+
#: ../app/helpers/discovered_hosts_helper.rb:16
|
328
|
+
#: ../app/models/setting/discovered.rb:23
|
329
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
|
310
330
|
msgid "Reboot"
|
311
331
|
msgstr "重新開機"
|
312
332
|
|
@@ -314,7 +334,8 @@ msgstr "重新開機"
|
|
314
334
|
msgid "Back"
|
315
335
|
msgstr "上一步"
|
316
336
|
|
317
|
-
#: ../app/helpers/discovered_hosts_helper.rb:21
|
337
|
+
#: ../app/helpers/discovered_hosts_helper.rb:21
|
338
|
+
#: ../app/helpers/discovered_hosts_helper.rb:38
|
318
339
|
msgid "Select Action"
|
319
340
|
msgstr "選擇動作"
|
320
341
|
|
@@ -322,7 +343,8 @@ msgstr "選擇動作"
|
|
322
343
|
msgid "Expand All"
|
323
344
|
msgstr "全部展開"
|
324
345
|
|
325
|
-
#: ../app/helpers/discovered_hosts_helper.rb:28
|
346
|
+
#: ../app/helpers/discovered_hosts_helper.rb:28
|
347
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
|
326
348
|
msgid "Delete %s?"
|
327
349
|
msgstr "刪除 %s?"
|
328
350
|
|
@@ -362,7 +384,8 @@ msgstr "過去七天內已回報"
|
|
362
384
|
msgid "Provision"
|
363
385
|
msgstr "佈建"
|
364
386
|
|
365
|
-
#: ../app/helpers/discovery_rules_helper.rb:26
|
387
|
+
#: ../app/helpers/discovery_rules_helper.rb:26
|
388
|
+
#: ../lib/foreman_discovery/engine.rb:163
|
366
389
|
msgid "Discovered Hosts"
|
367
390
|
msgstr ""
|
368
391
|
|
@@ -407,27 +430,32 @@ msgid "must start with a letter or ERB."
|
|
407
430
|
msgstr "必須以字母或是 ERB 作為起始。"
|
408
431
|
|
409
432
|
#: ../app/models/discovery_rule.rb:45
|
410
|
-
msgid "
|
411
|
-
|
433
|
+
msgid ""
|
434
|
+
"Host group organization %s must also be associated to the discovery rule"
|
435
|
+
msgid_plural ""
|
436
|
+
"Host group organizations %s must also be associated to the discovery rule"
|
412
437
|
msgstr[0] ""
|
413
|
-
msgstr[1] ""
|
414
438
|
|
415
439
|
#: ../app/models/discovery_rule.rb:51
|
416
440
|
msgid "Host group location %s must also be associated to the discovery rule"
|
417
|
-
msgid_plural "
|
441
|
+
msgid_plural ""
|
442
|
+
"Host group locations %s must also be associated to the discovery rule"
|
418
443
|
msgstr[0] ""
|
419
|
-
msgstr[1] ""
|
420
444
|
|
421
445
|
#: ../app/models/host/discovered.rb:38
|
422
446
|
msgid "Invalid facts, must be a Hash"
|
423
447
|
msgstr "詳情無效,必須是雜湊"
|
424
448
|
|
425
449
|
#: ../app/models/host/discovered.rb:43
|
426
|
-
msgid "
|
450
|
+
msgid ""
|
451
|
+
"Expected discovery_fact '%s' is missing, unable to detect primary interface "
|
452
|
+
"and set hostname"
|
427
453
|
msgstr "沒有預期的 discovery_fact '%s',無法偵測主介面並設定主機名稱"
|
428
454
|
|
429
455
|
#: ../app/models/host/discovered.rb:50
|
430
|
-
msgid "
|
456
|
+
msgid ""
|
457
|
+
"Invalid facts: hash does not contain a valid value for any of the facts in "
|
458
|
+
"the discovery_hostname setting: %s"
|
431
459
|
msgstr ""
|
432
460
|
|
433
461
|
#: ../app/models/host/discovered.rb:67
|
@@ -495,7 +523,9 @@ msgid "Hostname facts"
|
|
495
523
|
msgstr ""
|
496
524
|
|
497
525
|
#: ../app/models/setting/discovered.rb:22
|
498
|
-
msgid "
|
526
|
+
msgid ""
|
527
|
+
"Automatically provision newly discovered hosts, according to the "
|
528
|
+
"provisioning rules"
|
499
529
|
msgstr "根據佈建規則來自動佈建新發現的主機"
|
500
530
|
|
501
531
|
#: ../app/models/setting/discovered.rb:22
|
@@ -571,7 +601,9 @@ msgid "IPMI facts"
|
|
571
601
|
msgstr ""
|
572
602
|
|
573
603
|
#: ../app/models/setting/discovered.rb:32
|
574
|
-
msgid "
|
604
|
+
msgid ""
|
605
|
+
"Automatically generate PXE configuration to pin a newly discovered host to "
|
606
|
+
"discovery"
|
575
607
|
msgstr ""
|
576
608
|
|
577
609
|
#: ../app/models/setting/discovered.rb:32
|
@@ -627,7 +659,9 @@ msgid "Discovery organization"
|
|
627
659
|
msgstr ""
|
628
660
|
|
629
661
|
#: ../app/services/foreman_discovery/fact_parser.rb:9
|
630
|
-
msgid "
|
662
|
+
msgid ""
|
663
|
+
"Unable to detect primary interface using MAC '%{mac}' specified by "
|
664
|
+
"discovery_fact '%{fact}'"
|
631
665
|
msgstr "無法偵測使用 MAC '%{mac}' 的主介面,由 discovery_fact '%{fact}' 所指定"
|
632
666
|
|
633
667
|
#: ../app/services/foreman_discovery/node_api/node_resource.rb:75
|
@@ -646,15 +680,25 @@ msgstr "未發現可用的主機"
|
|
646
680
|
msgid "Host"
|
647
681
|
msgstr "主機"
|
648
682
|
|
649
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
|
683
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
|
684
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
|
685
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
|
686
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:18
|
687
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:10
|
650
688
|
msgid "Model"
|
651
689
|
msgstr "型號"
|
652
690
|
|
653
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
|
691
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
|
692
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
|
693
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:20
|
694
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:12
|
654
695
|
msgid "CPUs"
|
655
696
|
msgstr "CPU"
|
656
697
|
|
657
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
|
698
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
|
699
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
|
700
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:21
|
701
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:13
|
658
702
|
msgid "Memory"
|
659
703
|
msgstr "記憶體"
|
660
704
|
|
@@ -670,7 +714,8 @@ msgstr ""
|
|
670
714
|
msgid "Create host"
|
671
715
|
msgstr ""
|
672
716
|
|
673
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
|
717
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
|
718
|
+
#: ../lib/foreman_discovery/engine.rb:148
|
674
719
|
msgid "Discovered hosts"
|
675
720
|
msgstr "發現的主機"
|
676
721
|
|
@@ -682,27 +727,38 @@ msgstr "選擇這頁中的所有項目"
|
|
682
727
|
msgid "items selected. Uncheck to Clear"
|
683
728
|
msgstr "已選取項目。反選以清除"
|
684
729
|
|
685
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
|
730
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
|
731
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
|
732
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:17
|
733
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:9
|
686
734
|
msgid "Name"
|
687
735
|
msgstr "名稱"
|
688
736
|
|
689
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
|
737
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
|
738
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:19
|
739
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:11
|
690
740
|
msgid "IP Address"
|
691
741
|
msgstr "IP 位址"
|
692
742
|
|
693
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
|
743
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
|
744
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
|
745
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
|
694
746
|
msgid "Disk count"
|
695
747
|
msgstr "磁碟計數"
|
696
748
|
|
697
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
|
749
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
|
750
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
|
751
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
|
698
752
|
msgid "Disks size"
|
699
753
|
msgstr "磁碟大小"
|
700
754
|
|
701
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
|
755
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
|
756
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
|
702
757
|
msgid "Location"
|
703
758
|
msgstr "位置"
|
704
759
|
|
705
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
|
760
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
|
761
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
|
706
762
|
msgid "Organization"
|
707
763
|
msgstr "組織"
|
708
764
|
|
@@ -739,7 +795,9 @@ msgid "Warning"
|
|
739
795
|
msgstr "警告"
|
740
796
|
|
741
797
|
#: ../app/views/discovered_hosts/multiple_destroy.html.erb:5
|
742
|
-
msgid "
|
798
|
+
msgid ""
|
799
|
+
"This might take a while, as all hosts, facts and reports will be destroyed "
|
800
|
+
"as well"
|
743
801
|
msgstr "這可能會花上一段時間,因為所有主機、詳情與報告皆會被刪除"
|
744
802
|
|
745
803
|
#: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
|
@@ -782,11 +840,13 @@ msgstr ""
|
|
782
840
|
msgid "<b>Foreman</b> Discovered hosts summary"
|
783
841
|
msgstr ""
|
784
842
|
|
785
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
|
843
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
|
844
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
|
786
845
|
msgid "Summary from %{time} ago to %{now}"
|
787
846
|
msgstr ""
|
788
847
|
|
789
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
|
848
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
|
849
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
|
790
850
|
msgid "Discovered hosts from Foreman server at %{foreman_url}"
|
791
851
|
msgstr ""
|
792
852
|
|
@@ -839,23 +899,33 @@ msgid "Rule priority (lower integer means higher priority)"
|
|
839
899
|
msgstr "規則優先順序(愈小的數字代表愈高的優先權)"
|
840
900
|
|
841
901
|
#: ../app/views/discovery_rules/_template_inline.erb:2
|
842
|
-
msgid "
|
902
|
+
msgid ""
|
903
|
+
"Specify target hostname template pattern in the same syntax as in "
|
904
|
+
"Provisioning Templates (ERB)."
|
843
905
|
msgstr "以在佈建範本(ERB)中的相同語法,指定目標主機名稱範本格式。"
|
844
906
|
|
845
907
|
#: ../app/views/discovery_rules/_template_inline.erb:4
|
846
|
-
msgid "
|
908
|
+
msgid ""
|
909
|
+
"Domain will be appended automatically. A hostname based on MAC address will "
|
910
|
+
"be used when left blank."
|
847
911
|
msgstr ""
|
848
912
|
|
849
913
|
#: ../app/views/discovery_rules/_template_inline.erb:5
|
850
|
-
msgid "
|
914
|
+
msgid ""
|
915
|
+
"In addition to @host attribute function rand for random integers is "
|
916
|
+
"available. Examples:"
|
851
917
|
msgstr ""
|
852
918
|
|
853
919
|
#: ../app/views/discovery_rules/_template_inline.erb:8
|
854
|
-
msgid "
|
920
|
+
msgid ""
|
921
|
+
"When creating hostname patterns, make sure the resulting host names are "
|
922
|
+
"unique."
|
855
923
|
msgstr ""
|
856
924
|
|
857
925
|
#: ../app/views/discovery_rules/_template_inline.erb:9
|
858
|
-
msgid "
|
926
|
+
msgid ""
|
927
|
+
"Hostnames must not start with numbers. A good approach is to use unique "
|
928
|
+
"information provided by facter (MAC address, BIOS or serial ID)."
|
859
929
|
msgstr ""
|
860
930
|
|
861
931
|
#: ../app/views/discovery_rules/edit.html.erb:1
|
@@ -911,13 +981,13 @@ msgid "Discovery Proxy"
|
|
911
981
|
msgstr ""
|
912
982
|
|
913
983
|
#: ../lib/foreman_discovery/engine.rb:177
|
914
|
-
msgid "
|
984
|
+
msgid ""
|
985
|
+
"Discovery Proxy to use within this subnet for managing connection to "
|
986
|
+
"discovered hosts"
|
915
987
|
msgstr ""
|
916
988
|
|
917
989
|
#: ../lib/foreman_discovery/engine.rb:178
|
918
|
-
msgid "
|
990
|
+
msgid ""
|
991
|
+
"ID of Discovery Proxy to use within this subnet for managing connection to "
|
992
|
+
"discovered hosts"
|
919
993
|
msgstr ""
|
920
|
-
|
921
|
-
#: ../lib/foreman_discovery/engine.rb:162
|
922
|
-
#~ msgid "Discovery widget"
|
923
|
-
#~ msgstr "搜尋工具組"
|
@@ -121,6 +121,15 @@ class HostDiscoveredTest < ActiveSupport::TestCase
|
|
121
121
|
assert_match(/Unable to detect primary interface using MAC/, exception.message)
|
122
122
|
end
|
123
123
|
|
124
|
+
test "should not create discovered host when managed host exists" do
|
125
|
+
FactoryGirl.create(:host, :mac => 'E4:1F:13:CC:36:58')
|
126
|
+
raw = parse_json_fixture('/facts.json')
|
127
|
+
exception = assert_raises(::Foreman::Exception) do
|
128
|
+
Host::Discovered.import_host(raw['facts'])
|
129
|
+
end
|
130
|
+
assert_match(/Host already exists as managed/, exception.message)
|
131
|
+
end
|
132
|
+
|
124
133
|
test "should create discovered host with prefix" do
|
125
134
|
raw = parse_json_fixture('/facts.json')
|
126
135
|
Setting[:discovery_prefix] = 'test'
|
metadata
CHANGED
@@ -1,38 +1,54 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_discovery
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 8.0.
|
4
|
+
version: 8.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
+
- alongoldboim
|
8
|
+
- Alon Goldboim
|
9
|
+
- amirfefer
|
10
|
+
- Amit Karsale
|
7
11
|
- Amos Benari
|
8
12
|
- Bryan Kearney
|
9
|
-
-
|
13
|
+
- Daniel Lobato
|
14
|
+
- Daniel Lobato Garcia
|
10
15
|
- Daniel Lobato García
|
16
|
+
- David Davis
|
11
17
|
- Dominic Cleal
|
12
18
|
- Eric D. Helms
|
13
19
|
- Frank Wall
|
14
20
|
- Greg Sutcliffe
|
21
|
+
- ChairmanTubeAmp
|
22
|
+
- imriz
|
15
23
|
- Imri Zvik
|
16
24
|
- Joseph Mitchell Magen
|
17
25
|
- Lukas Zapletal
|
18
26
|
- Lukáš Zapletal
|
19
27
|
- Marek Hulan
|
28
|
+
- Marek Hulán
|
20
29
|
- Martin Bačovský
|
21
30
|
- Matt Jarvis
|
22
31
|
- Michael Moll
|
23
32
|
- Nick
|
24
33
|
- Ohad Levy
|
25
34
|
- Ori Rabin
|
35
|
+
- orrabin
|
26
36
|
- Petr Chalupa
|
27
37
|
- Phirince Philip
|
38
|
+
- Robert Antoni Buj Gelonch
|
28
39
|
- Scubafloyd
|
40
|
+
- Sean O\'Keeffe
|
41
|
+
- Shimon Shtein
|
29
42
|
- Shlomi Zadok
|
30
43
|
- Stephen Benjamin
|
44
|
+
- Swapnil Abnave
|
45
|
+
- Timo Goebel
|
46
|
+
- Tom Caspy
|
31
47
|
- Yann Cézard
|
32
48
|
autorequire:
|
33
49
|
bindir: bin
|
34
50
|
cert_chain: []
|
35
|
-
date: 2017-
|
51
|
+
date: 2017-02-28 00:00:00.000000000 Z
|
36
52
|
dependencies: []
|
37
53
|
description: MaaS Discovery Plugin engine for Foreman
|
38
54
|
email: gsutclif@redhat.com
|