diff --git a/modules/puppet-fm/src/fm/manifests/init.pp b/modules/puppet-fm/src/fm/manifests/init.pp
index db05aeb7f..fa2401237 100644
--- a/modules/puppet-fm/src/fm/manifests/init.pp
+++ b/modules/puppet-fm/src/fm/manifests/init.pp
@@ -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 {
diff --git a/puppet-manifests/src/modules/platform/manifests/fm.pp b/puppet-manifests/src/modules/platform/manifests/fm.pp
index 18c8866c9..a5364d1c1 100644
--- a/puppet-manifests/src/modules/platform/manifests/fm.pp
+++ b/puppet-manifests/src/modules/platform/manifests/fm.pp
@@ -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,
   }
 }