foreman_discovery 7.0.0 → 7.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eb5bd6046ce32fec83f20be39d6a013432f3b68a
4
- data.tar.gz: a731fce4e700240569682ad27870e595c877cad7
3
+ metadata.gz: 946b59f0bacb0bb204abb6c4cf2920b74617e463
4
+ data.tar.gz: 7470dd4f66cc9af997f2819ec564e00208323af0
5
5
  SHA512:
6
- metadata.gz: 4062bb0efcd048821962c566f1b33ac4151caaf09d9a1787116a78cbefa5f38eb48afcb135502f25d31fe0270a6c973636ec77ac56d66c4f1d9c4e616a2d9478
7
- data.tar.gz: 274935dfa8429e46473404b331b346b528467872e23b4d49eecdab59f5fe4b3eb5690d61905db2bc509d4558242a7ad9645b9dd42b009a18a82ba16785559da3
6
+ metadata.gz: 7bcdb1beeba717b1f8e6afb27e03321dc1e50fdeb1ff98f3bfc2f4ec676192df9db874806667915be7277a58cf91e0f221c3c65438a4b8ced5ff197405e5433d
7
+ data.tar.gz: dae728a38739b49ca16b1534f2458ed04203bbc48f171a67f153a479f03374b66f0b620081a769ec7f0a4cf1beb773e3a5c013bbc3adabc069ed626349335954
@@ -1,7 +1,6 @@
1
1
  module Foreman::Controller::Parameters::DiscoveredHost
2
2
  extend ActiveSupport::Concern
3
3
  include Foreman::Controller::Parameters::HostBase
4
- include Foreman::Controller::Parameters::HostCommon
5
4
 
6
5
  class_methods do
7
6
  def discovered_host_params_filter
@@ -9,7 +8,6 @@ module Foreman::Controller::Parameters::DiscoveredHost
9
8
  filter.permit :discovery_rule_id
10
9
 
11
10
  add_host_base_params_filter(filter)
12
- add_host_common_params_filter(filter)
13
11
  end
14
12
  end
15
13
  end
@@ -0,0 +1,18 @@
1
+ module ForemanDiscovery
2
+ module Concerns
3
+ module HostsControllerExtensions
4
+ extend ActiveSupport::Concern
5
+ included do
6
+ before_action :set_discovered_params
7
+ end
8
+
9
+ # Change params to what the hosts controller expects. Certain methods
10
+ # in the hosts controller like all the _selected methods, taxonomy_scope,
11
+ # etc.. expect a params[:host] to work.
12
+ def set_discovered_params
13
+ return unless request.path.match(/discovered_hosts/).present?
14
+ params[:host] ||= params[:discovered_host]
15
+ end
16
+ end
17
+ end
18
+ end
@@ -7,7 +7,7 @@ module Nic::ManagedExtensions
7
7
 
8
8
  def discovery_queue_rebuild_dns
9
9
  return unless (dns? || dns6? || reverse_dns? || reverse_dns6?) && errors.empty? && Setting[:discovery_always_rebuild_dns]
10
- return if self.host.new_record? # Discovered Hosts already exist, and new_records will break `find`
10
+ return if self.host.new_record? || old.nil? # Discovered Hosts already exist, and new_records will break `find`
11
11
  return unless self.host.type_changed? and ::Host::Base.find(self.host.id).type == "Host::Discovered"
12
12
  return if self.pending_dns_record_changes?
13
13
  logger.debug "Queuing DNS rebuild for #{self}"
@@ -1,18 +1,9 @@
1
1
  class AddMissingViewPermissions < ActiveRecord::Migration
2
2
  def up
3
- permissions = [
4
- "view_architectures", "view_domains", "view_environments", "view_hosts",
5
- "view_hostgroups", "view_media", "view_models", "view_operatingsystems",
6
- "view_provisioning_templates", "view_ptables", "view_puppetclasses",
7
- "view_realms", "view_smart_proxies", "view_subnets"
8
- ]
9
- role = Role.find_by_name("Discovery Reader")
10
- role.add_permissions!(permissions) if role
11
- role = Role.find_by_name("Discovery Manager")
12
- role.add_permissions!(permissions + ["create_hosts"]) if role
3
+ # migration renamed to db/migrate/20160818091421_add_missing_view_permissions2.rb
13
4
  end
14
5
 
15
6
  def down
