openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Only set the stonith property on the pacemaker_master node"

This commit is contained in:
Jenkins 2017-06-16 20:39:12 +00:00 committed by Gerrit Code Review
parent 62dffeb9da 332755c0fd
commit b4ace4f298
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/profile/base/pacemaker.pp
View File

@ -111,9 +111,11 @@ class tripleo::profile::base::pacemaker (
cluster_setup_extras => $cluster_setup_extras,
remote_authkey => $remote_authkey,
}
class { '::pacemaker::stonith':
disable => !$enable_fencing,
tries => $pcs_tries,
if $pacemaker_master {
class { '::pacemaker::stonith':
disable => !$enable_fencing,
tries => $pcs_tries,
}
}
if $enable_fencing {
include ::tripleo::fencing

7
manifests/profile/base/pacemaker_remote.pp
View File

@ -46,11 +46,6 @@ class tripleo::profile::base::pacemaker_remote (
}
$enable_fencing_real = str2bool($enable_fencing) and $step >= 5
class { '::pacemaker::stonith':
disable => !$enable_fencing_real,
tries => $pcs_tries,
}
if $enable_fencing_real {
include ::tripleo::fencing
@ -58,7 +53,5 @@ class tripleo::profile::base::pacemaker_remote (
Pcmk_resource<||> -> Class['tripleo::fencing']
Pcmk_constraint<||> -> Class['tripleo::fencing']
Exec <| tag == 'pacemaker_constraint' |> -> Class['tripleo::fencing']
# enable stonith after all fencing devices have been created
Class['tripleo::fencing'] -> Class['pacemaker::stonith']
}
}