kitchen-salt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 603063a5f1b59537f46424ca4cd62cdadc7fcd2a666ca00137592f9d8fc82bc6
-  data.tar.gz: 2ad2433565df3ad9d109094f10dbad63bc13246a15ced4dbbd52ab51ed25e8a9
+  metadata.gz: f8bdce74b7821d2d2649710602094447aff55c3c930dae522cd02627d3345328
+  data.tar.gz: b056a29408144b366d9f048db41134633ee4460963d451a0ed63911b657098e2
 SHA512:
-  metadata.gz: 970af9e45fb7c8adadcfede939438bcfc5a37b9aafd42cb2b0214e9ae9192a4cb6cac409bf56c1a5001e52fb8da2222adfbc5faad6a661e28c04014cd41f134a
-  data.tar.gz: 46172738dc22bdcd461a75a4d44f8462fe5dc265cc4aad1d5e687e79fef7bfb90c26ca479331167f8212d8e15e9d29c02a40899f0a57ec849f4bf3e3b74b2443
+  metadata.gz: 3c6c19e87b2c8f144c92a992cc204163a7f396a3643b07e360ea7be51c7971a5c44ac7937e5d2864f903c7bb809c8f2444092f5d8b7f9a1557d0ba9361ab1623
+  data.tar.gz: cfacb475cab20ede8926a31977b7a9e5b1f116ef8d95a706d7a2b578896989c3c71c7fa61307935e6ce2aea1f9d69d48704e450bdada54cd88542ce5f5df8f01

data/lib/kitchen-salt/pillars.rb

@@ -7,7 +7,12 @@ module Kitchen
         info("Preparing pillars into #{config[:salt_pillar_root]}")
 
         pillars = config[:pillars]
-        pillars_from_files = config[:'pillars-from-files']
+        if config.key?(:'pillars-from-files')
+          info("pillars-from-files is deprecated in favor of pillars_from_files")
+          pillars_from_files = config[:'pillars-from-files']
+        else
+          pillars_from_files = config[:'pillars_from_files']
+        end
         pillars_from_directories = config[:pillars_from_directories]
 
         debug("Pillars Directories: #{pillars_from_directories}")

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/kitchen/provisioner/99-minion.conf.erb

@@ -0,0 +1 @@
+<%= safe_hash.to_yaml %>

data/lib/kitchen/provisioner/dependencies.erb

@@ -32,7 +32,7 @@ def install_dependencies
   # setup ppa
   config[:vendor_repo].select{|x| x[:type]=='ppa'}.each do |repo|
     script += <<-INSTALL
-        #{sudo('add-apt-repository')} "ppa:#{repo[:name]}" -y;
+        add-apt-repository "ppa:#{repo[:name]}" -y;
     INSTALL
   end
 
@@ -43,17 +43,17 @@ def install_dependencies
     case type
     when 'apt'
       script += <<-INSTALL
-        #{sudo('apt-get')} update -q;
+        apt-get update -q;
         sleep 10;
       INSTALL
     when 'yum'
       script += <<-INSTALL
-        #{sudo('yum')} update;
+        yum update;
         sleep 10;
       INSTALL
     when 'spm'
       script += <<-INSTALL
-        #{sudo('spm')} update_repo;
+        spm update_repo;
       INSTALL
     end
   end
@@ -69,21 +69,21 @@ def install_dependencies
       when 'spm'
         if formula[:package].nil?
           script += <<-INSTALL
-          #{sudo('spm')} -c #{config[:root_path]}/etc/salt install -y #{formula[:name]};
+          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]})";
+            curl -O #{formula[:package]};
+            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]};
+          yum install -y #{formula[:package]||formula[:name]};
         INSTALL
       when 'apt'
         script += <<-INSTALL
-          #{sudo('apt-get')} install -y #{formula[:package]||formula[:name]};
+          apt-get install -y #{formula[:package]||formula[:name]};
         INSTALL
       end
     elsif formula.key?(:path)
@@ -92,8 +92,7 @@ def install_dependencies
   end
   script += <<-INSTALL
     linkFormulas "$SALT_ROOT"
-    #{sudo('chown')} kitchen.kitchen -R "${SALT_SHARE_DIR}";
-    #{sudo('chown')} kitchen.kitchen -R "${SALT_ROOT}";
+    chown -R "${SUDO_USER:-$USER}" "${SALT_SHARE_DIR}" "${SALT_ROOT}";
     echo "Content of $SALT_ROOT :";
     ls -la "$SALT_ROOT";
   INSTALL

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

