From b8f6b78e5ceb19e90fc7e94472eb48706a18b01b Mon Sep 17 00:00:00 2001 From: neillturner Date: Fri, 18 Nov 2016 11:05:03 +0000 Subject: [PATCH] yum localinstall fails on fedora --- lib/kitchen-puppet/version.rb | 2 +- lib/kitchen/provisioner/puppet_apply.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/kitchen-puppet/version.rb b/lib/kitchen-puppet/version.rb index be4e83a..5cb92ef 100644 --- a/lib/kitchen-puppet/version.rb +++ b/lib/kitchen-puppet/version.rb @@ -2,6 +2,6 @@ module Kitchen module Puppet - VERSION = '1.45.1'.freeze + VERSION = '1.45.2'.freeze end end diff --git a/lib/kitchen/provisioner/puppet_apply.rb b/lib/kitchen/provisioner/puppet_apply.rb index 09d75f8..aea6a50 100644 --- a/lib/kitchen/provisioner/puppet_apply.rb +++ b/lib/kitchen/provisioner/puppet_apply.rb @@ -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")} @@ -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