puppet_litmus 0.26.1 → 0.26.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/puppet_litmus/puppet_helpers.rb +11 -11
- data/lib/puppet_litmus/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b54d56fe9cd63b49874f5dad0646bb656ad791f45b751315770d09e9f69f7c9d
|
|
4
|
+
data.tar.gz: 5098a3a890f18ce448f3060323ee663834eb348b9b2000dd399e3e3678cea91f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: acb0fc34a9fd73f2639daada9f05a6e9d7cd47727b4b652b0da90d0249d05364f9a67dd4cfb2e3f10840b26b23aec3a867b9630d13f263ce37765d774a12c187
|
|
7
|
+
data.tar.gz: 5ca486321dc9c226042316645cb091b35ebeb9e5ea5c6859c5a605986dae4a3552b7e88405153e3ce2238c0b1a01078c22f817763b38a2b22ee661ba5a6f41c6
|
|
@@ -69,8 +69,8 @@ module PuppetLitmus::PuppetHelpers
|
|
|
69
69
|
end
|
|
70
70
|
|
|
71
71
|
manifest_file_location = opts[:manifest_file_location] || create_manifest_file(manifest)
|
|
72
|
-
inventory_hash = File.exist?('
|
|
73
|
-
raise "Target '#{target_node_name}' not found in
|
|
72
|
+
inventory_hash = File.exist?('spec/fixtures/litmus_inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
|
|
73
|
+
raise "Target '#{target_node_name}' not found in spec/fixtures/litmus_inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
|
|
74
74
|
|
|
75
75
|
span.add_field('litmus.node_name', target_node_name)
|
|
76
76
|
add_platform_field(inventory_hash, target_node_name)
|
|
@@ -213,8 +213,8 @@ module PuppetLitmus::PuppetHelpers
|
|
|
213
213
|
span.add_field('litmus.opts', opts)
|
|
214
214
|
|
|
215
215
|
target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
|
|
216
|
-
inventory_hash = File.exist?('
|
|
217
|
-
raise "Target '#{target_node_name}' not found in
|
|
216
|
+
inventory_hash = File.exist?('spec/fixtures/litmus_inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
|
|
217
|
+
raise "Target '#{target_node_name}' not found in spec/fixtures/litmus_inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
|
|
218
218
|
|
|
219
219
|
span.add_field('litmus.node_name', target_node_name)
|
|
220
220
|
add_platform_field(inventory_hash, target_node_name)
|
|
@@ -252,8 +252,8 @@ module PuppetLitmus::PuppetHelpers
|
|
|
252
252
|
span.add_field('litmus.options', options)
|
|
253
253
|
|
|
254
254
|
target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
|
|
255
|
-
inventory_hash = File.exist?('
|
|
256
|
-
raise "Target '#{target_node_name}' not found in
|
|
255
|
+
inventory_hash = File.exist?('spec/fixtures/litmus_inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
|
|
256
|
+
raise "Target '#{target_node_name}' not found in spec/fixtures/litmus_inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
|
|
257
257
|
|
|
258
258
|
span.add_field('litmus.node_name', target_node_name)
|
|
259
259
|
add_platform_field(inventory_hash, target_node_name)
|
|
@@ -306,12 +306,12 @@ module PuppetLitmus::PuppetHelpers
|
|
|
306
306
|
target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
|
|
307
307
|
inventory_hash = if !opts[:inventory_file].nil? && File.exist?(opts[:inventory_file])
|
|
308
308
|
inventory_hash_from_inventory_file(opts[:inventory_file])
|
|
309
|
-
elsif File.exist?('
|
|
310
|
-
inventory_hash_from_inventory_file('
|
|
309
|
+
elsif File.exist?('spec/fixtures/litmus_inventory.yaml')
|
|
310
|
+
inventory_hash_from_inventory_file('spec/fixtures/litmus_inventory.yaml')
|
|
311
311
|
else
|
|
312
312
|
localhost_inventory_hash
|
|
313
313
|
end
|
|
314
|
-
raise "Target '#{target_node_name}' not found in
|
|
314
|
+
raise "Target '#{target_node_name}' not found in spec/fixtures/litmus_inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
|
|
315
315
|
|
|
316
316
|
span.add_field('litmus.node_name', target_node_name)
|
|
317
317
|
add_platform_field(inventory_hash, target_node_name)
|
|
@@ -371,8 +371,8 @@ module PuppetLitmus::PuppetHelpers
|
|
|
371
371
|
span.add_field('litmus.arguments', arguments)
|
|
372
372
|
|
|
373
373
|
target_node_name = targeting_localhost? ? 'litmus_localhost' : ENV['TARGET_HOST']
|
|
374
|
-
inventory_hash = File.exist?('
|
|
375
|
-
raise "Target '#{target_node_name}' not found in
|
|
374
|
+
inventory_hash = File.exist?('spec/fixtures/litmus_inventory.yaml') ? inventory_hash_from_inventory_file : localhost_inventory_hash
|
|
375
|
+
raise "Target '#{target_node_name}' not found in spec/fixtures/litmus_inventory.yaml" unless target_in_inventory?(inventory_hash, target_node_name)
|
|
376
376
|
|
|
377
377
|
span.add_field('litmus.node_name', target_node_name)
|
|
378
378
|
add_platform_field(inventory_hash, target_node_name)
|