kitchen-salt 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzYwM2Q5ZTRjOTdkYjRmZTQ2NjhkMTE3YWNhN2E4N2JmYTNlOWQ4Yw==
+    ZTlhMjg3ZWMzZjAwMjZmODJmYjY5NTFiZjZkOTVmYmY5YTk0OWVmYQ==
   data.tar.gz: !binary |-
-    ZWI2NDczNzlmNmNkNjM0M2E4ODFjMGYyYjQ3ZTFiZTg3MzVlZGE0OQ==
+    ZWM4ODk4MTgwNmYzNWQ5NmFhMDEyNGFiMGM5NzQ3NWI1NmUyNTExNg==
 SHA512:
   metadata.gz: !binary |-
-    YTkwOGQ1MGQ3Njc0NDhhZDI3NDM0M2Q1ZTk2ODRiMDkyMTY4Y2I3NjgxMjZh
-    MGRkZTBlZGVhMTE3NDRiMjg0N2E3ODA5OTFkYzUzYjVlNDYwOTUwYTRmODYy
-    YzU0YzQ4NDc5MDVjZmM2YmQ1NzhhNzIyYzZhOWQyNDZkOGI5Nzc=
+    NGFiNTZkOWI1MTAzMzA4N2M1MTg0Y2UwZDExYmY2YjI4NWYyODY4NmY4NjMx
+    N2M0NzYzMWE0YzE0ZGMzYTBmNDhlNDYwYTZjZjU1MWExYWNmNTIwMjk2ZTUw
+    NjBlNjZhM2YwMmZjZmZmODNkYmNjNDU5NTU1Zjc5NzY1N2FjYWY=
   data.tar.gz: !binary |-
-    MjJkZWYyMDZlMTg2YTBjNDYyMTk1NDY3YzFjMzJkYWM1MjAxNGNmMDM0NjFm
-    YmU0YmQ0YjMzYzg5ZWQ0NTQyMjM4ZGQzYjljZmM4Y2Q5ZTRlNjkzOWM3NGRm
-    ODA2OGIxNjZjZTQ1ZDBjZmFjZjBiNjQzMGI3MTc5MzgyYjdhZDA=
+    YTlkNGM3NjNlMTAwMjYwZDA0ZWE5M2RkZWUyNWY4YWVjNWFhNWUxM2ZlMGYy
+    ODVlZmYyMGFhNGFjNWEyYzJjYmRhYTkwOGZhNmZjMzBiZGI2NWUxMzNiNTAx
+    MjViYmIyYWYyYzJlOTMyYjc4MWQ3Nzk0ZmI0OWM5ZTliYzg4NmE=

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -89,13 +89,24 @@ module Kitchen
 
             #{sudo('apt-get')} update
             #{sudo('apt-get')} install -y salt-minion
-          elif [ -z "${SALT_VERSION}" ]
+          fi
+
+          # check again, now that an install of some form should have happened
+          SALT_VERSION=`salt-call --version | cut -d " " -f 2`
+
+          if [ -z "${SALT_VERSION}" ]
           then
-            echo "No salt-minion installed and I do not know how to install one!"
+            echo "No salt-minion installed, install must have failed!!"
+            echo "salt_install = #{salt_install}"
+            echo "salt_url = #{salt_url}"
+            echo "bootstrap_options = #{bootstrap_options}"
+            echo "salt_version = #{salt_version}"
+            echo "salt_apt_repo = #{salt_apt_repo}"
+            echo "salt_apt_repo_key = #{salt_apt_repo_key}"
             exit 2
           elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" ]
           then
-            echo "You asked for #{salt_version} and you have already got ${SALT_VERSION} installed, sweet!"
+            echo "You asked for #{salt_version} and you have ${SALT_VERSION} installed, sweet!"
           elif [ ! -z "${SALT_VERSION}" -a "#{salt_install}" = "bootstrap" ]
           then
             echo "You asked for bootstrap install and you have got ${SALT_VERSION}, hope thats ok!"
@@ -152,7 +163,9 @@ module Kitchen
           debug("Skipping the ropey --retcode-passthrough argument")
           # cmd = cmd + " --retcode-passthrough"
         else
-          cmd << " 2>&1 | tee /tmp/salt-call-output ; grep -e ERROR -e CRITICAL /tmp/salt-call-output ; [ $? -eq 0 ] && exit 1 ; [ $? -eq 1 ] && exit 0 "
+          # grep the output for ERROR or CRITICAL & return a 1 on finding a problem
+          fail_grep = 'grep -e ERROR -e CRITICAL'
+          cmd << " 2>&1 | tee /tmp/salt-call-output ; (sed '/#{fail_grep}/d' /tmp/salt-call-output | #{fail_grep} ; EC=$? ; [ ${EC} -eq 0 ] && exit 1 ; [ ${EC} -eq 1 ] && exit 0)"
         end
 
         cmd

metadata

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