kitchen-salt 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03994ca6c8646d68c1b86979dfdd41f32a2fa89
-  data.tar.gz: a82c4bea05fde368a1e2dd19e290076519a24cf8
+  metadata.gz: 59e051d229d33983d4f1ff8d7f4f092a5e5808af
+  data.tar.gz: 3fc7174b04e097267d2fa49854f51abe5f0d3d45
 SHA512:
-  metadata.gz: d7804949ec34cb3b6bd138131d515cd9e48727aa0ae09a733d864e22e4326c93bd6840989a7bf7d69320beb774937fa353837c12abede923a033ae90bb574523
-  data.tar.gz: d5028e5a136ed489c6b9c002323cd965b99d87c7009c84a8d90e8325a3446b8ab61127db3a290beee832953c86801905f1d23b61dfce88f0bd5b2c51eac5b43f
+  metadata.gz: 77590fa2bbc1f1fe17f1a2b1f1f20de2fbe86df9bb5c4e321a8a4d9e91bc9bc6bbd978e5e9f74fb6592286026325fb62acbbf6034fe4c96650635828ea90a8a0
+  data.tar.gz: 9ab055a9ac8a3dee16f1f5adbce36279035196f9516e0f01489b357c3ce7e92c4472c9a10474b5cbe653e7a9593d2f13eb472570909d21c9df0116a8cdbc08a3

data/lib/kitchen-salt/pillars.rb

@@ -8,6 +8,25 @@ module Kitchen
 
         pillars = config[:pillars]
         pillars_from_files = config[:'pillars-from-files']
+        pillars_from_directories = config[:pillars_from_directories]
+
+        debug("Pillars Directories: #{pillars_from_directories}")
+
+        if pillars_from_directories.any?
+          pillars_from_directories.each do |dir|
+            if dir.is_a?(Hash)
+              local_pillar_path = File.expand_path(dir[:source])
+              sandbox_pillar_path = File.join(sandbox_path, dir[:dest])
+              info("Copying pillars from #{dir[:source]} to #{dir[:dest]}")
+            else
+              local_pillar_path = File.expand_path(dir)
+              sandbox_pillar_path = File.join(sandbox_path, '/srv/pillar')
+              info("Copying pillars from #{dir} to /srv/pillar")
+            end
+            cp_r_with_filter(local_pillar_path, sandbox_pillar_path, config[:salt_copy_filter])
+          end
+        end
+
         debug("Pillars Hash: #{pillars}")
 
         if pillars.nil? && pillars_from_files.nil?

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.0.28'.freeze
+    VERSION = '0.0.29'.freeze
   end
 end

data/lib/kitchen/provisioner/dependencies.erb

@@ -59,9 +59,6 @@ def install_dependencies
 
   # install formulas
   config[:dependencies].each do |formula|
-    #unless config[:vendor_repo].has_key?(formula[:repo])
-    #  raise UserError, "kitchen-salt: Invalid dependency formula :repo, no such vendor_repo '#{formula[:repo]}' specified."
-    #end
     if formula.key?(:repo)
       case formula[:repo]
       when 'git'
@@ -69,10 +66,16 @@ def install_dependencies
           fetchGitFormula #{formula[:source]} "#{formula[:name]}" "#{formula[:branch] || 'master'}"
         INSTALL
       when 'spm'
-        # TODO: SPM should know the sandbox_path is /tmp/kitchen/etc
-        script += <<-INSTALL
-          #{sudo('spm')} install #{formula[:package]||formula[:name]};
-        INSTALL
+        if formula[:package].nil?
+          script += <<-INSTALL
+          #{sudo('spm')} -c #{config[:root_path]}/etc/salt install -y #{formula[:name]};
+          INSTALL
+        else
+          script += <<-INSTALL
+            #{sudo('curl')} -O #{formula[:package]};
+            #{sudo('spm')} -c #{config[:root_path]}/etc/salt local install -y "$(basename #{formula[:package]})";
+          INSTALL
+        end
       when 'yum'
         script += <<-INSTALL
           #{sudo('yum')} install -y #{formula[:package]||formula[:name]};