16
- # not implemented
7
+ # migration renamed to db/migrate/20160818091421_add_missing_view_permissions2.rb
17
8
  end
18
9
  end
@@ -0,0 +1,15 @@
1
+ class AddPermissionsFromDefaultRoles < ActiveRecord::Migration
2
+ def up
3
+ default_permissions = Foreman::Plugin.find("foreman_discovery").default_roles
4
+ ["Discovery Reader", "Discovery Manager"].each do |role_name|
5
+ role = Role.find_by_name(role_name) || next
6
+ default_permissions[role_name].each do |permission|
7
+ role.add_permissions!(permission) unless role.permission_names.include?(permission.to_sym)
8
+ end
9
+ end
10
+ end
11
+
12
+ def down
13
+ # not implemented
14
+ end
15
+ end
@@ -9,6 +9,7 @@ module ForemanDiscovery
9
9
  class Engine < ::Rails::Engine
10
10
 
11
11
  # support pre-4 Rails versions
12
+ config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_discovery/concerns"]
12
13
  config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
13
14
  config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
14
15
  config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
@@ -194,6 +195,7 @@ module ForemanDiscovery
194
195
  ::Nic::Managed.send :include, Nic::ManagedExtensions
195
196
 
196
197
  # Controller extensions
198
+ ::HostsController.send :include, ForemanDiscovery::Concerns::HostsControllerExtensions
197
199
  ::Api::V2::FactValuesController.send :include, Api::V2::FactValuesControllerExtensions
198
200
 
199
201
  # Include subnet extensions
@@ -1,3 +1,3 @@
1
1
  module ForemanDiscovery
2
- VERSION = "7.0.0"
2
+ VERSION = "7.0.1"
3
3
  end
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: foreman_discovery 7.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2016-07-27 14:13+0200\n"
12
- "PO-Revision-Date: 2016-07-28 09:01+0000\n"
11
+ "POT-Creation-Date: 2016-08-30 16:48+0200\n"
12
+ "PO-Revision-Date: 2016-08-31 08:17+0000\n"
13
13
  "Last-Translator: Lukáš Zapletal\n"
14
14
  "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
15
15
  "MIME-Version: 1.0\n"
@@ -18,176 +18,176 @@ msgstr ""
18
18
  "Language: ca\n"
19
19
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
20
20
 
21
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:15
21
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:16
22
22
  msgid "List all discovered hosts"
23
23
  msgstr "Llista tots els amfitrions descoberts"
24
24
 
25
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:16
26
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:14
25
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
26
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:15
27
27
  msgid "filter results"
28
28
  msgstr "filtra els resultats"
29
29
 
30
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
31
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:15
30
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
31
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:16
32
32
  msgid "sort results"
33
33
  msgstr "ordena els resultats"
34
34
 
35
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
36
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:16
35
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
36
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:17
37
37
  msgid "paginate results"
38
38
  msgstr "pagina els resultats"
39
39
 
40
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
41
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:17
40
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
41
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:18
42
42
  msgid "number of entries per request"
43
43
  msgstr "Nombre d'entrades per petició"
44
44
 
45
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:25
45
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:26
46
46
  msgid "Show a discovered host"
47
47
  msgstr "Mostra un amfitrió descobert"
48
48
 
49
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:39
49
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:40
50
50
  msgid "Create a discovered host for testing (use /facts to create new hosts)"
51
51
  msgstr "Crea un amfitrió descobert per a provar-ho (utilitzeu /facts per crear nous amfitrions)"
52
52
 
53
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:47
53
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:48
54
54
  msgid "Provision a discovered host"
55
55
  msgstr "Aprovisiona un amfitrió descobert"
56
56
 
57
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:52
57
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:53
58
58
  msgid "not required if using a subnet with DHCP proxy"
59
59
  msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari de DHCP"
60
60
 
61
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:53
61
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:54
62
62
  msgid "not required if it's a virtual machine"
63
63
  msgstr ""
64
64
 
65
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
65
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
66
66
  msgid ""
67
67
  "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
68
68
  msgstr ""
69
69
 
70
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
70
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
71
71
  msgid ""
72
72
  "required if value is not inherited from host group or default password in "
73
73
  "settings"
74
74
  msgstr ""
75
75
 
76
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:85
76
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:86
77
77
  msgid "Delete a discovered host"
78
78
  msgstr "Suprimeix un amfitrió descobert"
79
79
 
