From 8cc3c772974afaee2fe77223c90267bbc844cb7c Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Fri, 3 Jul 2020 09:12:48 +0200 Subject: [PATCH] Add FFU support for ceph_nfs This patch fixes the ceph_nfs upgrade process checking for the short_name variable definition. This is required to properly handle the FFU process for this service. Change-Id: I89c848bdae1b997b38a5164302acdcca94619471 (cherry picked from commit 4243119d09ff9ee88aea71496753658f9d06d934) --- manifests/profile/pacemaker/ceph_nfs.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/profile/pacemaker/ceph_nfs.pp b/manifests/profile/pacemaker/ceph_nfs.pp index 5631c2bcd..051c4d3b0 100644 --- a/manifests/profile/pacemaker/ceph_nfs.pp +++ b/manifests/profile/pacemaker/ceph_nfs.pp @@ -122,7 +122,12 @@ class tripleo::profile::pacemaker::ceph_nfs ( } # See comment on pacemaker::property at step2 - $ceph_nfs_short_node_names = hiera('ceph_nfs_short_node_names') + if (hiera('ceph_nfs_short_node_names_override', undef)) { + $ceph_nfs_short_node_names = hiera('ceph_nfs_short_node_names_override') + } else { + $ceph_nfs_short_node_names = hiera('ceph_nfs_short_node_names') + } + $ceph_nfs_short_node_names.each |String $node_name| { # We only set the properties for the non-bootstrap nodes # because we set the property for the bootstrap node at step 2