openstack
/
puppet-tripleo
Code Issues Proposed changes

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 4243119d09)
This commit is contained in:
Michele Baldessari 2020-07-03 09:12:48 +02:00 committed by Francesco Pantano
parent 6996c8ca5e
commit 8cc3c77297
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/profile/pacemaker/ceph_nfs.pp
View File

@ -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