From 413cfa8f01b30a263ecacf420a14b9c9158ba9cf Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 12 Dec 2023 13:02:20 -0600 Subject: [PATCH] Fixed distributed_cleanup policy for feeders and rhel-8 superhubs Only superhub needs distributed_cleanup_dependencies bundle run. rhel-8 has special package name for python3, python36. Ticket: ENT-10960 Changelog: title Co-authored-by: Nick Anderson (cherry picked from commit 4d956c055a97fe0936fa345d96f862475f93d828) --- cfe_internal/enterprise/federation/federation.cf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cfe_internal/enterprise/federation/federation.cf b/cfe_internal/enterprise/federation/federation.cf index e017b71496..1dd0679441 100644 --- a/cfe_internal/enterprise/federation/federation.cf +++ b/cfe_internal/enterprise/federation/federation.cf @@ -185,10 +185,12 @@ bundle agent distributed_cleanup_dependencies # on feeders only the shell script is run so no python dependencies needed there. { vars: - debian|ubuntu|redhat_8|centos_8|redhat_9|rocky_9:: + debian|ubuntu|redhat_9|rocky_9:: "packages" slist => { "python3", "python3-urllib3" }; + redhat_8|centos_8:: + "packages" slist => { "python36", "python3-urllib3" }; - centos_7:: + redhat_7|centos_7:: "packages" slist => { "python3" }; classes: @@ -218,7 +220,6 @@ bundle agent distributed_cleanup_dependencies "$(packages)" policy => "present", classes => default:results("bundle", "cfengine_mp_fr_distributed_cleanup_packages"), - action => default:policy ( "warn" ), package_module => default:yum; reports: @@ -855,12 +856,12 @@ bundle agent entry usebundle => "distributed_cleanup_dependencies"; "Distributed Cleanup Setup" handle => "distributed_cleanup_setup", - depends_on => { "transport_user", "data_transport", "distributed_cleanup_dependencies" }, + depends_on => { "transport_user", "data_transport" }, usebundle => "distributed_cleanup_setup"; "Distributed Federated Host Cleanup" handle => "distributed_cleanup", if => "enabled.am_on.am_superhub.!am_paused", - depends_on => { "imported_data", "distributed_cleanup_setup" }, + depends_on => { "imported_data", "distributed_cleanup_setup", "distributed_cleanup_dependencies" }, usebundle => distributed_cleanup_run; reports: