From 65daac29e4635f32a57e80cd18f96fd59dc8ebe0 Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Tue, 12 May 2020 22:39:21 -0400 Subject: [PATCH] DC cert manifest should only apply to controller nodes DC cert manifest should only apply to controller nodes on system controller. This fix is for DC with worker nodes in central cloud. Change-Id: I4233509a6f0afb3013c01e81dea6f655d9e15371 Closes-Bug: 1878260 Signed-off-by: Bin Qian --- puppet-manifests/centos/build_srpm.data | 2 +- puppet-manifests/src/modules/platform/manifests/config.pp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 2bdf6c5d4..992348db8 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=97 +TIS_PATCH_VER=98 diff --git a/puppet-manifests/src/modules/platform/manifests/config.pp b/puppet-manifests/src/modules/platform/manifests/config.pp index 885166096..a57295cbb 100644 --- a/puppet-manifests/src/modules/platform/manifests/config.pp +++ b/puppet-manifests/src/modules/platform/manifests/config.pp @@ -350,7 +350,8 @@ class platform::config::pre { include ::platform::config::file include ::platform::config::tpm include ::platform::config::certs::ssl_ca - if $::platform::params::distributed_cloud_role =='systemcontroller' { + if ($::platform::params::distributed_cloud_role =='systemcontroller' and + $::personality == 'controller') { include ::platform::config::dc_root_ca } }