@@ -73,7 +73,9 @@ function linkFormulas() {
       for formula in $GIT_FORMULA_LIST
       do
         name=$(basename "$formula")
-        ln -fs "$formula/$name" "$SALT_ROOT/$name"
+        if [[ ! -L "$SALT_ROOT/$name" ]]; then
+          ln -fs "$formula/$name" "$SALT_ROOT/$name"
+        fi
         find "$formula" -maxdepth 1 -mindepth 1 -type d |grep -E "_(modules|states|grains|renderers|returners)" | xargs -I{} \
           basename {}| xargs -I{} cp -rs "$formula"/{} "$SALT_ROOT"/
       done

data/lib/kitchen/provisioner/install.erb

@@ -1,8 +1,8 @@
 <%=
 salt_install = config[:salt_install]
 salt_url = config[:salt_bootstrap_url]
-bootstrap_options = config[:salt_bootstrap_options]
 salt_version = config[:salt_version]
+bootstrap_options = config[:salt_bootstrap_options] % [salt_version]
 salt_apt_repo = config[:salt_apt_repo]
 salt_apt_repo_key = config[:salt_apt_repo_key]
 salt_ppa = config[:salt_ppa]

data/lib/kitchen/provisioner/install_win.erb

@@ -15,16 +15,24 @@ if (-Not $installed_version -And "#{salt_install}" -eq "bootstrap") {
   (New-Object net.webclient).DownloadFile("#{salt_url}", "c:\\temp\\salt_bootstrap.ps1")
   #{sudo('powershell')} c:\\temp\\salt_bootstrap.ps1 #{bootstrap_options}
 }
-$installed_version = $(c:\\salt\\salt-call.bat --version).split(' ')[1] 
-if (-Not $installed_version) {
+$FULL_SALT_VERSION = $(c:\\salt\\salt-call.bat --version).split(' ')[1]
+if ($FULL_SALT_VERSION) {
+  $YEAR = $FULL_SALT_VERSION.split('.')[0]
+  $MONTH = $FULL_SALT_VERSION.split('.')[1]
+  $SALT_VERSION = "$YEAR.$MONTH"
+}
+
+if (-Not $SALT_VERSION) {
   write-host "No salt-minion installed, install must have failed!!"
   write-host "salt_install = #{salt_install}"
   write-host "salt_url = #{salt_url}"
   write-host "bootstrap_options = #{bootstrap_options}"
-} elseif ($installed_version -And "#{salt_install}" -eq "bootstrap") {
-  write-host "You asked for bootstrap install and you have got $installed_version, hope that's ok!"
+} elseif ($SALT_VERSION -eq "#{salt_version}" -Or "#{salt_version}" -eq "latest" -Or "#{salt_version}" -eq "$FULL_SALT_VERSION") {
+  write-host "You asked for #{salt_version} and you have ${FULL_SALT_VERSION} installed, sweet!"
+} elseif ($SALT_VERSION -And "#{salt_install}" -eq "bootstrap") {
+  write-host "You asked for bootstrap install and you have got $SALT_VERSION, hope that's ok!"
 } else {
-  write-host "You asked for #{salt_version} and you have got $installed_version installed, dunno ho to fix that, sorry!"
+  write-host "You asked for #{salt_version} and you have got $SALT_VERSION installed, dunno how to fix that, sorry!"
   exit 2
 }
 #{install_chef}

data/lib/kitchen/provisioner/minion.erb

@@ -5,10 +5,16 @@ 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_spm_root].gsub('/', '\\') : config[:salt_spm_root])) %>/salt
+   - <%= os_join(config[:root_path], config[:salt_file_root]) %>
+   - <%= os_join(config[:root_path], 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
+   - <%= os_join(config[:root_path], config[:salt_pillar_root]) %>
+   - <%= os_join(config[:root_path], config[:salt_spm_root], 'pillar') %>
+
+<% if windows_os? %>
+file_client: local
+winrepo_dir: <%= os_join(config[:root_path], config[:salt_file_root], 'win', 'repo') %>
+winrepo_dir_ng: <%= os_join(config[:root_path], config[:salt_file_root], 'win', 'repo-ng') %>
+<% end %>

data/lib/kitchen/provisioner/salt_solo.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+
 #
 # Author:: Simon McCartney <simon.mccartney@hp.com>
 #
@@ -16,11 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'kitchen/provisioner/base'
-require 'kitchen-salt/util'
+require 'fileutils'
+require 'hashie'
 require 'kitchen-salt/pillars'
 require 'kitchen-salt/states'
-require 'fileutils'
+require 'kitchen-salt/util'
+require 'kitchen/provisioner/base'
 require 'yaml'
 
 module Kitchen
@@ -35,50 +36,57 @@ module Kitchen
       include Kitchen::Salt::States
 
       DEFAULT_CONFIG = {
+        bootstrap_url: 'https://raw.githubusercontent.com/saltstack/kitchen-salt/master/assets/install.sh',
+        chef_bootstrap_url: 'https://www.chef.io/chef/install.sh',
+        dependencies: [],
         dry_run: false,
-        salt_version: 'latest',
-        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/',
+        install_after_init_environment: false,
+        is_file_root: false,
+        local_salt_root: nil,
+        omnibus_cachier: false,
+        pillars_from_directories: [],
+        pip_bin: 'pip',
+        pip_editable: false,
+        pip_extra_index_url: [],
+        pip_index_url: 'https://pypi.python.org/simple/',
+        pip_pkg: 'salt==%s',
+        remote_states: nil,
+        require_chef: true,
         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',
-        chef_bootstrap_url: 'https://www.getchef.com/chef/install.sh',
+        salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/',
+        salt_bootstrap_options: '',
+        salt_bootstrap_url: 'https://bootstrap.saltstack.com',
         salt_config: '/etc/salt',
-        salt_minion_config: '/etc/salt/minion',
-        salt_minion_config_template: nil,
-        salt_minion_id: nil,
+        salt_copy_filter: [],
         salt_env: 'base',
         salt_file_root: '/srv/salt',
+        salt_force_color: false,
+        salt_install: 'bootstrap',
+        salt_minion_config_dropin_files: [],
+        salt_minion_config_template: nil,
+        salt_minion_config: '/etc/salt/minion',
+        salt_minion_extra_config: {},
+        salt_minion_id: nil,
         salt_pillar_root: '/srv/pillar',
+        salt_ppa: 'ppa:saltstack/salt',
         salt_spm_root: '/srv/spm',
         salt_state_top: '/srv/salt/top.sls',
-        salt_force_color: false,
+        salt_version: 'latest',
+        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_yum_repo: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s',
+        salt_yum_rpm_key: 'https://repo.saltstack.com/yum/redhat/7/x86_64/archive/%s/SALTSTACK-GPG-KEY.pub',
         state_collection: false,
-        state_top: {},
         state_top_from_file: false,
-        salt_copy_filter: [],
-        is_file_root: false,
-        remote_states: nil,
-        require_chef: true,
-        dependencies: [],
+        state_top: {},
         vendor_path: nil,
-        vendor_repo: {},
-        omnibus_cachier: false,
-        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',
-        pip_pkg: 'salt==%s',
-        pip_editable: false,
-        pip_index_url: 'https://pypi.python.org/simple/',
-        pip_extra_index_url: [],
-        pip_bin: 'pip',
-        install_after_init_environment: false,
-      }
+        vendor_repo: {}
+      }.freeze
+
+      WIN_DEFAULT_CONFIG = {
+        chef_bootstrap_url: 'https://omnitruck.chef.io/install.ps1',
+        salt_bootstrap_url: 'https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1'
+      }.freeze
 
       # salt-call version that supports the undocumented --retcode-passthrough command
       RETCODE_VERSION = '0.17.5'.freeze
