kitchen-salt 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b37d106829f94550c409e6eebb9c1d745bf7ed
-  data.tar.gz: d305501da8d91fee412673540ee66f90f995c18e
+  metadata.gz: f03994ca6c8646d68c1b86979dfdd41f32a2fa89
+  data.tar.gz: a82c4bea05fde368a1e2dd19e290076519a24cf8
 SHA512:
-  metadata.gz: 7c68cbaf25d24cd854d022b68cade1cef34dd4d41d7fcd54df36dce4cacb076a168fdc5168259e50267095b3fd39aec56c8d8c426c444bebdfd64a5dec400285
-  data.tar.gz: a0f348d5b3343bf85d83a1989e08f9b422e5af006d00038bfd942a121603b4d2b8ae4a6ff300c7c6589d1db6e41c180202bae41508a5ac0fc97ee4f411a7f3a7
+  metadata.gz: d7804949ec34cb3b6bd138131d515cd9e48727aa0ae09a733d864e22e4326c93bd6840989a7bf7d69320beb774937fa353837c12abede923a033ae90bb574523
+  data.tar.gz: d5028e5a136ed489c6b9c002323cd965b99d87c7009c84a8d90e8325a3446b8ab61127db3a290beee832953c86801905f1d23b61dfce88f0bd5b2c51eac5b43f

data/lib/kitchen/provisioner/dependencies.erb

@@ -8,7 +8,10 @@ def install_dependencies
     test ! -e "$(dirname $0)/repository-setup.sh" || . "$(dirname $0)/repository-setup.sh"
 
     export SALT_ROOT="#{config[:root_path]}/#{config[:salt_file_root]}";
+    export SALT_SHARE_DIR='/usr/share/salt-formulas'
+
     mkdir -p "${SALT_ROOT}";
+    mkdir -p "${SALT_SHARE_DIR}";
   INSTALL
 
 
@@ -55,34 +58,38 @@ def install_dependencies
   end
 
   # install formulas
-  config[:dependencies].select{|dependency| dependency.has_key?(:repo)}.each do |formula|
+  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
-    case formula[:repo]
-    when 'git'
-      script += <<-INSTALL
-        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
-    when 'yum'
-      script += <<-INSTALL
-        #{sudo('yum')} install -y #{formula[:package]||formula[:name]};
-      INSTALL
-    when 'apt'
-      script += <<-INSTALL
-        #{sudo('apt-get')} install -y #{formula[:package]||formula[:name]};
-      INSTALL
+    if formula.key?(:repo)
+      case formula[:repo]
+      when 'git'
+        script += <<-INSTALL
+          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
+      when 'yum'
+        script += <<-INSTALL
+          #{sudo('yum')} install -y #{formula[:package]||formula[:name]};
+        INSTALL
+      when 'apt'
+        script += <<-INSTALL
+          #{sudo('apt-get')} install -y #{formula[:package]||formula[:name]};
+        INSTALL
+      end
+    elsif formula.key?(:path)
+      prepare_formula formula[:path], formula[:name]
     end
   end
   script += <<-INSTALL
     linkFormulas "$SALT_ROOT"
-    #{sudo('chown')} kitchen.kitchen -R /usr/share/salt-formulas;
-    #{sudo('chown')} kitchen.kitchen -R "$SALT_ROOT";
+    #{sudo('chown')} kitchen.kitchen -R "${SALT_SHARE_DIR}";
+    #{sudo('chown')} kitchen.kitchen -R "${SALT_ROOT}";
     ls -la "$SALT_ROOT";
   INSTALL
   return script

data/lib/kitchen/provisioner/install.erb

@@ -13,7 +13,8 @@ sh -c '
 #{Util.shell_helpers}
 
 # what version of salt is installed?
-SALT_VERSION=`salt-call --version | cut -d " " -f 2`
+command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
+command -v locale-gen >/dev/null 2>&1 && #{sudo('locale-gen')} en_US.UTF-8
 set +x
 
 
@@ -49,10 +50,39 @@ then
   #{sudo('apt-add-repository')} -y #{salt_ppa}
   #{sudo('apt-get')} update
   #{sudo('apt-get')} install -y salt-minion salt-common
+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
+  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('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}")}
+enabled=1
+gpgcheck=1
+gpgkey=#{Shellwords.escape("https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/#{salt_version}/SALTSTACK-GPG-KEY.pub")}
+EOL
+  fi
+  #{sudo('yum')} clean expire-cache
+  echo "-----> Installing salt-minion (#{salt_version})"
+  #{sudo('yum')} install -y salt-minion salt-common
 fi
 
 # check again, now that an install of some form should have happened
-SALT_VERSION=`salt-call --version | cut -d " " -f 2`
+command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
+
+# extract short format of Salt version
+if [ ! -z "${SALT_VERSION}" ]
+then
+  YEAR=$(echo "$SALT_VERSION" | cut -d "." -f1)
+  MONTH=$(echo "$SALT_VERSION" | cut -d "." -f2)
+  SALT_VERSION="${YEAR}.${MONTH}"
+fi
 
 if [ -z "${SALT_VERSION}" ]
 then

data/lib/kitchen/provisioner/salt_solo.rb

@@ -274,17 +274,21 @@ module Kitchen
         # PLACEHOLDER, git formulas might be fetched locally to temp and uploaded
 
         # setup spm
+        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.each do |url|
           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)
-          repo_content = '
-            #{id}:
-              url: #{url}
-
-          '
+          repo_content = "
+#{id}:
+  url: #{url}
+"
           write_raw_file(repo_spec, repo_content)
         end
 

data/lib/kitchen/provisioner/spm.erb

@@ -0,0 +1,8 @@
+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_exclude:
+- .git
+- .svn
+- .idea
+- .kitchen

data/lib/kitchen-salt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -84,7 +84,8 @@ files:
 - lib/kitchen/provisioner/minion.erb
 - lib/kitchen/provisioner/repository-setup.sh
 - lib/kitchen/provisioner/salt_solo.rb
-homepage: https://github.com//kitchen-salt
+- lib/kitchen/provisioner/spm.erb
+homepage: https://github.com/saltstack/kitchen-salt
 licenses:
 - Apache-2.0
 metadata: {}
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.4.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen