From e35326d6920f82f873fcdfb5aaff7b14b1a5ab86 Mon Sep 17 00:00:00 2001
From: Eric MacDonald <eric.macdonald@windriver.com>
Date: Tue, 17 Sep 2019 16:19:15 -0400
Subject: [PATCH] Add bmc access method as service parameter

This update modifies mtce puppet inservice manifest
to add and update mtc.ini with a new bmc_access_method
config option.

Test Plan:

PASS: Verify service parameter change and handling.
PASS: Verify puppet Tox tests pass

Change-Id: Idcb86d1324bed8d428415c049fbc9c6df0dca650
Story: 2005861
Task: 36668
Depends-on: https://review.opendev.org/#/c/682736/
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
---
 .../puppet-mtce/src/mtce/templates/mtc_ini.erb    | 15 +++++++++++++++
 puppet-manifests/src/hieradata/controller.yaml    |  1 +
 .../src/modules/platform/manifests/mtce.pp        |  1 +
 3 files changed, 17 insertions(+)

diff --git a/modules/puppet-mtce/src/mtce/templates/mtc_ini.erb b/modules/puppet-mtce/src/mtce/templates/mtc_ini.erb
index a5cb2dc2c..65c48fb6e 100644
--- a/modules/puppet-mtce/src/mtce/templates/mtc_ini.erb
+++ b/modules/puppet-mtce/src/mtce/templates/mtc_ini.erb
@@ -43,6 +43,21 @@ heartbeat_failure_action = <%= @heartbeat_failure_action %>
 ;  system service-parameter-modify platform maintenance mnfa_threshold=<value>
 mnfa_threshold = <%= @mnfa_threshold %>
 
+; Board Management Controller (BMC) Access Method
+; Controls the access method maintenance uses when communicating with
+;  provisioned BMCs for power/reset control and sensor monitoring.
+; Supported Methods are
+;       ipmi = use ipmi for bmc communications
+;    redfish = use redfish for bmc communications
+;      learn = use redfish if BMC supports it, otherwise use ipmi
+; Default is learn
+; Changes are automatically detected and handled by maintenance when
+;  modified through system service parameter CLI command.
+; To modify execute:
+;  system service-parameter-modify platform maintenance bmc_access_method=<method>
+;  system service-parameter-apply platform
+bmc_access_method = <%= @bmc_access_method %>
+
 [timeouts]
 worker_boot_timeout = <%= @worker_boot_timeout %> ; The max time (seconds) that Mtce waits for the mtcAlive
 controller_boot_timeout = <%= @controller_boot_timeout %> ; message after which it will time out and fail the host.
diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml
index b850282f9..dc160d6d1 100644
--- a/puppet-manifests/src/hieradata/controller.yaml
+++ b/puppet-manifests/src/hieradata/controller.yaml
@@ -62,6 +62,7 @@ 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::agent::params::bmc_access_method: 'learn'
 
 # 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 96a499139..fa45adafb 100644
--- a/puppet-manifests/src/modules/platform/manifests/mtce.pp
+++ b/puppet-manifests/src/modules/platform/manifests/mtce.pp
@@ -17,6 +17,7 @@ class platform::mtce::params (
   $mtce_multicast = undef,
   $mnfa_threshold = 2,
   $mnfa_timeout = 0,
+  $bmc_access_method = 'learn',
   $sm_client_port = 2224,
   $sm_server_port = 2124,
 ) { }