@@ -87,6 +95,12 @@ module Kitchen
         default_config k, v
       end
 
+      WIN_DEFAULT_CONFIG.each_key do |key|
+        default_config key do |provisioner|
+          provisioner.windows_os? ? WIN_DEFAULT_CONFIG[key] : DEFAULT_CONFIG[key]
+        end
+      end
+
       def install_command
         unless config[:salt_install] == 'pip' || config[:install_after_init_environment]
           setup_salt
@@ -94,9 +108,21 @@ module Kitchen
       end
 
       def prepare_command
+        cmd = ''
+        unless windows_os?
+          cmd += <<-CHOWN
+            #{sudo('chown')} -R "${SUDO_USER:-$USER}" "#{config[:root_path]}/#{config[:salt_file_root]}"
+          CHOWN
+        end
+        if config[:prepare_salt_environment]
+          cmd += <<-PREPARE
+            #{config[:prepare_salt_environment]}
+          PREPARE
+        end
         if config[:salt_install] == 'pip' || config[:install_after_init_environment]
-          setup_salt
+          cmd << setup_salt
         end
+        cmd
       end
 
       def setup_salt
@@ -110,14 +136,14 @@ module Kitchen
           config[:salt_bootstrap_options] = "-P git v#{salt_version}"
         end
 
