Drop uses of max_version

theforeman · Feb 21, 2024 · 6078740 · 6078740
1 parent 596a4d4
commit 6078740
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 72 deletions.
diff --git a/definitions/features/foreman_proxy.rb b/definitions/features/foreman_proxy.rb
@@ -28,11 +28,7 @@ def dhcpd_conf_exist?
   end
 
   def services
-    services = [system_service('foreman-proxy', 40)]
-    if check_max_version('foreman-proxy', '2.4')
-      services << system_service('smart_proxy_dynflow_core', 20)
-    end
-    services
+    [system_service('foreman-proxy', 40)]
   end
 
   def features

diff --git a/definitions/features/foreman_tasks.rb b/definitions/features/foreman_tasks.rb
@@ -91,11 +91,9 @@ def delete(state)
       DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
       -- Delete locks and links which may now be orphaned
       DELETE FROM foreman_tasks_locks as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
+      DELETE FROM foreman_tasks_links as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
     SQL
 
-    sql += 'DELETE FROM foreman_tasks_links as ftl ' \
-           'where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);'
-
     feature(:foreman_database).psql("BEGIN; #{sql}; COMMIT;")
 
     count(state)

diff --git a/definitions/procedures/foreman/remove_duplicate_obsolete_roles.rb b/definitions/procedures/foreman/remove_duplicate_obsolete_roles.rb