kitchen-salt 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1db2002d5d7dfee0718dc6f0ae1f99252e54341
-  data.tar.gz: 1bf8811fd88757cb82b30f890391f13fc323e85b
+  metadata.gz: 4af1ecd3dd3d7e2e414f3fd555c10041f2bb2376
+  data.tar.gz: cc9bcf0c49b3d7ade20601f4801864f1a66a867b
 SHA512:
-  metadata.gz: ec56857a6c915a47f56680cd3d55e6abb2d71f631d47d554bc2e24e910c9228f65db56a959954b96e2379ca5ad10c2606075b79274d48a240e69b3cfc01f7455
-  data.tar.gz: f29ec622183a4b2a35a764b7db314e5a4e6a3ea1514496d1fa17a9f873cddb7ac0a2e2e9459c2f8ddcc9307bda00e761fe5d033585594c434ee408857f20a810
+  metadata.gz: ce92dd6efc00856b7f10f98a31878c83d3e1f7fb3b7f0331bccbec987118a62e57e307eabbe853f1b161eb02664767fdea1e9fdf0b5fe2e054d11681713488c1
+  data.tar.gz: fff97311e5ade612ee4f1570c4cd3bff9a04ef8cbd1467fe751069116c636f1b8b2b61f492a9fcc857879212f6a95d78a93d1bb2f6f27f0a650f392f8e9620d9

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = "0.0.22"
+    VERSION = "0.0.23"
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -41,6 +41,7 @@ module Kitchen
       # alternative method of installing salt
       default_config :salt_apt_repo, "http://apt.mccartney.ie"
       default_config :salt_apt_repo_key, "http://apt.mccartney.ie/KEY"
+      default_config :salt_ppa, "ppa:saltstack/salt"
 
       default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
 
@@ -82,6 +83,7 @@ module Kitchen
         salt_version = config[:salt_version]
         salt_apt_repo = config[:salt_apt_repo]
         salt_apt_repo_key = config[:salt_apt_repo_key]
+        salt_ppa = config[:salt_ppa]
 
         omnibus_download_dir = config[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
 
@@ -101,11 +103,22 @@ module Kitchen
           then
             . /etc/lsb-release
 
+            echo "-----> Configuring apt repo for salt #{salt_version}"
             echo "deb #{salt_apt_repo}/salt-#{salt_version} ${DISTRIB_CODENAME} main" | #{sudo('tee')} /etc/apt/sources.list.d/salt-#{salt_version}.list
 
             do_download #{salt_apt_repo_key} /tmp/repo.key
             #{sudo('apt-key')} add /tmp/repo.key
 
+            #{sudo('apt-get')} update
+            sleep 10
+            echo "-----> Installing salt-minion (#{salt_version})"
+            #{sudo('apt-get')} install -y python-support
+            #{sudo('apt-get')} install -y salt-minion
+            #{sudo('apt-get')} install -y salt-common
+            #{sudo('apt-get')} install -y salt-minion
+          elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "ppa" ]
+          then
+            #{sudo('apt-add-repository')} -y #{salt_ppa}
             #{sudo('apt-get')} update
             #{sudo('apt-get')} install -y salt-minion
           fi
@@ -122,6 +135,7 @@ module Kitchen
             echo "salt_version = #{salt_version}"
             echo "salt_apt_repo = #{salt_apt_repo}"
             echo "salt_apt_repo_key = #{salt_apt_repo_key}"
+            echo "salt_ppa = #{salt_ppa}"
             exit 2
           elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" ]
           then
@@ -136,7 +150,7 @@ module Kitchen
 
           if [ ! -d "/opt/chef" ]
           then
-            echo "-----> Installing Chef Omnibus"
+            echo "-----> Installing Chef Omnibus (for busser/serverspec ruby support)"
             mkdir -p #{omnibus_download_dir}
             if [ ! -x #{omnibus_download_dir}/install.sh ]
             then
@@ -198,7 +212,9 @@ module Kitchen
           cmd = sudo("salt-call --config-dir=#{File.join(config[:root_path], config[:salt_config])} --local state.highstate")
         end
 
-        cmd << " --log-level=#{config[:log_level]}"
+        if config[:log_level]
+          cmd << " --log-level=#{config[:log_level]}"
+        end
 
         # config[:salt_version] can be 'latest' or 'x.y.z', 'YYYY.M.x' etc
         # error return codes are a mess in salt:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen