starlingx/stx-puppet
Code Issues Proposed changes

Merge "Support trap_server_port configurable"

Browse Source
This commit is contained in:
Zuul 2021-01-19 22:12:27 +00:00 committed by Gerrit Code Review
commit adb848ecb9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/puppet-fm/src/fm/manifests/init.pp
View File

@ -78,6 +78,7 @@ class fm (
$trap_destinations = undef,
$sysinv_catalog_info = undef,
$snmp_enabled = 0,
$snmp_trap_server_port = 162,
) inherits fm::params {
include ::fm::deps
@ -110,7 +111,7 @@ class fm (
fm_config {
'snmp/snmp_enabled': value => $snmp_enabled;
'snmp/trap_server_ip': value => 'controller';
'snmp/trap_server_port': value => '162';
'snmp/trap_server_port': value => $snmp_trap_server_port;
}
fm_api_paste_ini {

12
puppet-manifests/src/modules/platform/manifests/fm.pp
View File

@ -8,6 +8,7 @@ class platform::fm::params (
$trap_destinations = [],
$sysinv_catalog_info = 'platform:sysinv:internalURL',
$snmp_enabled = 0,
$snmp_trap_server_port = 162,
) { }
@ -16,11 +17,12 @@ class platform::fm::config
$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,
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,
}
}