80
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:92
80
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:93
81
81
  msgid "Upload facts for a host, creating the host if required"
82
82
  msgstr "Puja els objectes d'interès per a un amfitrió, creant el nou amfitrió si fos necessari"
83
83
 
84
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:93
84
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:94
85
85
  msgid ""
86
86
  "hash containing facts for the host with minimum set of facts: "
87
87
  "discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
88
88
  "eth0 (example in case primary interface is named eth0)"
89
89
  msgstr ""
90
90
 
91
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:109
91
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:111
92
92
  msgid "Execute rules against a discovered host"
93
93
  msgstr ""
94
94
 
95
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:115
96
- #: ../app/controllers/discovered_hosts_controller.rb:164
95
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
96
+ #: ../app/controllers/discovered_hosts_controller.rb:165
97
97
  msgid "Host %{host} was provisioned with rule %{rule}"
98
98
  msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
99
99
 
100
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:118
100
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:120
101
101
  msgid "Unable to provision %{host}: %{errors}"
102
102
  msgstr "No es pot aprovisionar a %{host}: %{errors}"
103
103
 
104
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:124
105
- #: ../app/controllers/discovered_hosts_controller.rb:171
104
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
105
+ #: ../app/controllers/discovered_hosts_controller.rb:172
106
106
  msgid "No rule found for host %s"
107
107
  msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
108
108
 
109
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
109
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:133
110
110
  msgid "Execute rules against all currently discovered hosts"
111
111
  msgstr "Executa les regles contra tots els amfitrions detectats actualment"
112
112
 
113
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:135
114
- #: ../app/controllers/discovered_hosts_controller.rb:177
113
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:137
114
+ #: ../app/controllers/discovered_hosts_controller.rb:178
115
115
  msgid "Errors during auto provisioning: %s"
116
116
  msgstr "Erros durant l'auto aprovisionament: %s"
117
117
 
118
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
119
- #: ../app/controllers/discovered_hosts_controller.rb:180
118
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
119
+ #: ../app/controllers/discovered_hosts_controller.rb:181
120
120
  msgid "No discovered hosts to provision"
121
121
  msgstr "Sense amfitrions descoberts per aprovisionar"
122
122
 
123
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:160
123
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:162
124
124
  msgid "%s discovered hosts were provisioned"
125
125
  msgstr "%s amfitrions descoberts van ser aprovisionats"
126
126
 
127
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:171
127
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:173
128
128
  msgid "Refreshing the facts of a discovered host"
129
129
  msgstr "S'estan refrescant els objectes d'interès d'un amfitrió descobert"
130
130
 
131
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
131
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:182
132
132
  msgid "Rebooting a discovered host"
133
133
  msgstr "S'està reiniciant un amfitrió descobert"
134
134
 
135
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:189
135
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
136
136
  msgid "Rebooting all discovered hosts"
137
137
  msgstr "S'estan reiniciant tots els amfitrions descoberts"
138
138
 
139
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
140
- #: ../app/controllers/discovered_hosts_controller.rb:122
139
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:202
140
+ #: ../app/controllers/discovered_hosts_controller.rb:123
141
141
  msgid "Discovered hosts are rebooting now"
142
142
  msgstr "Ara s'estan reiniciant els amfitrions descoberts"
143
143
 
144
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:13
144
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:14
145
145
  msgid "List all discovery rules"
146
146
  msgstr "Llista totes les regles de descobriment"
147
147
 
148
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:23
148
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:24
149
149
  msgid "Show a discovery rule"
150
150
  msgstr "Mostra una regla de descobriment"
151
151
 
152
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:31
152
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:32
153
153
  msgid "represents rule name shown to the users"
154
154
  msgstr "representa el nom de la regla que es mostra als usuaris"
155
155
 
156
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:32
156
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:33
157
157
  msgid "query to match discovered hosts for the particular rule"
158
158
  msgstr ""
159
159
 
160
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:33
160
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:34
161
161
  msgid "the hostgroup that is used to auto provision a host"
162
162
  msgstr "el grup d'amfitrions que s'utilitza per a l'auto aprovisionament d'un amfitrió"
163
163
 
164
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:34
164
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
165
165
  msgid ""
166
166
  "defines a pattern to assign human-readable hostnames to the matching hosts"
167
167
  msgstr ""
168
168
 
169
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
169
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
170
170
  msgid "enables to limit maximum amount of provisioned hosts per rule"
