starlingx/stx-puppet
Code Issues Proposed changes

Merge "Remove trap destination from fm.conf"

Browse Source
This commit is contained in:
Zuul 2021-01-25 16:10:38 +00:00 committed by Gerrit Code Review
commit efa9b46947
2 changed files with 0 additions and 5 deletions
modules/puppet-fm/src/fm/manifests
init.pp
puppet-manifests/src/modules/platform/manifests
fm.pp

2
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)

3
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,