openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Add FFU support for ceph_nfs"

This commit is contained in:
Zuul 2020-07-07 11:33:33 +00:00 committed by Gerrit Code Review
parent 3df797e61c 4243119d09
commit 4cca6ed283
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

@ -121,7 +121,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