@@ -90,6 +93,7 @@ def install_dependencies
     linkFormulas "$SALT_ROOT"
     #{sudo('chown')} kitchen.kitchen -R "${SALT_SHARE_DIR}";
     #{sudo('chown')} kitchen.kitchen -R "${SALT_ROOT}";
+    echo "Content of $SALT_ROOT :";
     ls -la "$SALT_ROOT";
   INSTALL
   return script
@@ -97,7 +101,7 @@ end
 
 
 <<-INSTALL
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "Install External Dependencies";
 #{install_dependencies}

data/lib/kitchen/provisioner/formula-fetch.sh

@@ -78,14 +78,14 @@ function linkFormulas() {
     fi
 
     # form pkgs
-    find "$SALT_ENV" -maxdepth 1 -mindepth 1 -path "*_formulas*" -prune -o -name "*" -type d -print0| xargs -I{} -0 -n1 basename --no-run-if-empty {} | xargs -I{} --no-run-if-empty \
+    find "$SALT_ENV" -maxdepth 1 -mindepth 1 -path "*_formulas*" -prune -o -name "*" -type d -print0| xargs -I{} -0 -n1 --no-run-if-empty basename {} | xargs -I{} --no-run-if-empty \
       ln -fs "$SALT_ENV"/{} "$SALT_ROOT"/{};
   fi
 
 }
 
 # detect if file is being sourced
-[[ "$0" != "${BASH_SOURCE[@]}" ]] || {
+[[ "$0" != "${BASH_SOURCE[0]}" ]] || {
     # if executed, run implicit function
     fetchGitFormula "${@}"
 }

data/lib/kitchen/provisioner/install.erb

@@ -1,4 +1,3 @@
-
 <%=
 salt_install = config[:salt_install]
 salt_url = config[:salt_bootstrap_url]
@@ -7,6 +6,10 @@ 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]
+salt_yum_rpm_key = config[:salt_yum_rpm_key] % [salt_version]
+salt_yum_repo = config[:salt_yum_repo] % [salt_version]
+salt_yum_repo_key = config[:salt_yum_repo_key] % [salt_version]
+salt_yum_repo_latest = config[:salt_yum_repo_latest]
 
 <<-INSTALL
 sh -c '
@@ -30,6 +33,10 @@ then
     DISTRIB_CODENAME=$(lsb_release -s -c)
   fi
 
+  echo "-----> Install apt-transport-https"
+  #{sudo('apt-get')} update
+  #{sudo('apt-get')} install -y apt-transport-https gnupg
+
   echo "-----> Configuring apt repo for salt #{salt_version}"
   echo "deb #{salt_apt_repo}/#{salt_version} ${DISTRIB_CODENAME} main" | #{sudo('tee')} /etc/apt/sources.list.d/salt-#{salt_version}.list
 
@@ -40,47 +47,49 @@ then
   sleep 10
   echo "-----> Installing salt-minion (#{salt_version})"
   #{sudo('apt-get')} install -y python-support
-  #{sudo('apt-get')} install -y salt-minion salt-common
+  #{sudo('apt-get')} install -y salt-minion salt-common salt-master
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "distrib" ]
 then
   #{sudo('apt-get')} update
-  #{sudo('apt-get')} install -y salt-minion
+  #{sudo('apt-get')} install -y python-support
+  #{sudo('apt-get')} install -y salt-minion salt-master
 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 salt-common
+  #{sudo('apt-get')} install -y python-support
+  #{sudo('apt-get')} install -y salt-minion salt-common salt-master
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "yum" ]
 then
   if [ -z "#{salt_version}" ]
   then
     echo "-----> Installing yum repo for salt latest"
-    #{sudo('yum')} install https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm
+    #{sudo('yum')} install #{salt_yum_repo_latest}
   else
     echo "-----> Installing yum repo for salt #{salt_version}"
