starlingx/stx-puppet
Code Issues Proposed changes

Merge "Add variables for snmp in fm.conf"

Browse Source
This commit is contained in:
Zuul 2020-12-15 21:12:02 +00:00 committed by Gerrit Code Review
commit e21cea31db
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ class fm (
$region_name = undef, $region_name = undef,
$trap_destinations = undef, $trap_destinations = undef,
$sysinv_catalog_info = undef, $sysinv_catalog_info = undef,
$snmp_enabled = 0,
) inherits fm::params { ) inherits fm::params {
include ::fm::deps include ::fm::deps
@ -106,6 +107,12 @@ class fm (
'sysinv/os_region_name': value => $region_name; 'sysinv/os_region_name': value => $region_name;
} }
fm_config {
'snmp/snmp_enabled': value => $snmp_enabled;
'snmp/trap_server_ip': value => 'controller';
'snmp/trap_server_port': value => '162';
}
fm_api_paste_ini { fm_api_paste_ini {
'pipeline:fm-api/pipeline': value => 'request_id authtoken api_v1'; 'pipeline:fm-api/pipeline': value => 'request_id authtoken api_v1';
'filter:request_id/paste.filter_factory': value => 'oslo_middleware:RequestId.factory'; 'filter:request_id/paste.filter_factory': value => 'oslo_middleware:RequestId.factory';

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

@ -7,6 +7,7 @@ class platform::fm::params (
$service_enabled = true, $service_enabled = true,
$trap_destinations = [], $trap_destinations = [],
$sysinv_catalog_info = 'platform:sysinv:internalURL', $sysinv_catalog_info = 'platform:sysinv:internalURL',
$snmp_enabled = 0,
) { } ) { }
@ -19,6 +20,7 @@ class platform::fm::config
system_name => $system_name, system_name => $system_name,
trap_destinations => $trap_dest_str, trap_destinations => $trap_dest_str,
sysinv_catalog_info => $sysinv_catalog_info, sysinv_catalog_info => $sysinv_catalog_info,
snmp_enabled => $snmp_enabled,
} }
} }