From 3ca2387ddbb455a081689be72632b408988c5d39 Mon Sep 17 00:00:00 2001
From: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Date: Tue, 3 Nov 2020 15:35:29 -0300
Subject: [PATCH] Add variables for snmp in fm.conf

Snmp trap client needs the following three variables
to connect to snmp trap server.
- trap_server_ip
- trap_server_port
- snmp_enabled
Modify puppet to add these variables. trap_server_ip
and trap_server_port are fixed. snmp_enabled takes
True/False depends on snmp armada app is applied
or not (True when applied).

Change-Id: Ibedaf772153f49c6dfefe644044da07b5d32bb20
Story: 2008132
Task: 41207
Depends-On: https://review.opendev.org/761213
Signed-off-by: Takamasa Takenaka <takamasa.takenaka@windriver.com>
---
 modules/puppet-fm/src/fm/manifests/init.pp            | 7 +++++++
 puppet-manifests/src/modules/platform/manifests/fm.pp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/modules/puppet-fm/src/fm/manifests/init.pp b/modules/puppet-fm/src/fm/manifests/init.pp
index 2f63292b8..db05aeb7f 100644
--- a/modules/puppet-fm/src/fm/manifests/init.pp
+++ b/modules/puppet-fm/src/fm/manifests/init.pp
@@ -77,6 +77,7 @@ class fm (
   $region_name                        = undef,
   $trap_destinations                  = undef,
   $sysinv_catalog_info                = undef,
+  $snmp_enabled                       = 0,
 ) inherits fm::params {
 
   include ::fm::deps
@@ -106,6 +107,12 @@ class fm (
     '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 {
     'pipeline:fm-api/pipeline': value => 'request_id authtoken api_v1';
     'filter:request_id/paste.filter_factory': value => 'oslo_middleware:RequestId.factory';
diff --git a/puppet-manifests/src/modules/platform/manifests/fm.pp b/puppet-manifests/src/modules/platform/manifests/fm.pp
index 31ee7bcaf..18c8866c9 100644
--- a/puppet-manifests/src/modules/platform/manifests/fm.pp
+++ b/puppet-manifests/src/modules/platform/manifests/fm.pp
@@ -7,6 +7,7 @@ class platform::fm::params (
   $service_enabled = true,
   $trap_destinations = [],
   $sysinv_catalog_info = 'platform:sysinv:internalURL',
+  $snmp_enabled = 0,
 ) { }
 
 
@@ -19,6 +20,7 @@ class platform::fm::config
     system_name         => $system_name,
     trap_destinations   => $trap_dest_str,
     sysinv_catalog_info => $sysinv_catalog_info,
+    snmp_enabled        => $snmp_enabled,
   }
 }