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

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']
   }
 }