From 3cbc4daa10e0861f3c2611f06a5895d9c162a212 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 8 Jul 2020 11:15:25 +0200
Subject: [PATCH] Make sure we pass cluster_setup_extras when using pcs 0.10

We should still be passing the extra commmands to pcs cluster setup when
the user asks for them.

Depends-On: Iaecced845b80e958c7ad0ef96896f1202259cca2

Change-Id: I02108c8f8a6bdda5844564e4bdd4d15bfd0e26ec
Closes-Bug: #1886789
---
 manifests/corosync.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/corosync.pp b/manifests/corosync.pp
index e1c1c326..46b0438e 100644
--- a/manifests/corosync.pp
+++ b/manifests/corosync.pp
@@ -242,7 +242,7 @@ class pacemaker::corosync(
 
     # pcs-0.10.x has different commands to set up the cluster
     if $::pacemaker::pcs_010 {
-      $cluster_setup_cmd = "${::pacemaker::pcs_bin} cluster setup ${cluster_name} ${cluster_members_rrp_real}"
+      $cluster_setup_cmd = "${::pacemaker::pcs_bin} cluster setup ${cluster_name} ${cluster_members_rrp_real} ${cluster_setup_extras_real}"
       $cluster_reauthenticate_cmd = "${::pacemaker::pcs_bin} host auth ${cluster_members} -u hacluster -p ${::pacemaker::hacluster_pwd}"
       $cluster_authenticate_cmd = "${::pacemaker::pcs_bin} host auth ${cluster_members} -u hacluster -p ${::pacemaker::hacluster_pwd}"
       $cluster_authenticate_unless = "${::pacemaker::pcs_bin} host auth ${cluster_members} -u hacluster -p ${::pacemaker::hacluster_pwd} | grep 'Already authorized'"