diff options
| author |   Michele Baldessari <michele@acksyn.org> | 2017-06-07 10:20:25 +0200 |
|---|---|---|
| committer | Michele Baldessari <michele@acksyn.org> | 2017-06-14 09:01:26 +0200 |
| commit | 332755c0fd586f0a3085704b3f4bda78ad8a87ad (patch) | |
| tree | 4a0bd7d0e3217e1264faa28fab48102ddf93b7ac /manifests/profile | |
| parent | 2561fa9560e80e6f6cf9c6c1f1424491cfb012d9 (diff) | |
Only set the stonith property on the pacemaker_master node
It makes little sense to enforce the stonith property on remote nodes and/or
all cluster nodes. We can just enforce it once on the pacemaker_master
node as it is a cluster-wide property anyway. We can also remove the
tripleo::fencing -> pacemaker::stonith constraint in the pacemaker
remote profile now as the fencing stuff happens on step 5 anyway and
the property is set at step 1.
While this works in general it creates extra CIB changes for nothing and
slows down the deployment.
Change-Id: Ifef08033043a4cc90a6261e962d2fdecdf275650
Closes-Bug: #1696336
Diffstat (limited to 'manifests/profile')
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 8 | ||||
| -rw-r--r-- | manifests/profile/base/pacemaker_remote.pp | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 811b911..bd92c98 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -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 diff --git a/manifests/profile/base/pacemaker_remote.pp b/manifests/profile/base/pacemaker_remote.pp index dfe0a3e..8264132 100644 --- a/manifests/profile/base/pacemaker_remote.pp +++ b/manifests/profile/base/pacemaker_remote.pp @@ -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'] } } |