foreman_discovery 24.0.1 → 25.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +1 -1
  3. data/app/helpers/discovered_hosts_helper.rb +1 -1
  4. data/app/models/host/discovered.rb +1 -1
  5. data/app/views/discovered_hosts/show.html.erb +23 -21
  6. data/app/views/discovery_rules/_form.html.erb +0 -6
  7. data/config/initializers/inflections.rb +5 -0
  8. data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb +1 -1
  9. data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb +1 -1
  10. data/lib/foreman_discovery/engine.rb +300 -305
  11. data/lib/foreman_discovery/version.rb +1 -1
  12. data/lib/foreman_discovery.rake +1 -5
  13. data/locale/ca/foreman_discovery.edit.po +64 -64
  14. data/locale/cs_CZ/foreman_discovery.edit.po +64 -64
  15. data/locale/de/foreman_discovery.edit.po +64 -64
  16. data/locale/en/foreman_discovery.edit.po +64 -64
  17. data/locale/en_GB/foreman_discovery.edit.po +64 -64
  18. data/locale/es/foreman_discovery.edit.po +64 -64
  19. data/locale/foreman_discovery.pot +68 -68
  20. data/locale/fr/foreman_discovery.edit.po +64 -64
  21. data/locale/gl/foreman_discovery.edit.po +64 -64
  22. data/locale/it/foreman_discovery.edit.po +64 -64
  23. data/locale/ja/foreman_discovery.edit.po +64 -64
  24. data/locale/ka/foreman_discovery.edit.po +64 -64
  25. data/locale/ko/foreman_discovery.edit.po +64 -64
  26. data/locale/pt_BR/foreman_discovery.edit.po +64 -64
  27. data/locale/ru/foreman_discovery.edit.po +64 -64
  28. data/locale/sv_SE/foreman_discovery.edit.po +64 -64
  29. data/locale/zh_CN/foreman_discovery.edit.po +64 -64
  30. data/locale/zh_TW/foreman_discovery.edit.po +64 -64
  31. data/package.json +0 -2
  32. data/test/functional/discovered_hosts_controller_test.rb +1 -1
  33. metadata +14 -15
  34. data/test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig +0 -81
@@ -117,7 +117,7 @@ msgstr "hash 包含具备最小详情集合的主机的详情:discovery_bootif
117
117
  msgid "Execute rules against a discovered host"
118
118
  msgstr "对发现主机执行规则"
119
119
 
120
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:163
120
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:164
121
121
  msgid "Host %{host} was provisioned with rule %{rule}"
122
122
  msgstr "主机 %{host} 被置备,带有规则 %{rule}"
123
123
 
@@ -125,7 +125,7 @@ msgstr "主机 %{host} 被置备,带有规则 %{rule}"
125
125
  msgid "Unable to provision %{host}: %{errors}"
126
126
  msgstr "无法置备 %{host}:%{errors}"
127
127
 
128
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:170
128
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:171
129
129
  msgid "No rule found for host %s"
130
130
  msgstr "没有为主机 %s 找到规则"
131
131
 
@@ -133,11 +133,11 @@ msgstr "没有为主机 %s 找到规则"
133
133
  msgid "Execute rules against all currently discovered hosts"
134
134
  msgstr "对当前所有发现主机执行规则"
135
135
 
136
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:176
136
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:177
137
137
  msgid "Errors during auto provisioning: %s"
138
138
  msgstr "自动置备期间出错:%s"
139
139
 
140
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:179
140
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:180
141
141
  msgid "No discovered hosts to provision"
142
142
  msgstr "没有要置备的发现主机"
143
143
 
@@ -157,7 +157,7 @@ msgstr "重启发现主机"
157
157
  msgid "Rebooting all discovered hosts"
158
158
  msgstr "重启所有发现主机"
159
159
 
160
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:132
160
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:133
161
161
  msgid "Discovered hosts are rebooting now"
162
162
  msgstr "现在正在重启发现主机"
163
163
 
@@ -241,71 +241,71 @@ msgstr "没有要重启的发现主机"
241
241
  msgid "Successfully provisioned %s"
242
242
  msgstr "已成功置备 %s"
243
243
 