171
171
  msgstr "permet la limitació del nombre total màxim dels amfitrions aprovisionats per cada regla"
172
172
 
173
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
173
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
174
174
  msgid ""
175
175
  "puts the rules in order, low numbers go first. Must be greater then zero"
176
176
  msgstr ""
177
177
 
178
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
178
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
179
179
  msgid "flag is used for temporary shutdown of rules"
180
180
  msgstr ""
181
181
 
182
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:42
182
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:43
183
183
  msgid "Create a discovery rule"
184
184
  msgstr "Crea una regla de descobriment"
185
185
 
186
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:50
186
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:51
187
187
  msgid "Update a rule"
188
188
  msgstr "Actualitza una regla"
189
189
 
190
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:58
190
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:59
191
191
  msgid "Delete a rule"
192
192
  msgstr "Suprimeix una regla"
193
193
 
@@ -211,103 +211,103 @@ msgstr "Errors durant el reinici: %s"
211
211
  msgid "No discovered hosts to reboot"
212
212
  msgstr ""
213
213
 
214
- #: ../app/controllers/discovered_hosts_controller.rb:58
214
+ #: ../app/controllers/discovered_hosts_controller.rb:59
215
215
  msgid "Successfully provisioned %s"
216
216
  msgstr ""
217
217
 
218
- #: ../app/controllers/discovered_hosts_controller.rb:90
218
+ #: ../app/controllers/discovered_hosts_controller.rb:91
219
219
  msgid "Facts refreshed for %s"
220
220
  msgstr "Els objectes d'interès que s'han refrescat per a %s"
221
221
 
222
- #: ../app/controllers/discovered_hosts_controller.rb:92
222
+ #: ../app/controllers/discovered_hosts_controller.rb:93
223
223
  msgid "Failed to refresh facts for %s"
224
224
  msgstr "No s'ha pogut refrescar els objectes d'interès per a %s"
225
225
 
226
- #: ../app/controllers/discovered_hosts_controller.rb:95
226
+ #: ../app/controllers/discovered_hosts_controller.rb:96
227
227
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
228
228
  msgstr ""
229
229
 
230
- #: ../app/controllers/discovered_hosts_controller.rb:102
230
+ #: ../app/controllers/discovered_hosts_controller.rb:103
231
231
  msgid "Host of type %s can not be rebooted"
232
232
  msgstr ""
233
233
 
234
- #: ../app/controllers/discovered_hosts_controller.rb:106
234
+ #: ../app/controllers/discovered_hosts_controller.rb:107
235
235
  msgid "Rebooting host %s"
236
236
  msgstr "S'està reiniciant l'amfitrió %s"
237
237
 
238
- #: ../app/controllers/discovered_hosts_controller.rb:108
238
+ #: ../app/controllers/discovered_hosts_controller.rb:109
239
239
  msgid "Failed to reboot host %s"
240
240
  msgstr "No s'ha pogut reiniciar l'amfitrió %s."
241
241
 
242
- #: ../app/controllers/discovered_hosts_controller.rb:111
242
+ #: ../app/controllers/discovered_hosts_controller.rb:112
243
243
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
244
244
  msgstr ""
245
245
 
246
- #: ../app/controllers/discovered_hosts_controller.rb:125
246
+ #: ../app/controllers/discovered_hosts_controller.rb:126
247
247
  msgid "Failed to reboot hosts with error %s"
248
248
  msgstr ""
249
249
 
250
- #: ../app/controllers/discovered_hosts_controller.rb:139
250
+ #: ../app/controllers/discovered_hosts_controller.rb:140
251
251
  msgid "Destroyed selected hosts"
252
252
  msgstr ""
253
253
 
254
- #: ../app/controllers/discovered_hosts_controller.rb:141
254
+ #: ../app/controllers/discovered_hosts_controller.rb:142
255
255
  msgid "The following hosts were not deleted: %s"
256
256
  msgstr ""
257
257
 
258
- #: ../app/controllers/discovered_hosts_controller.rb:168
258
+ #: ../app/controllers/discovered_hosts_controller.rb:169
259
259
  msgid "Failed to auto provision host %s: %s"
260
260
  msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
261
261
 
262
- #: ../app/controllers/discovered_hosts_controller.rb:196
262
+ #: ../app/controllers/discovered_hosts_controller.rb:197
263
263
  msgid "Discovered hosts are provisioning now"
