From 978dea28f21592ad4aa79e99821b70a1b07ab438 Mon Sep 17 00:00:00 2001
From: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Date: Wed, 20 Jan 2021 09:47:34 -0300
Subject: [PATCH] Remove trap destination from fm.conf
With the host-based SNMP removal,
remove trap_destination entry from fm.conf
Story: 2008132
Task: 41350
Change-Id: I3f0298233beedc3370fa8c4c2dbc65fe678b14a6
Depends-On: https://review.opendev.org/765381
Signed-off-by: Takamasa Takenaka <takamasa.takenaka@windriver.com>
---
modules/puppet-fm/src/fm/manifests/init.pp | 2 --
puppet-manifests/src/modules/platform/manifests/fm.pp | 3 ---
2 files changed, 5 deletions(-)
diff --git a/modules/puppet-fm/src/fm/manifests/init.pp b/modules/puppet-fm/src/fm/manifests/init.pp
index fa2401237..014ab18d1 100644
--- a/modules/puppet-fm/src/fm/manifests/init.pp
+++ b/modules/puppet-fm/src/fm/manifests/init.pp
@@ -75,7 +75,6 @@ class fm (
$event_log_max_size = 4000,
$system_name = undef,
$region_name = undef,
- $trap_destinations = undef,
$sysinv_catalog_info = undef,
$snmp_enabled = 0,
$snmp_trap_server_port = 162,
@@ -91,7 +90,6 @@ class fm (
'DEFAULT/event_log_max_size': value => $event_log_max_size;
'DEFAULT/system_name': value => $system_name;
'DEFAULT/region_name': value => $region_name;
- 'DEFAULT/trap_destinations': value => $trap_destinations;
}
# Automatically add psycopg2 driver to postgresql (only does this if it is missing)
diff --git a/puppet-manifests/src/modules/platform/manifests/fm.pp b/puppet-manifests/src/modules/platform/manifests/fm.pp
index a5364d1c1..ed185be63 100644
--- a/puppet-manifests/src/modules/platform/manifests/fm.pp
+++ b/puppet-manifests/src/modules/platform/manifests/fm.pp
@@ -5,7 +5,6 @@ class platform::fm::params (
$system_name = undef,
$service_create = false,
$service_enabled = true,
- $trap_destinations = [],
$sysinv_catalog_info = 'platform:sysinv:internalURL',
$snmp_enabled = 0,
$snmp_trap_server_port = 162,
@@ -15,11 +14,9 @@ class platform::fm::params (
class platform::fm::config
inherits ::platform::fm::params {
- $trap_dest_str = join($trap_destinations,',')
class { '::fm':
region_name => $region_name,
system_name => $system_name,
- trap_destinations => $trap_dest_str,
sysinv_catalog_info => $sysinv_catalog_info,
snmp_enabled => $snmp_enabled,
snmp_trap_server_port => $snmp_trap_server_port,