244
- #: ../app/controllers/discovered_hosts_controller.rb:100
244
+ #: ../app/controllers/discovered_hosts_controller.rb:101
245
245
  msgid "Facts refreshed for %s"
246
246
  msgstr "%s 的事实已刷新"
247
247
 
248
- #: ../app/controllers/discovered_hosts_controller.rb:102
248
+ #: ../app/controllers/discovered_hosts_controller.rb:103
249
249
  msgid "Failed to refresh facts for %s"
250
250
  msgstr "%s 的事实刷新失败"
251
251
 
252
- #: ../app/controllers/discovered_hosts_controller.rb:105
252
+ #: ../app/controllers/discovered_hosts_controller.rb:106
253
253
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
254
254
  msgstr "为 %{hostname} 刷新事实失败,错误为 %{error_message}"
255
255
 
256
- #: ../app/controllers/discovered_hosts_controller.rb:112
256
+ #: ../app/controllers/discovered_hosts_controller.rb:113
257
257
  msgid "Host of type %s can not be rebooted"
258
258
  msgstr "%s 类型的主机不能重启"
259
259
 
260
- #: ../app/controllers/discovered_hosts_controller.rb:116
260
+ #: ../app/controllers/discovered_hosts_controller.rb:117
261
261
  msgid "Rebooting host %s"
262
262
  msgstr "正在重启主机 %s"
263
263
 
264
- #: ../app/controllers/discovered_hosts_controller.rb:118
264
+ #: ../app/controllers/discovered_hosts_controller.rb:119
265
265
  msgid "Failed to reboot host %s"
266
266
  msgstr "重启主机 %s 失败"
267
267
 
268
- #: ../app/controllers/discovered_hosts_controller.rb:121
268
+ #: ../app/controllers/discovered_hosts_controller.rb:122
269
269
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
270
270
  msgstr "重启主机 %{hostname} 失败,错误为 %{error_message}"
271
271
 
272
- #: ../app/controllers/discovered_hosts_controller.rb:135
272
+ #: ../app/controllers/discovered_hosts_controller.rb:136
273
273
  msgid "Failed to reboot hosts with error %s"
274
274
  msgstr "无法重启主机,错误 %s"
275
275
 
276
- #: ../app/controllers/discovered_hosts_controller.rb:153
276
+ #: ../app/controllers/discovered_hosts_controller.rb:154
277
277
  msgid "Destroyed selected hosts"
278
278
  msgstr "销毁选定的主机"
279
279
 
280
- #: ../app/controllers/discovered_hosts_controller.rb:155
280
+ #: ../app/controllers/discovered_hosts_controller.rb:156
281
281
  msgid "The following hosts were not deleted: %s"
282
282
  msgstr "以下主机没有删除:%s"
283
283
 
284
- #: ../app/controllers/discovered_hosts_controller.rb:167
284
+ #: ../app/controllers/discovered_hosts_controller.rb:168
285
285
  msgid "Failed to auto provision host %s: %s"
286
286
  msgstr "无法自动置备主机 %s:%s"
287
287
 
288
- #: ../app/controllers/discovered_hosts_controller.rb:195
288
+ #: ../app/controllers/discovered_hosts_controller.rb:196
289
289
  msgid "Discovered hosts are provisioning now"
290
290
  msgstr "现在发现主机正在置备"
291
291
 
292
- #: ../app/controllers/discovered_hosts_controller.rb:280
292
+ #: ../app/controllers/discovered_hosts_controller.rb:285
293
293
  msgid "Discovered host reported from unknown subnet, communication will not be proxied."
294
294
  msgstr "从未知子网报告发现的主机,通信数据将不会被代理。"
295
295
 
296
- #: ../app/controllers/discovered_hosts_controller.rb:285
296
+ #: ../app/controllers/discovered_hosts_controller.rb:290
297
297
  msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
298
298
  msgstr "从未知子网报告发现的主机为 %s,通信数据将不会被代理。"
299
299
 
300
- #: ../app/controllers/discovered_hosts_controller.rb:299
300
+ #: ../app/controllers/discovered_hosts_controller.rb:304
301
301
  msgid "No hosts were found with that id or name"
302
302
  msgstr "找不到具有该 ID 或名称的主机"
303
303
 
304
- #: ../app/controllers/discovered_hosts_controller.rb:303
304
+ #: ../app/controllers/discovered_hosts_controller.rb:308
305
305
  msgid "No hosts selected"