-    #{sudo('rpm')} --import 'https://repo.saltstack.com/yum/redhat/7/x86_64/archive/#{salt_version}/SALTSTACK-GPG-KEY.pub'
+    #{sudo('rpm')} --import '#{salt_yum_rpm_key}'
     #{sudo('tee')} /etc/yum.repos.d/saltstack.repo <<EOL
 [saltstack-repo]
 name=SaltStack repo for RHEL/CentOS $releasever
-baseurl=#{Shellwords.escape("https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/#{salt_version}")}
+baseurl=#{Shellwords.escape(salt_yum_repo)}
 enabled=1
 gpgcheck=1
-gpgkey=#{Shellwords.escape("https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/#{salt_version}/SALTSTACK-GPG-KEY.pub")}
+gpgkey=#{Shellwords.escape(salt_yum_repo_key)}
 EOL
   fi
   #{sudo('yum')} clean expire-cache
   echo "-----> Installing salt-minion (#{salt_version})"
-  #{sudo('yum')} install -y salt-minion salt-common
+  #{sudo('yum')} install -y salt-minion salt-common salt-master
 fi
 
 # check again, now that an install of some form should have happened
-command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
+command -v salt-call >/dev/null 2>&1 && FULL_SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
 
 # extract short format of Salt version
-if [ ! -z "${SALT_VERSION}" ]
+if [ ! -z "${FULL_SALT_VERSION}" ]
 then
-  YEAR=$(echo "$SALT_VERSION" | cut -d "." -f1)
-  MONTH=$(echo "$SALT_VERSION" | cut -d "." -f2)
+  YEAR=$(echo "$FULL_SALT_VERSION" | cut -d "." -f1)
+  MONTH=$(echo "$FULL_SALT_VERSION" | cut -d "." -f2)
   SALT_VERSION="${YEAR}.${MONTH}"
 fi
 
@@ -94,10 +103,14 @@ then
   echo "salt_apt_repo = #{salt_apt_repo}"
   echo "salt_apt_repo_key = #{salt_apt_repo_key}"
   echo "salt_ppa = #{salt_ppa}"
+  echo "salt_yum_rpm_key = #{salt_yum_rpm_key}"
+  echo "salt_yum_repo = #{salt_yum_repo}"
+  echo "salt_yum_repo_key = #{salt_yum_repo_key}"
+  echo "salt_yum_repo_latest = #{salt_yum_repo_latest}"
   exit 2
-elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" ]
+elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" -o "#{salt_version}" = "${FULL_SALT_VERSION}" ]
 then
-  echo "You asked for #{salt_version} and you have ${SALT_VERSION} installed, sweet!"
+  echo "You asked for #{salt_version} and you have ${FULL_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!"
@@ -106,7 +119,6 @@ else
   exit 2
 fi
 
-#{install_chef}
-'
+#{install_chef}'
 INSTALL
 %>

data/lib/kitchen/provisioner/minion.erb

@@ -1,13 +1,13 @@
+local: true
 state_top: top.sls
-
-file_client: local
+root_dir: <%= config[:root_path] %>
 
 file_roots:
  <%= config[:salt_env] %>:
-
    - <%= File.join(config[:root_path], (windows_os? ? config[:salt_file_root].gsub('/', '\\') : config[:salt_file_root])) %>
-   - <%= File.join(config[:root_path], (windows_os? ? config[:salt_file_root].gsub('/', '\\') : config[:salt_file_root]), 'spm') %>
+   - <%= File.join(config[:root_path], (windows_os? ? config[:salt_spm_root].gsub('/', '\\') : config[:salt_spm_root])) %>/salt
 
 pillar_roots:
  <%= config[:salt_env] %>:
    - <%= File.join(config[:root_path], (windows_os? ? config[:salt_pillar_root].gsub('/', '\\') : config[:salt_pillar_root])) %>
+   - <%= File.join(config[:root_path], (windows_os? ? config[:salt_spm_root].gsub('/', '\\') : config[:salt_spm_root])) %>/pillar

data/lib/kitchen/provisioner/repository-setup.sh

@@ -18,7 +18,7 @@ function apt_repo_add {
 }
 
 # detect if file is being sourced
