Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #32611: Drop Puppet 5 support #336

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ end
if ENV['PUPPET_VERSION']
gem 'puppet', "~> #{ENV['PUPPET_VERSION']}"
else
gem 'puppet', '>= 4.5.0', '< 8.0.0'
gem 'puppet', '>= 6.0.0', '< 8.0.0'
end

gem 'puppet-strings', RUBY_VERSION >= '2.1' ? '>= 1.2.1' : '~> 1.2.1'
Expand Down
43 changes: 0 additions & 43 deletions modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb

This file was deleted.

7 changes: 0 additions & 7 deletions modules/kafo_configure/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
# $modulepath/config/answers.yaml
# /etc/kafo-configure/answers.yaml
#
# @param add_progress
# Whether to add a progress bar. Only works on Puppet < 6.
class kafo_configure(
Boolean $add_progress = $::kafo_add_progress,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're dropping this, please also drop all code for it:

#{add_progress}

def add_progress
%{$kafo_add_progress=#{!KafoConfigure.verbose}}
end

(and the tests)

) {
if $add_progress and SemVer($facts['puppetversion']) =~ SemVerRange('< 6.0.0') {
add_progress()
}

lookup('classes', {merge => unique}).include
}