264
264
  msgstr "Els amfitrions descoberts ara tenen aprovisionament"
265
265
 
266
- #: ../app/controllers/discovered_hosts_controller.rb:225
266
+ #: ../app/controllers/discovered_hosts_controller.rb:226
267
267
  msgid "Highlights"
268
268
  msgstr ""
269
269
 
270
- #: ../app/controllers/discovered_hosts_controller.rb:225
270
+ #: ../app/controllers/discovered_hosts_controller.rb:226
271
271
  msgid "Storage"
272
272
  msgstr ""
273
273
 
274
- #: ../app/controllers/discovered_hosts_controller.rb:225
274
+ #: ../app/controllers/discovered_hosts_controller.rb:226
275
275
  msgid "Hardware"
276
276
  msgstr ""
277
277
 
278
- #: ../app/controllers/discovered_hosts_controller.rb:225
278
+ #: ../app/controllers/discovered_hosts_controller.rb:226
279
279
  msgid "Network"
280
280
  msgstr ""
281
281
 
282
- #: ../app/controllers/discovered_hosts_controller.rb:225
282
+ #: ../app/controllers/discovered_hosts_controller.rb:226
283
283
  msgid "Software"
284
284
  msgstr ""
285
285
 
286
- #: ../app/controllers/discovered_hosts_controller.rb:225
286
+ #: ../app/controllers/discovered_hosts_controller.rb:226
287
287
  msgid "IPMI"
288
288
  msgstr ""
289
289
 
290
- #: ../app/controllers/discovered_hosts_controller.rb:225
290
+ #: ../app/controllers/discovered_hosts_controller.rb:226
291
291
  msgid "Miscellaneous"
292
292
  msgstr ""
293
293
 
294
- #: ../app/controllers/discovered_hosts_controller.rb:302
294
+ #: ../app/controllers/discovered_hosts_controller.rb:303
295
295
  msgid "No hosts were found with that id or name"
296
296
  msgstr "No s'ha trobat cap amfitrió amb aquest id. o nom"
297
297
 
298
- #: ../app/controllers/discovered_hosts_controller.rb:306
298
+ #: ../app/controllers/discovered_hosts_controller.rb:307
299
299
  msgid "No hosts selected"
300
300
  msgstr "Cap amfitrió seleccionat"
301
301
 
302
- #: ../app/controllers/discovered_hosts_controller.rb:312
302
+ #: ../app/controllers/discovered_hosts_controller.rb:313
303
303
  msgid "Something went wrong while selecting hosts - %s"
304
304
  msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
305
305
 
306
- #: ../app/controllers/discovery_rules_controller.rb:66
306
+ #: ../app/controllers/discovery_rules_controller.rb:68
307
307
  msgid "Rule enabled"
308
308
  msgstr "Regla habilitada"
309
309
 
310
- #: ../app/controllers/discovery_rules_controller.rb:66
310
+ #: ../app/controllers/discovery_rules_controller.rb:68
311
311
  msgid "Rule disabled"
312
312
  msgstr "Regla inhabilitada"
313
313
 
@@ -316,76 +316,75 @@ msgid "%s ago"
316
316
  msgstr "fa %s"
317
317
 
318
318
  #: ../app/helpers/discovered_hosts_helper.rb:14
319
- #: ../app/helpers/discovered_hosts_helper.rb:94
320
- msgid "Provision"
321
- msgstr "Aprovisiona"
322
-
323
- #: ../app/helpers/discovered_hosts_helper.rb:15
324
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:74
319
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
325
320
  msgid "Auto Provision"
326
321
  msgstr "Auto aprovisiona"
327
322
 
328
- #: ../app/helpers/discovered_hosts_helper.rb:16
329
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:75
323
+ #: ../app/helpers/discovered_hosts_helper.rb:15
324
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
330
325
  msgid "Refresh facts"
331
326
  msgstr "Refresca els objectes d'interès"
332
327
 
333
- #: ../app/helpers/discovered_hosts_helper.rb:17
328
+ #: ../app/helpers/discovered_hosts_helper.rb:16
334
329
  #: ../app/models/setting/discovered.rb:23
335
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:76
330
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
336
331
  msgid "Reboot"
337
332
  msgstr "Reinicia"
338
333
 
