foreman_inventory_upload 1.0.2 → 1.0.3
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
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 031c5daa79d53eed18f2309a4e150bf56924a2505b2cc499cb5414d356259620
|
|
4
|
+
data.tar.gz: b556b5dd6096278b968e8d7cb45d0787e8b962929c7bbee132af90a5f55924ab
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f14b68919515e12782749b198150607f3efe5f7ed30e68ccb38e357ad9974e7e871165db1e4596e0105c48866c438c075ee93627934449e1f14a7b0b5b0bbee7
|
|
7
|
+
data.tar.gz: 1e50386373ce4c7ae55eea6f4117d193f9b5d3dea17e1a638430ddddeda48cd3961695b76c03c19c6230c574163fd917fd5c72aba378363f72b8b1328760d7a6
|
|
@@ -25,10 +25,19 @@ module ForemanInventoryUpload
|
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
def env
|
|
28
|
-
super.merge(
|
|
28
|
+
env_vars = super.merge(
|
|
29
29
|
'FILES' => @filename,
|
|
30
30
|
'CER_PATH' => @cer_path
|
|
31
31
|
)
|
|
32
|
+
if http_proxy_string
|
|
33
|
+
env_vars['http_proxy'] = http_proxy_string
|
|
34
|
+
env_vars['https_proxy'] = http_proxy_string
|
|
35
|
+
end
|
|
36
|
+
env_vars
|
|
37
|
+
end
|
|
38
|
+
|
|
39
|
+
def http_proxy_string
|
|
40
|
+
@http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
|
|
32
41
|
end
|
|
33
42
|
|
|
34
43
|
def rh_credentials
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_inventory_upload
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Inventory upload team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-12-
|
|
11
|
+
date: 2019-12-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: katello
|
|
@@ -334,12 +334,12 @@ signing_key:
|
|
|
334
334
|
specification_version: 4
|
|
335
335
|
summary: Summary of ForemanInventoryUpload.
|
|
336
336
|
test_files:
|
|
337
|
-
- test/controllers/uploads_controller_test.rb
|
|
338
337
|
- test/controllers/accounts_controller_test.rb
|
|
339
338
|
- test/controllers/reports_controller_test.rb
|
|
340
|
-
- test/
|
|
339
|
+
- test/controllers/uploads_controller_test.rb
|
|
341
340
|
- test/factories/inventory_upload_factories.rb
|
|
342
|
-
- test/
|
|
343
|
-
- test/unit/metadata_generator_test.rb
|
|
341
|
+
- test/test_plugin_helper.rb
|
|
344
342
|
- test/unit/archived_report_generator_test.rb
|
|
343
|
+
- test/unit/metadata_generator_test.rb
|
|
344
|
+
- test/unit/shell_process_job_test.rb
|
|
345
345
|
- test/unit/slice_generator_test.rb
|