kitchen-salt 0.0.7 → 0.0.8

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 CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZDRkYjQ1YWMyOGZlMWFlZTQwNzU4NDJhYTdiMjkwMWRjZWU3MTViYw==
4
+ MTNjNDhiY2I1N2QxNTc4ODhhNGE1ZDNkNDYxNWI0NjExMTM4ZDQ2Yw==
5
5
  data.tar.gz: !binary |-
6
- ZTFmMGI4NmY4YWRiZWY1MWFlNWM3NzhjZjExNjkzYzkyYmRhZTliMg==
6
+ YTU1ZjdiMzNmOGE0NDRhY2YyOWZlYTNhZWUyNmY0NmQ0ZDI4ZDNjZA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YzNkYzJmMTBhYzlhYWEyNzBhMWY4ODRjNTcxZGVlMDYyMTBjZTlkOTU3OTli
10
- M2ZkYjEyZmUwZjAzYjZhODhlOTE3NjFiZmQzYmIyOGQ1NzUzNTBjNmY1YTEw
11
- Y2QzODE3Zjc5ZGM2MmMyNDEzNjllNWY1NjFhNmRiNDdmM2RjNDQ=
9
+ ZDJlNWE4MzM5MDA4YzQ0NDg2YmE0YzkxNDQxOTY5ODg1ZGFkZTQ2OWZiYjdl
10
+ YzUyYjJhMTFiOWQ3NzBkYWE2NDU2NGI4MzA3MDhkMDRlMDVkZGYwNzRiM2Ix
11
+ ZWJiNzk2NzYwMTM3MmJlNDg5M2RkN2E0YmE5NWIzODIyOGNkY2Y=
12
12
  data.tar.gz: !binary |-
13
- YTRmMGQ4MWYyYzU2NzYzY2M3MDRlN2RhNzNjMTRkMjgxMzhlNDU0MmNmODA0
14
- NTU0YTg2YmE4OTBkYzQ5NDRkN2JlOTczNDAzOWI2MTkwNWQ0MTcyMmZkZDcy
15
- NmU4ZDE3ZjgxODc1N2I4ZDc2NzdkNzFhN2VmNjBmOTE0ZjIyNDY=
13
+ Mzk1NDFlOTkwMWNlYWNjNjdhNDcxZjVhYWZhYjhjOTRkOTg1MWYzYjE5YjBi
14
+ NTFkNTdiYzIwODVkNmYxMzQyYmFhZjM2NDZiNDdmYTBiNzhjYjI4ODhhZDc5
15
+ MmMwODIxMjkyNTkxZDA4NDgzYWY2MWFjNjI0MjdhZGM5Zjk2Mzc=
@@ -1,5 +1,5 @@
1
1
  module Kitchen
2
2
  module Salt
3
- VERSION = "0.0.7"
3
+ VERSION = "0.0.8"
4
4
  end
5
5
  end
@@ -228,6 +228,16 @@ module Kitchen
228
228
  info("Preparing pillars into #{config[:salt_pillar_root]}")
229
229
  debug("Pillars Hash: #{config[:pillars]}")
230
230
 
231
+ # load any pillars from disk, if specified
232
+ if !config[:'pillars-from-files'].nil?
233
+ external_pillars = unsymbolize(config[:'pillars-from-files'])
234
+ debug("external_pillars (unsymbolize): #{external_pillars}")
235
+ external_pillars.each do |key, value|
236
+ debug("loading externalpillar: #{key}, #{value}")
237
+ config[:pillars][key] = YAML.load(File.read(value))
238
+ end
239
+ end
240
+
231
241
  return if config[:pillars].nil?
232
242
 
233
243
  # we get a hash with all the keys converted to symbols, salt doesn't like this
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-salt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon McCartney
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-19 00:00:00.000000000 Z
11
+ date: 2014-02-25 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: salt provisioner for test-kitchen
14
14
  email: