Skip to content

Commit

Permalink
yum localinstall fails on fedora
Browse files Browse the repository at this point in the history
  • Loading branch information
neillturner committed Nov 18, 2016
1 parent aa70a77 commit b8f6b78
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/kitchen-puppet/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Kitchen
module Puppet
VERSION = '1.45.1'.freeze
VERSION = '1.45.2'.freeze
end
end
8 changes: 4 additions & 4 deletions lib/kitchen/provisioner/puppet_apply.rb
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ def install_command_collections
#{Util.shell_helpers}
if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
#{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
echo "-----> #{sudo_env('yum')} -y install #{config[:puppet_yum_collections_repo]}"
#{sudo_env('yum')} -y install #{config[:puppet_yum_collections_repo]}
#{sudo_env('yum')} -y install puppet-agent#{puppet_redhat_version}
fi
#{install_eyaml("#{config[:puppet_coll_remote_path]}/puppet/bin/gem")}
Expand Down Expand Up @@ -333,8 +333,8 @@ def install_command_collections
if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ] || \
[ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
echo "-----> #{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}"
#{sudo_env('yum')} -y localinstall #{config[:puppet_yum_collections_repo]}
echo "-----> #{sudo_env('yum')} -y install #{config[:puppet_yum_collections_repo]}"
#{sudo_env('yum')} -y install #{config[:puppet_yum_collections_repo]}
#{sudo_env('yum')} -y install puppet-agent#{puppet_redhat_version}
else
#{sudo('apt-get')} -y install wget
Expand Down

0 comments on commit b8f6b78

Please sign in to comment.