339
- #: ../app/helpers/discovered_hosts_helper.rb:20
334
+ #: ../app/helpers/discovered_hosts_helper.rb:19
340
335
  msgid "Back"
341
336
  msgstr "Enrere"
342
337
 
343
- #: ../app/helpers/discovered_hosts_helper.rb:22
344
- #: ../app/helpers/discovered_hosts_helper.rb:39
338
+ #: ../app/helpers/discovered_hosts_helper.rb:21
339
+ #: ../app/helpers/discovered_hosts_helper.rb:38
345
340
  msgid "Select Action"
346
341
  msgstr "Selecciona l'acció"
347
342
 
348
- #: ../app/helpers/discovered_hosts_helper.rb:24
343
+ #: ../app/helpers/discovered_hosts_helper.rb:23
349
344
  msgid "Expand All"
350
345
  msgstr "Expandeix-ho tot"
351
346
 
352
- #: ../app/helpers/discovered_hosts_helper.rb:29
353
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:77
347
+ #: ../app/helpers/discovered_hosts_helper.rb:28
348
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
354
349
  msgid "Delete %s?"
355
350
  msgstr "Voleu suprimir %s?"
356
351
 
357
- #: ../app/helpers/discovered_hosts_helper.rb:35
352
+ #: ../app/helpers/discovered_hosts_helper.rb:34
358
353
  msgid "Delete hosts"
359
354
  msgstr "Suprimeix els amfitrions"
360
355
 
361
- #: ../app/helpers/discovered_hosts_helper.rb:36
356
+ #: ../app/helpers/discovered_hosts_helper.rb:35
362
357
  msgid "Assign Organization"
363
358
  msgstr "Assigna l'organització"
364
359
 
365
- #: ../app/helpers/discovered_hosts_helper.rb:37
360
+ #: ../app/helpers/discovered_hosts_helper.rb:36
366
361
  msgid "Assign Location"
367
362
  msgstr "Assigna la ubicació"
368
363
 
369
- #: ../app/helpers/discovered_hosts_helper.rb:41
364
+ #: ../app/helpers/discovered_hosts_helper.rb:40
370
365
  msgid "%s - The following hosts are about to be changed"
371
366
  msgstr "%s - Els següents amfitrions estan a punt de ser canviats"
372
367
 
373
- #: ../app/helpers/discovered_hosts_helper.rb:50
368
+ #: ../app/helpers/discovered_hosts_helper.rb:49
374
369
  msgid "N/A"
375
370
  msgstr "N/D"
376
371
 
377
- #: ../app/helpers/discovered_hosts_helper.rb:62
372
+ #: ../app/helpers/discovered_hosts_helper.rb:61
378
373
  msgid "New in the last 24 hours"
379
374
  msgstr "Nou en les últimes 24 hores"
380
375
 
381
- #: ../app/helpers/discovered_hosts_helper.rb:66
376
+ #: ../app/helpers/discovered_hosts_helper.rb:65
382
377
  msgid "Not reported in more than 7 days"
383
378
  msgstr "No es va informar en més de 7 dies"
384
379
 
385
- #: ../app/helpers/discovered_hosts_helper.rb:70
380
+ #: ../app/helpers/discovered_hosts_helper.rb:69
386
381
  msgid "Reported in the last 7 days"
387
382
  msgstr "Es va informar en els últims 7 dies"
388
383
 
384
+ #: ../app/helpers/discovered_hosts_helper.rb:93
385
+ msgid "Provision"
386
+ msgstr "Aprovisiona"
387
+
389
388
  #: ../app/helpers/discovery_rules_helper.rb:26
390
389
  msgid "Discovered Hosts"
391
390
  msgstr ""
@@ -422,15 +421,15 @@ msgstr ""
422
421
  msgid "Discovered hosts summary"
423
422
  msgstr ""
424
423
 
425
- #: ../app/models/discovery_rule.rb:11
424
+ #: ../app/models/discovery_rule.rb:9
426
425
  msgid "can't contain white spaces."
427
426
  msgstr "no pot contenir espais en blanc."
428
427
 
429
- #: ../app/models/discovery_rule.rb:13
428
+ #: ../app/models/discovery_rule.rb:11
430
429
  msgid "must start with a letter or ERB."
431
430
  msgstr "ha de començar amb una lletra o ERB."
432
431
 
433
- #: ../app/models/discovery_rule.rb:47
432
+ #: ../app/models/discovery_rule.rb:45
434
433
  msgid ""
