openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Add FFU support for ceph_nfs" into stable/train

This commit is contained in:
Zuul 2020-07-08 17:37:26 +00:00 committed by Gerrit Code Review
parent fe9ae10c4a 8cc3c77297
commit bd737a1131
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 # 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| { $ceph_nfs_short_node_names.each |String $node_name| {
# We only set the properties for the non-bootstrap nodes # We only set the properties for the non-bootstrap nodes
# because we set the property for the bootstrap node at step 2 # because we set the property for the bootstrap node at step 2