From f5d212010bbfe9bcf4d716e4b9a216c59289e3a6 Mon Sep 17 00:00:00 2001
From: Eric MacDonald <eric.macdonald@windriver.com>
Date: Tue, 2 Oct 2018 08:03:01 -0400
Subject: [PATCH] Mtce: Add two new port definitions to mtc.ini for SM
 communications

In support of the HA Improvements feature maintenance is required to,
upon request, send SM a summary of maintenance's heartbeat responsiveness
during the last 20 heartbeat periods.

This update adds the required port assignments to the mtc.ini file
in support of said communications.

With this update the mtc.ini file will be updated to contain the
following entries.

  ; Communication ports between SM and maintenance
  sm_server_port = 2124 ; port sm receives mtce commands from
  sm_client_port = 2224 ; port mtce receives sm commands from

Change-Id: I05c022f7e4dcdeaea71bc0020641baa331daae57
Story: 2003576
Task: 26837
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
---
 puppet-manifests/centos/build_srpm.data                       | 2 +-
 puppet-manifests/src/hieradata/controller.yaml                | 2 ++
 puppet-manifests/src/modules/platform/manifests/mtce.pp       | 2 ++
 puppet-modules-wrs/puppet-mtce/centos/build_srpm.data         | 2 +-
 puppet-modules-wrs/puppet-mtce/src/mtce/templates/mtc_ini.erb | 4 ++++
 sysinv/sysinv/centos/build_srpm.data                          | 2 +-
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data
index f2aeaf8415..0728693ed3 100644
--- a/puppet-manifests/centos/build_srpm.data
+++ b/puppet-manifests/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=64
+TIS_PATCH_VER=65
diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml
index 01c79db493..b3e4feb712 100644
--- a/puppet-manifests/src/hieradata/controller.yaml
+++ b/puppet-manifests/src/hieradata/controller.yaml
@@ -54,6 +54,8 @@ platform::mtce::agent::params::heartbeat_failure_threshold: 10
 platform::mtce::agent::params::heartbeat_degrade_threshold: 6
 platform::mtce::agent::params::mnfa_threshold: 2
 platform::mtce::agent::params::mnfa_timeout: 0
+platform::mtce::params::sm_server_port: 2124
+platform::mtce::params::sm_client_port: 2224
 
 # influxdb configuration for collectd
 platform::influxdb::params::bind_address: ':25826'
diff --git a/puppet-manifests/src/modules/platform/manifests/mtce.pp b/puppet-manifests/src/modules/platform/manifests/mtce.pp
index b146abf56a..26f103a925 100644
--- a/puppet-manifests/src/modules/platform/manifests/mtce.pp
+++ b/puppet-manifests/src/modules/platform/manifests/mtce.pp
@@ -17,6 +17,8 @@ class platform::mtce::params (
   $mtce_multicast = undef,
   $mnfa_threshold = undef,
   $mnfa_timeout = undef,
+  $sm_client_port = undef,
+  $sm_server_port = undef,
 ) { }
 
 
diff --git a/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data b/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
index f0a35f7823..04063a393c 100644
--- a/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="src"
 COPY_LIST="$SRC_DIR/LICENSE"
-TIS_PATCH_VER=8
+TIS_PATCH_VER=9
diff --git a/puppet-modules-wrs/puppet-mtce/src/mtce/templates/mtc_ini.erb b/puppet-modules-wrs/puppet-mtce/src/mtce/templates/mtc_ini.erb
index 54fd506444..cbe312b50e 100644
--- a/puppet-modules-wrs/puppet-mtce/src/mtce/templates/mtc_ini.erb
+++ b/puppet-modules-wrs/puppet-mtce/src/mtce/templates/mtc_ini.erb
@@ -16,6 +16,10 @@ heartbeat_period = <%= @heartbeat_period %> ; Heartbeat period in milliseconds
 heartbeat_failure_threshold = <%= @heartbeat_failure_threshold %> ; Heartbeat failure threshold count.
 heartbeat_degrade_threshold = <%= @heartbeat_degrade_threshold %> ; Heartbeat degrade threshold count.
 
+; Communication ports between SM and maintenance
+sm_server_port = <%= @sm_server_port %> ; port sm receives mtce commands from
+sm_client_port = <%= @sm_client_port %> ; port mtce receives sm commands from
+
 ; Heartbeat Loss / Failure Action Selection.
 ; The action to take on host heartbeat failure.
 ; Supported actions are
diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index 1c539eb7e1..b62dc21166 100644
--- a/sysinv/sysinv/centos/build_srpm.data
+++ b/sysinv/sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=282
+TIS_PATCH_VER=283