From 1813918cf4d57ab7ce4a38994b9d6cff1c16a707 Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Mon, 5 Nov 2018 20:32:33 -0500 Subject: [PATCH] Mtce: Change SM Port scope to handle AIO config. The mtc.ini file is updated a second time in AIO config. Due to the scope of the SM ports being for controller only and no defaults we see the sm port assignments missing in AIO configs. This update defaults the SM port numbers and changes the scope of the parameters so that they get set on all node types for all system types. Testing included provisioning an AIO system. Change-Id: Ib53921c4b59a9e67ed136a03504bdf0775de6dff Signed-off-by: Eric MacDonald --- puppet-manifests/centos/build_srpm.data | 2 +- puppet-manifests/src/hieradata/controller.yaml | 2 -- puppet-manifests/src/hieradata/global.yaml | 3 +++ puppet-manifests/src/modules/platform/manifests/mtce.pp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 83682532d2..9ae2601da9 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=70 +TIS_PATCH_VER=71 diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml index 86a11bda5f..e76cc0da14 100644 --- a/puppet-manifests/src/hieradata/controller.yaml +++ b/puppet-manifests/src/hieradata/controller.yaml @@ -54,8 +54,6 @@ 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/hieradata/global.yaml b/puppet-manifests/src/hieradata/global.yaml index 6d12e1e042..0436ec220a 100644 --- a/puppet-manifests/src/hieradata/global.yaml +++ b/puppet-manifests/src/hieradata/global.yaml @@ -11,6 +11,9 @@ platform::params::security_feature: nopti nospectre_v2 platform::amqp::auth_user: guest platform::users::params::wrsroot_password_max_age: 45 +# mtce +platform::mtce::params::sm_server_port: 2124 +platform::mtce::params::sm_client_port: 2224 # sysinv sysinv::database_idle_timeout: 60 diff --git a/puppet-manifests/src/modules/platform/manifests/mtce.pp b/puppet-manifests/src/modules/platform/manifests/mtce.pp index 367a3e2a59..b38087ef0e 100644 --- a/puppet-manifests/src/modules/platform/manifests/mtce.pp +++ b/puppet-manifests/src/modules/platform/manifests/mtce.pp @@ -17,8 +17,8 @@ class platform::mtce::params ( $mtce_multicast = undef, $mnfa_threshold = undef, $mnfa_timeout = undef, - $sm_client_port = undef, - $sm_server_port = undef, + $sm_client_port = 2224, + $sm_server_port = 2124, ) { }