From 020cfa9d638a386d3e899eaa443b6fbd83e29552 Mon Sep 17 00:00:00 2001
From: mmachado <mmachado@windriver.com>
Date: Mon, 18 Nov 2024 16:07:59 -0300
Subject: [PATCH] Remove sw-patch-agent.service from manifests

sw-patch-agent service is to be disabled and must be removed
from patching and keystone manifests.

Depends-On: https://review.opendev.org/c/starlingx/config/+/936143

Test-Plan:
PASS: AIO-SX upgrade using sw-manager strategy
PASS: AIO-DX System Controller upgrade using strategy
PASS: subcloud upgrade using dcmanager strategy

Story: 2010676
Task: 51386

Change-Id: I201de8f2f2f4f16ad2d01933881a61f3ad41af7c
Signed-off-by: mmachado <mmachado@windriver.com>
---
 .../src/patching/manifests/init.pp                |  5 -----
 .../src/modules/openstack/manifests/keystone.pp   |  5 -----
 .../src/modules/platform/manifests/patching.pp    | 15 ---------------
 3 files changed, 25 deletions(-)

diff --git a/modules/puppet-patching/src/patching/manifests/init.pp b/modules/puppet-patching/src/patching/manifests/init.pp
index 80998c44a..9837a8af8 100644
--- a/modules/puppet-patching/src/patching/manifests/init.pp
+++ b/modules/puppet-patching/src/patching/manifests/init.pp
@@ -28,11 +28,6 @@ class patching (
     'runtime/agent_port':            value => $agent_port;
   }
 
-  Patching_config<||> ~> service { 'sw-patch-agent.service':
-    ensure => 'running',
-    enable => true,
-  }
-
   if $::personality == 'controller' {
     Patching_config<||> ~> service { 'sw-patch-controller-daemon.service':
       ensure => 'running',
diff --git a/puppet-manifests/src/modules/openstack/manifests/keystone.pp b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
index 38f9ca001..6aff8e233 100644
--- a/puppet-manifests/src/modules/openstack/manifests/keystone.pp
+++ b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
@@ -564,11 +564,6 @@ class openstack::keystone::barbican::password::runtime {
 class openstack::keystone::patching::password::runtime {
   include ::patching::api
 
-  Patching_config<||> ~> service { 'sw-patch-agent.service':
-    ensure => 'running',
-    enable => true,
-  }
-
   if $::personality == 'controller' {
     Patching_config<||> ~> service { 'sw-patch-controller-daemon.service':
       ensure => 'running',
diff --git a/puppet-manifests/src/modules/platform/manifests/patching.pp b/puppet-manifests/src/modules/platform/manifests/patching.pp
index eaa53ec86..28a8fca1a 100644
--- a/puppet-manifests/src/modules/platform/manifests/patching.pp
+++ b/puppet-manifests/src/modules/platform/manifests/patching.pp
@@ -91,18 +91,3 @@ class platform::patching::api (
 
   include ::platform::patching::haproxy
 }
-
-class platform::patching::agent::reload {
-
-  exec { 'restart sw-patch-agent':
-    command   => '/usr/sbin/sw-patch-agent-restart',
-    logoutput => true,
-  }
-}
-
-class platform::patching::runtime {
-
-  class {'::platform::patching::agent::reload':
-    stage => post
-  }
-}