306
306
  msgstr "未选择主机"
307
307
 
308
- #: ../app/controllers/discovered_hosts_controller.rb:309
308
+ #: ../app/controllers/discovered_hosts_controller.rb:314
309
309
  msgid "Something went wrong while selecting hosts - %s"
310
310
  msgstr "选择主机时出错 - %s"
311
311
 
@@ -325,7 +325,7 @@ msgstr "自动置备"
325
325
  msgid "Refresh facts"
326
326
  msgstr "刷新详情"
327
327
 
328
- #: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42 ../lib/foreman_discovery/engine.rb:92
328
+ #: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42 ../lib/foreman_discovery/engine.rb:91
329
329
  msgid "Reboot"
330
330
  msgstr "重启"
331
331
 
@@ -377,7 +377,7 @@ msgstr "最近 7 天内报告"
377
377
  msgid "Provision"
378
378
  msgstr "置备"
379
379
 
380
- #: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:311 ../lib/foreman_discovery/engine.rb:326
380
+ #: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:5 ../lib/foreman_discovery/engine.rb:309 ../lib/foreman_discovery/engine.rb:324
381
381
  msgid "Discovered Hosts"
382
382
  msgstr "发现主机"
383
383
 
@@ -812,7 +812,7 @@ msgstr "克隆 %s"
812
812
  msgid "Edit %s"
813
813
  msgstr "编辑 %s"
814
814
 
815
- #: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:316 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:20
815
+ #: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:314 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:20
816
816
  msgid "Discovery Rules"
817
817
  msgstr "发现规则"
818
818
 
@@ -848,7 +848,7 @@ msgstr "DiscoveryRule|Enabled"
848
848
  msgid "New Discovery Rule"
849
849
  msgstr "新建发现规则"
850
850
 
851
- #: ../app/views/discovery_rules/welcome.html.erb:8
851
+ #: ../app/views/discovery_rules/welcome.html.erb:5
852
852
  msgid "Discovered Rules"
853
853
  msgstr "发现规则"
854
854
 
@@ -920,23 +920,23 @@ msgstr "清除所有详情"
920
920
  msgid "Clean all reported facts during provisioning (except discovery facts)"
921
921
  msgstr "置备期间清除所有报告的详情(发现详情除外)"
922
922
 
923
- #: ../lib/foreman_discovery/engine.rb:78
923
+ #: ../lib/foreman_discovery/engine.rb:79
924
924
  msgid "Hostname facts"
925
925
  msgstr "主机名详情"
926
926
 
927
- #: ../lib/foreman_discovery/engine.rb:79
927
+ #: ../lib/foreman_discovery/engine.rb:80
928
928
  msgid "List of facts to use for the hostname (first wins)"
929
929
  msgstr ""
930
930
 
931
- #: ../lib/foreman_discovery/engine.rb:86
931
+ #: ../lib/foreman_discovery/engine.rb:85
932
932
  msgid "Auto provisioning"
933
933
  msgstr "自动置备"
934
934
 
935
- #: ../lib/foreman_discovery/engine.rb:87
935
+ #: ../lib/foreman_discovery/engine.rb:86
936
936
  msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
937
937
  msgstr "根据置备规则,自动置备新发现主机"
938
938
 
939
- #: ../lib/foreman_discovery/engine.rb:93
939
+ #: ../lib/foreman_discovery/engine.rb:92
940
940
  msgid "Automatically reboot or kexec discovered host during provisioning"
941
941
  msgstr "置备期间自动重启或 kexec 发现主机"
942
942
 
@@ -948,135 +948,135 @@ msgstr "主机名前缀"
948
948
  msgid "The default prefix to use for the host name, must start with a letter"
949
949
  msgstr "使用的主机名默认前缀必须以字母开头"
950
950
 
951
- #: ../lib/foreman_discovery/engine.rb:106
951
+ #: ../lib/foreman_discovery/engine.rb:104
952
952
  msgid "Fact columns"
953
953
  msgstr "详情列"
954
954
 
955
- #: ../lib/foreman_discovery/engine.rb:107
955
+ #: ../lib/foreman_discovery/engine.rb:105
956
956
  msgid "Extra facter columns to show in host lists"
