diff --git a/Gemfile b/Gemfile index 1571dd49..2aeb27f5 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb b/modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb deleted file mode 100644 index fd056f5a..00000000 --- a/modules/kafo_configure/lib/puppet/parser/functions/add_progress.rb +++ /dev/null @@ -1,43 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:add_progress) do |args| - loaded = false - begin - require 'puppet/transaction' - loaded = true - rescue LoadError - ::Puppet.warning 'Unable to load puppet/transaction for progress bar support, this version may not be supported' - end - - if loaded - # Monkey patch the transaction to put our wrapper around the report object - class Puppet::Transaction - attr_accessor :in_main_catalog - - def is_interesting?(resource) - return false if resource.class.name == :component # ignore defined types - ![:schedule, :class, :stage, :filebucket, :anchor, :concat_fragment].include?(resource.to_s.split('[')[0].downcase.to_sym) - end - - def tracked_resources - @tracked_resources ||= catalog.vertices.select { |resource| is_interesting?(resource) }.map(&:to_s) - end - - def evaluate_with_trigger(*args, &block) - if catalog.version - self.in_main_catalog = true - tracked_resources.each { |r| ::Puppet.info "MONITOR_RESOURCE #{r}" } - end - evaluate_without_trigger(*args, &block) - self.in_main_catalog = false if catalog.version - end - - if method_defined?(:evaluate) && method_defined?(:report) - alias_method :evaluate_without_trigger, :evaluate - alias_method :evaluate, :evaluate_with_trigger - else - ::Puppet.warning 'Unable to patch Puppet transactions for progress bar support, this version may not be supported' - end - end - end - end -end diff --git a/modules/kafo_configure/manifests/init.pp b/modules/kafo_configure/manifests/init.pp index 9f80635a..05ed7455 100644 --- a/modules/kafo_configure/manifests/init.pp +++ b/modules/kafo_configure/manifests/init.pp @@ -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, ) { - if $add_progress and SemVer($facts['puppetversion']) =~ SemVerRange('< 6.0.0') { - add_progress() - } - lookup('classes', {merge => unique}).include }