-[[ "$0" != "${BASH_SOURCE[@]}" ]] || {
+[[ "$0" != "${BASH_SOURCE[0]}" ]] || {
     # if executed, run implicit function
     #apt_repo_add "${@}"
     echo 'Usage: apt_repo_add "custom id" "arch" "repo url" "components" "distribution" "repo gpg key"';

data/lib/kitchen/provisioner/salt_solo.rb

@@ -40,7 +40,7 @@ module Kitchen
         salt_install: 'bootstrap',
         salt_bootstrap_url: 'https://bootstrap.saltstack.com',
         salt_bootstrap_options: '',
-        salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest',
+        salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/',
         salt_apt_repo_key: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub',
         salt_ppa: 'ppa:saltstack/salt',
         bootstrap_url: 'https://raw.githubusercontent.com/saltstack/kitchen-salt/master/assets/install.sh',
@@ -65,7 +65,12 @@ module Kitchen
         vendor_path: nil,
         vendor_repo: {},
         omnibus_cachier: false,
-        local_salt_root: nil
+        local_salt_root: nil,
+        pillars_from_directories: [],
+        salt_yum_rpm_key: 'https://repo.saltstack.com/yum/redhat/7/x86_64/archive/%s/SALTSTACK-GPG-KEY.pub',
+        salt_yum_repo: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s',
+        salt_yum_repo_key: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s/SALTSTACK-GPG-KEY.pub',
+        salt_yum_repo_latest: 'https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm'
       }
 
       # salt-call version that supports the undocumented --retcode-passthrough command
@@ -102,12 +107,12 @@ module Kitchen
         chef_url = config[:chef_bootstrap_url]
         if windows_os?
           <<-POWERSHELL
-            if (-Not $(test-path c:\\opscode\\chef) { 
+            if (-Not $(test-path c:\\opscode\\chef) {
               if (-Not $(Test-Path c:\\temp)) {
                 New-Item -Path c:\\temp -itemtype directory
               }
               (New-Object net.webclient).DownloadFile("#{chef_url}", "c:\\temp\\chef_bootstrap.ps1")
-              write-host "-----> Installing Chef Omnibus (for busser/serverspec ruby support)" 
+              write-host "-----> Installing Chef Omnibus (for busser/serverspec ruby support)"
               #{sudo('powershell')} c:\\temp\\chef_bootstrap.ps1
             }
           POWERSHELL
@@ -152,7 +157,7 @@ module Kitchen
       def init_command
         debug("Initialising Driver #{name}")
         if windows_os?
-          cmd = "mkdir -Force -Path ""#{config[:root_path]}"""
+          cmd = "mkdir -Force -Path ""#{config[:root_path]}""\n"
         else
           cmd = "mkdir -p '#{config[:root_path]}';"
         end

data/lib/kitchen/provisioner/spm.erb

@@ -1,6 +1,7 @@
-spm_build_dir: <%= File.join(config[:root_path], (windows_os? ? config[:salt_file_root].gsub('/', '\\') : config[:salt_file_root])) %>/build
-formula_path: <%= File.join(config[:root_path], (windows_os? ? config[:salt_file_root].gsub('/', '\\') : config[:salt_file_root])) %>/formulas
-pillar_path: <%= File.join(config[:root_path], (windows_os? ? config[:salt_pillar_root].gsub('/', '\\') : config[:salt_pillar_root])) %>
+spm_build_dir: <%= File.join(config[:root_path]) %>/build
+formula_path: <%= File.join(config[:root_path], (windows_os? ? config[:salt_spm_root].gsub('/', '\\') : config[:salt_spm_root])) %>/salt
+pillar_path: <%= File.join(config[:root_path], (windows_os? ? config[:salt_spm_root].gsub('/', '\\') : config[:salt_spm_root])) %>/pillar
+root_dir: <%= config[:root_path] %>
 spm_build_exclude:
 - .git
 - .svn

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
-- Simon McCartney
+- SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,7 @@ dependencies:
         version: 0.7.3
 description: salt provisioner for test-kitchen so that you can test all the things
 email:
-- simon@mccartney.ie
+- daniel@gtmanfred.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen