kitchen-salt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDRkYjQ1YWMyOGZlMWFlZTQwNzU4NDJhYTdiMjkwMWRjZWU3MTViYw==
+    MTNjNDhiY2I1N2QxNTc4ODhhNGE1ZDNkNDYxNWI0NjExMTM4ZDQ2Yw==
   data.tar.gz: !binary |-
-    ZTFmMGI4NmY4YWRiZWY1MWFlNWM3NzhjZjExNjkzYzkyYmRhZTliMg==
+    YTU1ZjdiMzNmOGE0NDRhY2YyOWZlYTNhZWUyNmY0NmQ0ZDI4ZDNjZA==
 SHA512:
   metadata.gz: !binary |-
-    YzNkYzJmMTBhYzlhYWEyNzBhMWY4ODRjNTcxZGVlMDYyMTBjZTlkOTU3OTli
-    M2ZkYjEyZmUwZjAzYjZhODhlOTE3NjFiZmQzYmIyOGQ1NzUzNTBjNmY1YTEw
-    Y2QzODE3Zjc5ZGM2MmMyNDEzNjllNWY1NjFhNmRiNDdmM2RjNDQ=
+    ZDJlNWE4MzM5MDA4YzQ0NDg2YmE0YzkxNDQxOTY5ODg1ZGFkZTQ2OWZiYjdl
+    YzUyYjJhMTFiOWQ3NzBkYWE2NDU2NGI4MzA3MDhkMDRlMDVkZGYwNzRiM2Ix
+    ZWJiNzk2NzYwMTM3MmJlNDg5M2RkN2E0YmE5NWIzODIyOGNkY2Y=
   data.tar.gz: !binary |-
-    YTRmMGQ4MWYyYzU2NzYzY2M3MDRlN2RhNzNjMTRkMjgxMzhlNDU0MmNmODA0
-    NTU0YTg2YmE4OTBkYzQ5NDRkN2JlOTczNDAzOWI2MTkwNWQ0MTcyMmZkZDcy
-    NmU4ZDE3ZjgxODc1N2I4ZDc2NzdkNzFhN2VmNjBmOTE0ZjIyNDY=
+    Mzk1NDFlOTkwMWNlYWNjNjdhNDcxZjVhYWZhYjhjOTRkOTg1MWYzYjE5YjBi
+    NTFkNTdiYzIwODVkNmYxMzQyYmFhZjM2NDZiNDdmYTBiNzhjYjI4ODhhZDc5
+    MmMwODIxMjkyNTkxZDA4NDgzYWY2MWFjNjI0MjdhZGM5Zjk2Mzc=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -228,6 +228,16 @@ module Kitchen
         info("Preparing pillars into #{config[:salt_pillar_root]}")
         debug("Pillars Hash: #{config[:pillars]}")
 
+        # load any pillars from disk, if specified
+        if !config[:'pillars-from-files'].nil?
+          external_pillars = unsymbolize(config[:'pillars-from-files'])
+          debug("external_pillars (unsymbolize): #{external_pillars}")
+          external_pillars.each do |key, value|
+            debug("loading externalpillar: #{key}, #{value}")
+            config[:pillars][key] = YAML.load(File.read(value))
+          end
+        end
+
         return if config[:pillars].nil?
 
         # we get a hash with all the keys converted to symbols, salt doesn't like this

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies: []
 description: salt provisioner for test-kitchen
 email: