openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Fix ceph-nfs duplicate property"

Browse Source
This commit is contained in:
Zuul 2018-10-16 23:12:07 +00:00 committed by Gerrit Code Review
commit 89dab0c7e0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('manila_share_short_bootstrap_node_name')
# Defaults to hiera('ceph_nfs_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -32,7 +32,7 @@
# Defaults to hiera('pcs_tries', 20)
#
class tripleo::profile::pacemaker::ceph_nfs (
$bootstrap_node = hiera('manila_share_short_bootstrap_node_name'),
$bootstrap_node = hiera('ceph_nfs_short_bootstrap_node_name'),
$step = hiera('step'),
$pcs_tries = hiera('pcs_tries', 20),
) {
@ -124,11 +124,16 @@ class tripleo::profile::pacemaker::ceph_nfs (
# See comment on pacemaker::property at step2
$ceph_nfs_short_node_names = hiera('ceph_nfs_short_node_names')
$ceph_nfs_short_node_names.each |String $node_name| {
pacemaker::property { "ceph-nfs-role-${node_name}":
property => 'ceph-nfs-role',
value => true,
tries => $pcs_tries,
node => $node_name,
# We only set the properties for the non-bootstrap nodes
# because we set the property for the bootstrap node at step 2
# already
if $node_name != $bootstrap_node {
pacemaker::property { "ceph-nfs-role-${node_name}":
property => 'ceph-nfs-role',
value => true,
tries => $pcs_tries,
node => $node_name,
}
}
}