957
957
  msgstr ""
958
958
 
959
- #: ../lib/foreman_discovery/engine.rb:112
959
+ #: ../lib/foreman_discovery/engine.rb:110
960
960
  msgid "Highlighted facts"
961
961
  msgstr "高亮详情"
962
962
 
963
- #: ../lib/foreman_discovery/engine.rb:113
963
+ #: ../lib/foreman_discovery/engine.rb:111
964
964
  msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
965
965
  msgstr "组织高亮部分详情的正则表达式 - 例如 ^(abc|cde)$"
966
966
 
967
- #: ../lib/foreman_discovery/engine.rb:118
967
+ #: ../lib/foreman_discovery/engine.rb:116
968
968
  msgid "Storage facts"
969
969
  msgstr "存储详情"
970
970
 
971
- #: ../lib/foreman_discovery/engine.rb:119
971
+ #: ../lib/foreman_discovery/engine.rb:117
972
972
  msgid "Regex to organize facts for storage section"
973
973
  msgstr "组织存储部分详情的正则表达式"
974
974
 
975
- #: ../lib/foreman_discovery/engine.rb:124
975
+ #: ../lib/foreman_discovery/engine.rb:122
976
976
  msgid "Software facts"
977
977
  msgstr "软件详情"
978
978
 
979
- #: ../lib/foreman_discovery/engine.rb:125
979
+ #: ../lib/foreman_discovery/engine.rb:123
980
980
  msgid "Regex to organize facts for software section"
981
981
  msgstr "组织软件部分详情的正则表达式"
982
982
 
983
- #: ../lib/foreman_discovery/engine.rb:130
983
+ #: ../lib/foreman_discovery/engine.rb:128
984
984
  msgid "Hardware facts"
985
985
  msgstr "硬件详情"
986
986
 
987
- #: ../lib/foreman_discovery/engine.rb:131
987
+ #: ../lib/foreman_discovery/engine.rb:129
988
988
  msgid "Regex to organize facts for hardware section"
989
989
  msgstr "组织硬件部分详情的正则表达式"
990
990
 
991
- #: ../lib/foreman_discovery/engine.rb:136
991
+ #: ../lib/foreman_discovery/engine.rb:134
992
992
  msgid "Network facts"
993
993
  msgstr "网络详情"
994
994
 
995
- #: ../lib/foreman_discovery/engine.rb:137
995
+ #: ../lib/foreman_discovery/engine.rb:135
996
996
  msgid "Regex to organize facts for network section"
997
997
  msgstr "组织网络部分详情的正则表达式"
998
998
 
999
- #: ../lib/foreman_discovery/engine.rb:142
999
+ #: ../lib/foreman_discovery/engine.rb:140
1000
1000
  msgid "IPMI facts"
1001
1001
  msgstr "IPMI 详情"
1002
1002
 
1003
- #: ../lib/foreman_discovery/engine.rb:143
1003
+ #: ../lib/foreman_discovery/engine.rb:141
1004
1004
  msgid "Regex to organize facts for ipmi section"
1005
1005
  msgstr "组织 ipmi 部分详情的正则表达式"
1006
1006
 
1007
- #: ../lib/foreman_discovery/engine.rb:148
1007
+ #: ../lib/foreman_discovery/engine.rb:146
1008
1008
  msgid "Lock PXE"
1009
1009
  msgstr "锁定 PXE"
1010
1010
 
1011
- #: ../lib/foreman_discovery/engine.rb:149
1011
+ #: ../lib/foreman_discovery/engine.rb:147
1012
1012
  msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
1013
1013
  msgstr "自动生成 PXE 配置,以将新发现主机固定至发现"
1014
1014
 
1015
- #: ../lib/foreman_discovery/engine.rb:155
1015
+ #: ../lib/foreman_discovery/engine.rb:153
1016
1016
  msgid "Locked PXELinux template name"
1017
1017
  msgstr "锁定的 PXELinux 模板名称"
1018
1018
 
1019
- #: ../lib/foreman_discovery/engine.rb:156
1019
+ #: ../lib/foreman_discovery/engine.rb:154
1020
1020
  msgid "PXELinux template to be used when pinning a host to discovery"
1021
1021
  msgstr "将主机固定至发现时使用的 PXELinux 模板"
