kitchen-salt 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDcwOTFlMGJmYmQyNjEzODU5ODU3ZDZlOGE1ZDhkMmM2NDQyNjk2NQ==
+    OWY5MDg5ZjQ0MzIyNzZlZmYxYzgyYWQxZjMxYTAyZmJkZTYzZGEyMw==
   data.tar.gz: !binary |-
-    ZjNkYzYzMzhlMTg4Mjc1ZmJkMTk0MTU2ZThhZjNiNjU3ODA3NDNiMA==
+    YmM2NzNkNTgwZTM0ODAwYzBkMDYyODg3MTQ3ZDQzMGYyZjVmOGQ4YQ==
 SHA512:
   metadata.gz: !binary |-
-    NDk2ZTQ5ZTUzOWY5NzU2NjBmZDNiYjZjM2NiMzRhODU2Y2M1ZjIzNWNkZGI2
-    NWYzMGY0Yjk1NTkzMjE0NGRkMmU0MGQ1ZTM5NTQ0OWE1YzBhYjViOTgzYmM3
-    MzI0NTMzN2EyOGRhYjk4NDJhMzA2ZjM4MmMxYjJmMmRkZDgxNjE=
+    MmZmZjFiMTIwZWY1YWFkNzc2ZGFiYWRhMDZhZDhjZmE0MjIyM2VjNDFiMzQx
+    YzdmODIwNjc5YWQ5MzY3MzNjMTBiYWZkYWNhNDdjYjJlNzE1MTdiODc0NzM3
+    NWY2MDViOGZiMjhlMzJlMTYwYzdmZjNkNjNkZGQ4NjMwNmYzNzg=
   data.tar.gz: !binary |-
-    ZWMyOWE1YmMwZTJmM2U4YjU5ZDMyZmFiM2Y1ZWRkOGYxYzg0MTEwZDZiNmE2
-    ZGY4YWYxYTI3NGU4OTVjZTcyMTI3MWQ5NmIwNDIzYmNiMThlNDI4MzRmMDIy
-    MGYzODQ4MjMzMTRlNjAzMDE0ZGU3YWY4ODc4MTI1OTM0MDQwYjE=
+    NjcwYTA4ZmYzMmUzYTBiZmFhMjk3MDg2MjJkYmE3ZDIwNTllODc5MDllYTll
+    MzlmNzVjNGM0MjQ4YTg5Nzg4Y2ZlZTg2YjUxNmQ3NThmODgzMWQ4MmRiODc3
+    MDNmYTg3Y2ExYTc4MmYwMzdiNjk5NzU1NWVjODM4YWYyOWY4YWY=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -48,7 +48,6 @@ module Kitchen
       default_config :salt_pillar_root, "/srv/pillar"
       default_config :salt_state_top, "/srv/salt/top.sls"
       default_config :state_collection, false
-      default_config :pillars, {}
       default_config :state_top, {}
       default_config :salt_run_highstate, true
 
@@ -145,6 +144,7 @@ module Kitchen
         prepare_minion
         prepare_state_top
         prepare_pillars
+        prepare_grains
         if config[:state_collection]
           prepare_state_collection
         else
@@ -301,6 +301,31 @@ module Kitchen
         end
       end
 
+      def prepare_grains
+        debug("Grains Hash: #{config[:grains]}")
+
+        return if config[:grains].nil?
+
+        info("Preparing grains into #{config[:salt_config]}/grains")
+        # we get a hash with all the keys converted to symbols, salt doesn't like this
+        # to convert all the keys back to strings again we use unsymbolize
+        # then we convert the hash to yaml
+        grains = unsymbolize(config[:grains]).to_yaml
+
+        # generate the filename
+        sandbox_grains_path = File.join(sandbox_path, config[:salt_config], 'grains')
+        debug("sandbox_grains_path: #{sandbox_grains_path}")
+
+        # create the directory where the pillar file will go
+        FileUtils.mkdir_p(File.dirname(sandbox_grains_path))
+
+        debug("Rendered grains yaml")
+        # create the directory & drop the file in
+        File.open(sandbox_grains_path, "wb") do |file|
+          file.write(grains)
+        end
+      end
+
       def prepare_formula
         info("Preparing formula")
         debug("Using config #{config}")

metadata

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