From 2c082fc561e8d470afb5b1ac72a2dfc6e4a59838 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 27 Jul 2022 16:44:41 +0900
Subject: [PATCH] Remove deprecated mistral::engine parameters

These parameters were deprecated during Yoga cycle[1] in favor of
the new independent mistral::execution_expiration_policy class.

[1] 0b8ca269cb7d966818bcdaee8b0b112d492b7e51

Change-Id: Iad14d98440632f3587e672c047ca09a246258ca8
---
 manifests/engine.pp                           | 29 -------------------
 ...ation_policy-cleanup-dc52ae9a060f8d87.yaml |  8 +++++
 spec/classes/mistral_engine_spec.rb           | 12 --------
 3 files changed, 8 insertions(+), 41 deletions(-)
 create mode 100644 releasenotes/notes/execution_expiration_policy-cleanup-dc52ae9a060f8d87.yaml

diff --git a/manifests/engine.pp b/manifests/engine.pp
index f320749..f4fb692 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -52,22 +52,6 @@
 #   (Optional) Enables starting subworkflows via RPC.
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*evaluation_interval*]
-#   (Optional) How often will the executions be evaluated
-#   (in minutes). For example for value 120 the interval
-#   will be 2 hours (every 2 hours).
-#   Defaults to undef.
-#
-# [*older_than*]
-#   (Optional) Evaluate from which time remove executions in minutes.
-#   For example when older_than = 60, remove all executions
-#   that finished a 60 minutes ago or more.
-#   Minimum value is 1.
-#   Note that only final state execution will remove (SUCCESS/ERROR).
-#   Defaults to undef.
-#
 class mistral::engine (
   $package_ensure                       = present,
   $manage_service                       = true,
@@ -80,24 +64,11 @@ class mistral::engine (
   $execution_integrity_check_batch_size = $::os_service_default,
   $action_definition_cache_time         = $::os_service_default,
   $start_subworkflows_via_rpc           = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $evaluation_interval                  = undef,
-  $older_than                           = undef,
 ) {
 
   include mistral::deps
   include mistral::params
 
-  if $evaluation_interval != undef {
-    warning('The mistral::engine::evaluation_interval parameter is deprecated. \
-Use the mistral::execution_expiration_policy class instead.')
-  }
-  if $older_than != undef {
-    warning('The mistral::engine::older_than parameter is deprecated. \
-Use the mistral::execution_expiration_policy class instead.')
-  }
-  include mistral::execution_expiration_policy
-
   package { 'mistral-engine':
     ensure => $package_ensure,
     name   => $::mistral::params::engine_package_name,
diff --git a/releasenotes/notes/execution_expiration_policy-cleanup-dc52ae9a060f8d87.yaml b/releasenotes/notes/execution_expiration_policy-cleanup-dc52ae9a060f8d87.yaml
new file mode 100644
index 0000000..689fee1
--- /dev/null
+++ b/releasenotes/notes/execution_expiration_policy-cleanup-dc52ae9a060f8d87.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``mistral::engine`` class have been
+    removed.
+
+    - ``evaluation_interval``
+    - ``older_than``
diff --git a/spec/classes/mistral_engine_spec.rb b/spec/classes/mistral_engine_spec.rb
index 07f8929..22d901e 100644
--- a/spec/classes/mistral_engine_spec.rb
+++ b/spec/classes/mistral_engine_spec.rb
@@ -26,11 +26,6 @@ describe 'mistral::engine' do
           .with_value('<SERVICE DEFAULT>')
         is_expected.to contain_mistral_config('engine/start_subworkflows_via_rpc')
           .with_value('<SERVICE DEFAULT>')
-
-        is_expected.to contain_mistral_config('execution_expiration_policy/evaluation_interval')\
-          .with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_mistral_config('execution_expiration_policy/older_than')\
-          .with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -45,8 +40,6 @@ describe 'mistral::engine' do
           :execution_integrity_check_batch_size => 5,
           :action_definition_cache_time         => 60,
           :start_subworkflows_via_rpc           => false,
-          :evaluation_interval                  => 1234,
-          :older_than                           => 60
         })
       end
 
@@ -67,11 +60,6 @@ describe 'mistral::engine' do
           .with_value(params[:action_definition_cache_time])
         is_expected.to contain_mistral_config('engine/start_subworkflows_via_rpc')
           .with_value(params[:start_subworkflows_via_rpc])
-
-        is_expected.to contain_mistral_config('execution_expiration_policy/evaluation_interval')\
-          .with_value(params[:evaluation_interval])
-        is_expected.to contain_mistral_config('execution_expiration_policy/older_than')\
-          .with_value(params[:older_than])
       end
     end