435
434
  "Host group organization %s must also be associated to the discovery rule"
436
435
  msgid_plural ""
@@ -438,71 +437,67 @@ msgid_plural ""
438
437
  msgstr[0] ""
439
438
  msgstr[1] ""
440
439
 
441
- #: ../app/models/discovery_rule.rb:53
440
+ #: ../app/models/discovery_rule.rb:51
442
441
  msgid "Host group location %s must also be associated to the discovery rule"
443
442
  msgid_plural ""
444
443
  "Host group locations %s must also be associated to the discovery rule"
445
444
  msgstr[0] ""
446
445
  msgstr[1] ""
447
446
 
448
- #: ../app/models/host/discovered.rb:35
447
+ #: ../app/models/host/discovered.rb:33
449
448
  msgid "Invalid facts, must be a Hash"
450
449
  msgstr "Objectes d'interès no vàlids, han de tenir un Hash"
451
450
 
452
- #: ../app/models/host/discovered.rb:40
451
+ #: ../app/models/host/discovered.rb:38
453
452
  msgid ""
454
453
  "Expected discovery_fact '%s' is missing, unable to detect primary interface "
455
454
  "and set hostname"
456
455
  msgstr ""
457
456
 
458
- #: ../app/models/host/discovered.rb:47
457
+ #: ../app/models/host/discovered.rb:45
459
458
  msgid ""
460
459
  "Invalid facts: hash does not contain a valid value for any of the facts in "
461
460
  "the discovery_hostname setting: %s"
462
461
  msgstr ""
463
462
 
464
- #: ../app/models/host/discovered.rb:64
463
+ #: ../app/models/host/discovered.rb:62
465
464
  msgid "Facts could not be imported"
466
465
  msgstr ""
467
466
 
468
- #: ../app/models/host/discovered.rb:114
467
+ #: ../app/models/host/discovered.rb:112
469
468
  msgid "Unable to assign subnet, primary interface is missing IP address"
470
469
  msgstr ""
471
470
 
472
- #: ../app/models/host/discovered.rb:168
471
+ #: ../app/models/host/discovered.rb:166
473
472
  msgid "Could not get facts from proxy %{url}: %{error}"
474
473
  msgstr "No s'han pogut obtenir els objectes d'interès del servidor intermediari %{url}: %{error}"
475
474
 
476
- #: ../app/models/host/discovered.rb:184
475
+ #: ../app/models/host/discovered.rb:182
477
476
  msgid "Unable to reboot %{name} via %{url}: %{msg}"
478
477
  msgstr "No es pot reiniciar %{name} a través de %{url}: %{msg}"
479
478
 
480
- #: ../app/models/host/discovered.rb:192
479
+ #: ../app/models/host/discovered.rb:190
481
480
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
482
481
  msgstr "No es pot realitzar kexec a %{name} a través de %{url}: %{msg}"
483
482
 
484
- #: ../app/models/host/discovered.rb:211
483
+ #: ../app/models/host/discovered.rb:209
485
484
  msgid "Invalid hostname: Could not normalize the hostname"
486
485
  msgstr ""
487
486
 
488
- #: ../app/models/host/managed_extensions.rb:24
487
+ #: ../app/models/host/managed_extensions.rb:23
489
488
  msgid "Reloading kernel on %s"
490
489
  msgstr "S'està tornant a carregar el kernel a %s"
491
490
 
492
- #: ../app/models/host/managed_extensions.rb:26
491
+ #: ../app/models/host/managed_extensions.rb:25
493
492
  msgid "Rebooting %s"
494
493
  msgstr "S'està reiniciant %s"
495
494
 
496
495
  #: ../app/models/host/managed_extensions.rb:45
497
- msgid "Operating system not set for host/hostgroup"
496
+ msgid "Kexec template not associated with operating system"
498
497
  msgstr ""
499
498
 
500
- #: ../app/models/host/managed_extensions.rb:47
501
- msgid "Medium not set for host/hostgroup"
502
- msgstr ""
503
-
504
- #: ../app/models/host/managed_extensions.rb:54
505
- msgid "Kexec template not associated with operating system"
499
+ #: ../app/models/nic/managed_extensions.rb:14
500
+ msgid "Rebuild DNS for %s"
506
501
  msgstr ""
507
502
 
508
503
  #: ../app/models/setting/discovered.rb:19