-        if windows_os?
-          install_template = File.expand_path("./../install_win.erb", __FILE__)
-        else
-          install_template = File.expand_path("./../install.erb", __FILE__)
-        end
+        install_template = if windows_os?
+                             File.expand_path('./../install_win.erb', __FILE__)
+                           else
+                             File.expand_path('./../install.erb', __FILE__)
+                           end
 
         erb = ERB.new(File.read(install_template)).result(binding)
-        debug("Install Command:" + erb.to_s)
+        debug('Install Command:' + erb.to_s)
         erb
       end
 
@@ -126,20 +152,21 @@ 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
               }
+              [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
               (New-Object net.webclient).DownloadFile("#{chef_url}", "c:\\temp\\chef_bootstrap.ps1")
               write-host "-----> Installing Chef Omnibus (for busser/serverspec ruby support)"
               #{sudo('powershell')} c:\\temp\\chef_bootstrap.ps1
             }
           POWERSHELL
         else
-            omnibus_download_dir = config[:omnibus_cachier] ? '/tmp/vagrant-cache/omnibus_chef' : '/tmp'
-            bootstrap_url = config[:bootstrap_url]
-            bootstrap_download_dir = '/tmp'
-            <<-INSTALL
+          omnibus_download_dir = config[:omnibus_cachier] ? '/tmp/vagrant-cache/omnibus_chef' : '/tmp'
+          bootstrap_url = config[:bootstrap_url]
+          bootstrap_download_dir = '/tmp'
+          <<-INSTALL
               echo "-----> Trying to install ruby(-dev) using assets.sh from kitchen-salt"
                 mkdir -p #{bootstrap_download_dir}
                 if [ ! -x #{bootstrap_download_dir}/install.sh ]
@@ -177,24 +204,24 @@ module Kitchen
       def prepare_install
         salt_version = config[:salt_version]
         if config[:salt_install] == 'pip'
-          debug("Using pip to install")
+          debug('Using pip to install')
           if File.exist?(config[:pip_pkg])
-            debug("Installing with pip from sdist")
+            debug('Installing with pip from sdist')
             sandbox_pip_path = File.join(sandbox_path, 'pip')
             FileUtils.mkdir_p(sandbox_pip_path)
             FileUtils.cp_r(config[:pip_pkg], sandbox_pip_path)
             config[:pip_install] = File.join(config[:root_path], 'pip', File.basename(config[:pip_pkg]))
           else
-            debug("Installing with pip from download")
+            debug('Installing with pip from download')
             if salt_version != 'latest'
-              config[:pip_install] = config[:pip_pkg] % [salt_version]
+              config[:pip_install] = format(config[:pip_pkg], salt_version)
             else
               config[:pip_pkg].slice!('==%s')
               config[:pip_install] = config[:pip_pkg]
             end
           end
         elsif config[:salt_install] == 'bootstrap'
-          if File.exists?(config[:salt_bootstrap_url])
+          if File.exist?(config[:salt_bootstrap_url])
             FileUtils.cp_r(config[:salt_bootstrap_url], File.join(sandbox_path, 'bootstrap.sh'))
           end
         end
@@ -202,44 +229,50 @@ module Kitchen
 
       def init_command
         debug("Initialising Driver #{name}")
-        if windows_os?
-          cmd = "mkdir -Force -Path ""#{config[:root_path]}""\n"
-        else
-          cmd = "mkdir -p '#{config[:root_path]}';"
-        end
+        cmd = if windows_os?
+                'mkdir -Force -Path '"#{config[:root_path]}""\n"
+              else
+                "mkdir -p '#{config[:root_path]}';"
+              end
         cmd += <<-INSTALL
           #{config[:init_environment]}
         INSTALL
         cmd
       end
 
+      def os_join(*args)
+        if windows_os?
+           File.join(*args).tr('/', '\\')
+        else
+           File.join(*args)
+        end
+      end
+
       def salt_command
         salt_version = config[:salt_version]
 
-        cmd = ""
+        cmd = ''
         if windows_os?
           salt_call = "c:\\salt\\salt-call.bat"
-          salt_config_path = config[:salt_config].gsub('/', '\\')
-          cmd << "(get-content #{File.join(config[:root_path], salt_config_path, 'minion').gsub('/', '\\')}).replace(\"`$env`:TEMP\", $env:TEMP) | set-content #{File.join(config[:root_path], salt_config_path, 'minion').gsub('/', '\\')} ;"
+          salt_config_path = config[:salt_config]
+          cmd << "(get-content #{os_join(config[:root_path], salt_config_path, 'minion')}) -replace '\\$env:TEMP', $env:TEMP | set-content #{os_join(config[:root_path], salt_config_path, 'minion')} ;"
         else
           # install/update dependencies
           cmd << sudo("chmod +x #{config[:root_path]}/*.sh;")
           cmd << sudo("#{config[:root_path]}/dependencies.sh;")
           salt_config_path = config[:salt_config]
-          salt_call = "salt-call"
+          salt_call = 'salt-call'
         end
-        cmd << sudo("#{salt_call} --state-output=changes --config-dir=#{File.join(config[:root_path], salt_config_path)} --local state.highstate")
+        cmd << sudo("#{salt_call} --state-output=changes --config-dir=#{os_join(config[:root_path], salt_config_path)} state.highstate")
         cmd << " --log-level=#{config[:log_level]}" if config[:log_level]
         cmd << " --id=#{config[:salt_minion_id]}" if config[:salt_minion_id]
         cmd << " test=#{config[:dry_run]}" if config[:dry_run]
-        cmd << " --force-color" if config[:salt_force_color]
+        cmd << ' --force-color' if config[:salt_force_color]
         if salt_version > RETCODE_VERSION || salt_version == 'latest'
           # hope for the best and hope it works eventually
           cmd << ' --retcode-passthrough'
         end
-        if windows_os?
-          cmd << ' ; exit $LASTEXITCODE'
-        end
+        cmd << ' 2>&1 ; exit $LASTEXITCODE' if windows_os?
         cmd
       end
 
@@ -282,20 +315,18 @@ module Kitchen
         cp_r_with_filter(config[:data_path], tmpdata_dir, config[:salt_copy_filter])
       end
 
-      def prepare_minion
-        info('Preparing salt-minion')
-
+      def prepare_minion_base_config
         if config[:salt_minion_config_template]
           minion_template = File.expand_path(config[:salt_minion_config_template], Kitchen::Config.new.kitchen_root)
         else
-          minion_template = File.expand_path("./../minion.erb", __FILE__)
+          minion_template = File.expand_path('./../minion.erb', __FILE__)
         end
 
-        if File.extname(minion_template) == ".erb"
-          minion_config_content = ERB.new(File.read(minion_template)).result(binding)
-        else
-          minion_config_content = File.read(minion_template)
-        end
+        minion_config_content = if File.extname(minion_template) == '.erb'
+                                  ERB.new(File.read(minion_template)).result(binding)
+                                else
+                                  File.read(minion_template)
+                                end
 
         # create the temporary path for the salt-minion config file
         debug("sandbox is #{sandbox_path}")
@@ -304,6 +335,39 @@ module Kitchen
         write_raw_file(sandbox_minion_config_path, minion_config_content)
       end
 
+      def prepare_minion_extra_config
+        minion_template = File.expand_path('./../99-minion.conf.erb', __FILE__)
+
+        safe_hash = Hashie.stringify_keys(config[:salt_minion_extra_config])
+        minion_extra_config_content = ERB.new(File.read(minion_template)).result(binding)
+
+        sandbox_dropin_path = File.join(sandbox_path, 'etc/salt/minion.d')
+
+        write_raw_file(File.join(sandbox_dropin_path, '99-minion.conf'), minion_extra_config_content)
+      end
+
+      def insert_minion_config_dropins
+        sandbox_dropin_path = File.join(sandbox_path, 'etc/salt/minion.d')
+        FileUtils.mkdir_p(sandbox_dropin_path)
+
+        config[:salt_minion_config_dropin_files].each_index do |i|
+          filename = File.basename(config[:salt_minion_config_dropin_files][i])
+          index = (99 - config[:salt_minion_config_dropin_files].count + i).to_s.rjust(2, '0')
+
+          file = File.expand_path(config[:salt_minion_config_dropin_files][i])
+          data = File.read(file)
+
+          write_raw_file(File.join(sandbox_dropin_path, [index, filename].join('-')), data)
+        end
+      end
+
+      def prepare_minion
+        info('Preparing salt-minion')
+        prepare_minion_base_config
+        prepare_minion_extra_config if config[:salt_minion_extra_config].keys.any?
+        insert_minion_config_dropins if config[:salt_minion_config_dropin_files].any?
+      end
+
       def prepare_grains
         debug("Grains Hash: #{config[:grains]}")
 
@@ -326,14 +390,14 @@ module Kitchen
         # PLACEHOLDER, git formulas might be fetched locally to temp and uploaded
 
         # setup spm
-        spm_template = File.expand_path("./../spm.erb", __FILE__)
+        spm_template = File.expand_path('./../spm.erb', __FILE__)
         spm_config_content = ERB.new(File.read(spm_template)).result(binding)
         sandbox_spm_config_path = File.join(sandbox_path, config[:salt_config], 'spm')
         write_raw_file(sandbox_spm_config_path, spm_config_content)
 
-        spm_repos = config[:vendor_repo].select{|x| x[:type]=='spm'}.each{|x| x[:url]}.map {|x| x[:url] }
+        spm_repos = config[:vendor_repo].select { |x| x[:type] == 'spm' }.each { |x| x[:url] }.map { |x| x[:url] }
         spm_repos.each do |url|
-          id=url.gsub(/[htp:\/.]/,'')
+          id = url.gsub(/[htp:\/.]/, '')
           spmreposd = File.join(sandbox_path, 'etc', 'salt', 'spm.repos.d')
           repo_spec = File.join(spmreposd, 'spm.repo')
           FileUtils.mkdir_p(spmreposd)
@@ -345,13 +409,12 @@ module Kitchen
         end
 
         # upload scripts
-        %w(formula-fetch.sh repository-setup.sh).each do |script|
+        %w[formula-fetch.sh repository-setup.sh].each do |script|
           write_raw_file(File.join(sandbox_path, script), File.read(File.expand_path("../#{script}", __FILE__)))
         end
-        dependencies_script = File.expand_path("./../dependencies.erb", __FILE__)
+        dependencies_script = File.expand_path('./../dependencies.erb', __FILE__)
         dependencies_content = ERB.new(File.read(dependencies_script)).result(binding)
         write_raw_file(File.join(sandbox_path, 'dependencies.sh'), dependencies_content)
-
       end
     end
   end

data/lib/kitchen/verifier/runtests.rb

@@ -23,7 +23,10 @@ module Kitchen
 
       def call(state)
         info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
-        root_path = (config[:windows] ? '$env:TEMP\\kitchen' : '/tmp/kitchen')
+        root_path = (config[:windows] ? '%TEMP%\\kitchen' : '/tmp/kitchen')
+        if ENV['KITCHEN_TESTS']
+          ENV['KITCHEN_TESTS'].split(' ').each{|test| config[:tests].push(test)}
+        end
         command = [
           (config[:windows] ? 'python.exe' : config[:python_bin]),
           File.join(root_path, config[:testingdir], '/tests/runtests.py'),
@@ -31,18 +34,25 @@ module Kitchen
           '--output-columns=80',
           (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
           (config[:transport] ? "--transport=#{config[:transport]}" : ''),
-          (config[:verbose] ? '-v' : ''),
+          (config[:verbose] ? '-vv' : '-v'),
           (config[:run_destructive] ? "--run-destructive" : ''),
           (config[:coverage_xml] ? "--coverage-xml=#{config[:coverage_xml]}" : ''),
           (config[:xml] ? "--xml=#{config[:xml]}" : ''),
           config[:types].collect{|type| "--#{type}"}.join(' '),
           config[:tests].collect{|test| "-n #{test}"}.join(' '),
+          '2>&1',
         ].join(' ')
+        if config[:windows]
+           command = "cmd.exe /c \"#{command}\" 2>&1"
+        end
         info("Running Command: #{command}")
         instance.transport.connection(state) do |conn|
           begin
             if config[:windows]
               conn.execute('$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")')
+              conn.execute("$env:PythonPath = [Environment]::ExpandEnvironmentVariables(\"#{root_path}\\testing\")")
+            else
+              conn.execute(sudo("chown -R $USER #{root_path}"))
             end
             conn.execute(sudo(command))
           ensure

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: kitchen-sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,6 +147,7 @@ files:
 - lib/kitchen-salt/states.rb
 - lib/kitchen-salt/util.rb
 - lib/kitchen-salt/version.rb
+- lib/kitchen/provisioner/99-minion.conf.erb
 - lib/kitchen/provisioner/dependencies.erb
 - lib/kitchen/provisioner/formula-fetch.sh
 - lib/kitchen/provisioner/install.erb