1022
1022
 
1023
- #: ../lib/foreman_discovery/engine.rb:162
1023
+ #: ../lib/foreman_discovery/engine.rb:160
1024
1024
  msgid "Locked PXEGrub template name"
1025
1025
  msgstr "锁定的 PXEGrub 模板名称"
1026
1026
 
1027
- #: ../lib/foreman_discovery/engine.rb:163
1027
+ #: ../lib/foreman_discovery/engine.rb:161
1028
1028
  msgid "PXEGrub template to be used when pinning a host to discovery"
1029
1029
  msgstr "将主机固定至发现时使用的 PXEGrub 模板"
1030
1030
 
1031
- #: ../lib/foreman_discovery/engine.rb:169
1031
+ #: ../lib/foreman_discovery/engine.rb:167
1032
1032
  msgid "Locked PXEGrub2 template name"
1033
1033
  msgstr "锁定的 PXEGrub2 模板名称"
1034
1034
 
1035
- #: ../lib/foreman_discovery/engine.rb:170
1035
+ #: ../lib/foreman_discovery/engine.rb:168
1036
1036
  msgid "PXEGrub2 template to be used when pinning a host to discovery"
1037
1037
  msgstr "将主机固定至发现时使用的 PXEGrub2 模板"
1038
1038
 
1039
- #: ../lib/foreman_discovery/engine.rb:175
1039
+ #: ../lib/foreman_discovery/engine.rb:173
1040
1040
  msgid "Force DNS"
1041
1041
  msgstr "强制 DNS"
1042
1042
 
1043
- #: ../lib/foreman_discovery/engine.rb:176
1043
+ #: ../lib/foreman_discovery/engine.rb:174
1044
1044
  msgid "Force DNS entries creation when provisioning discovered host"
1045
1045
  msgstr "置备发现主机时强制 DNS 条目创建"
1046
1046
 
1047
- #: ../lib/foreman_discovery/engine.rb:181
1047
+ #: ../lib/foreman_discovery/engine.rb:179
1048
1048
  msgid "Error on existing NIC"
1049
1049
  msgstr "已存在的 NIC 上的错误"
1050
1050
 
1051
- #: ../lib/foreman_discovery/engine.rb:182
1051
+ #: ../lib/foreman_discovery/engine.rb:180
1052
1052
  msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
1053
1053
  msgstr "不允许发现匹配一个置备 NIC 的 MAC 的已存在的管理的主机(早期出现错误)"
1054
1054
 
1055
- #: ../lib/foreman_discovery/engine.rb:188
1055
+ #: ../lib/foreman_discovery/engine.rb:186
1056
1056
  msgid "Type of name generator"
1057
1057
  msgstr "名称生成器类型"
1058
1058
 
1059
- #: ../lib/foreman_discovery/engine.rb:189
1059
+ #: ../lib/foreman_discovery/engine.rb:187
1060
1060
  msgid "Discovery hostname naming pattern"
1061
1061
  msgstr "发现主机名的名称特征"
1062
1062
 
1063
- #: ../lib/foreman_discovery/engine.rb:194
1063
+ #: ../lib/foreman_discovery/engine.rb:192
1064
1064
  msgid "Prefer IPv6"
1065
1065
  msgstr "首选使用 IPv6"
1066
1066
 
1067
- #: ../lib/foreman_discovery/engine.rb:195
1067
+ #: ../lib/foreman_discovery/engine.rb:193
1068
1068
  msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
1069
1069
  msgstr "在调用发现节点时,首选 IPv6 而不是 IPv4"
1070
1070
 
1071
- #: ../lib/foreman_discovery/engine.rb:335
1071
+ #: ../lib/foreman_discovery/engine.rb:333
1072
1072
  msgid "Discovery Proxy"
1073
1073
  msgstr "发现代理服务器"
1074
1074
 
1075
- #: ../lib/foreman_discovery/engine.rb:336
1075
+ #: ../lib/foreman_discovery/engine.rb:334
1076
1076
  msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1077
1077
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
1078
1078
 
1079
- #: ../lib/foreman_discovery/engine.rb:337
1079
+ #: ../lib/foreman_discovery/engine.rb:335
1080
1080
  msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1081
1081
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
1082
1082