@@ -625,19 +620,27 @@ msgstr ""
625
620
  msgid "Locked template name"
626
621
  msgstr ""
627
622
 
628
- #: ../app/models/setting/discovered.rb:40
623
+ #: ../app/models/setting/discovered.rb:34
624
+ msgid "Force DNS entries creation when provisioning discovered host"
625
+ msgstr ""
626
+
627
+ #: ../app/models/setting/discovered.rb:34
628
+ msgid "Force DNS"
629
+ msgstr ""
630
+
631
+ #: ../app/models/setting/discovered.rb:41
629
632
  msgid "The default location to place discovered hosts in"
630
633
  msgstr ""
631
634
 
632
- #: ../app/models/setting/discovered.rb:40
635
+ #: ../app/models/setting/discovered.rb:41
633
636
  msgid "Discovery location"
634
637
  msgstr ""
635
638
 
636
- #: ../app/models/setting/discovered.rb:48
639
+ #: ../app/models/setting/discovered.rb:49
637
640
  msgid "The default organization to place discovered hosts in"
638
641
  msgstr ""
639
642
 
640
- #: ../app/models/setting/discovered.rb:48
643
+ #: ../app/models/setting/discovered.rb:49
641
644
  msgid "Discovery organization"
642
645
  msgstr ""
643
646
 
@@ -685,6 +688,18 @@ msgstr "Les CPU"
685
688
  msgid "Memory"
686
689
  msgstr "Memòria"
687
690
 
691
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:7
692
+ msgid "Select initial host properties"
693
+ msgstr ""
694
+
695
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
696
+ msgid "Quick create"
697
+ msgstr ""
698
+
699
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:25
700
+ msgid "Create host"
701
+ msgstr ""
702
+
688
703
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
689
704
  #: ../lib/foreman_discovery/engine.rb:147
690
705
  msgid "Discovered hosts"
@@ -741,27 +756,15 @@ msgstr "Subxarxa"
741
756
  msgid "Last facts upload"
742
757
  msgstr "Última pujada dels objectes d'interès"
743
758
 
744
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
745
- msgid "Select initial host properties"
746
- msgstr ""
747
-
748
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:65
749
- msgid "Quick create"
750
- msgstr ""
751
-
752
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:66
753
- msgid "Create host"
754
- msgstr ""
755
-
756
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:88
759
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:60
757
760
  msgid "Please Confirm"
758
761
  msgstr "Si us plau, confirmeu"
759
762
 
760
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:94
763
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:66
761
764
  msgid "Cancel"
762
765
  msgstr "Cancel·la"
763
766
 
764
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:95
767
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:67
765
768
  msgid "Submit"
766
769
  msgstr "Envia"
767
770
 
@@ -795,19 +798,23 @@ msgstr "Selecciona l'organització"
795
798
  msgid "Discovered host: %s"
796
799
  msgstr "Amfitrions descoberts: %s"
797
800
 
798
- #: ../app/views/discovered_hosts/show.html.erb:24
801
+ #: ../app/views/discovered_hosts/show.html.erb:34
799
802
  msgid "Interfaces"
800
803
  msgstr ""
801
804
 
802
- #: ../app/views/discovered_hosts/show.html.erb:32
805
+ #: ../app/views/discovered_hosts/show.html.erb:41
806
+ msgid "Type"
807
+ msgstr ""
808
+
809
+ #: ../app/views/discovered_hosts/show.html.erb:42
803
810
  msgid "Identifier"
804
811
  msgstr "Identificador"
805
812
 
806
- #: ../app/views/discovered_hosts/show.html.erb:33
813
+ #: ../app/views/discovered_hosts/show.html.erb:43
807
814
  msgid "MAC address"
808
815
  msgstr "Adreça MAC"
809
816
 
810
- #: ../app/views/discovered_hosts/show.html.erb:34
817
+ #: ../app/views/discovered_hosts/show.html.erb:44
811
818
  msgid "IP address"
812
819
  msgstr "Adreça IP"
813
820
 
@@ -955,6 +962,6 @@ msgstr ""
955
962
  msgid "Discovery rules"
956
963
  msgstr "Regles de descobriment"
957
964
 
958
- #: ../lib/foreman_discovery/engine.rb:157
965
+ #: ../lib/foreman_discovery/engine.rb:162
959
966
  msgid "Discovery widget"
960
967
  msgstr "Estri de descobriment"