Backport additional fixes.

- Clone instances should not shuffle unnecessarily
- Fix a bug in clone resource description display
- Resolves: rhbz1931023
- Resolves: rhbz1688149
- Related: rhbz2106642
- Related: rhbz2189300

004-clone-rsc-display.patch

@@ -0,0 +1,35 @@
+From 770d417e28dc9527fec8b8a00caaba8825995454 Mon Sep 17 00:00:00 2001
+From: Grace Chin <gchin@redhat.com>
+Date: Wed, 19 Jul 2023 10:25:55 -0400
+Subject: [PATCH] Fix: tools: Fix a bug in clone resource description display
+
+Previously, descriptions of resources running on multiple
+nodes were displayed despite --full not being used (with pcs
+status) or --show-detail not being used (with crm_mon).
+
+For example, clone resources running on multiple nodes were
+affected.
+
+Now, --full and --show-detail must be used in order for resource
+descriptions to be displayed, regardless of the number of nodes
+the resource is run on.
+
+see bz: 2106642
+---
+ lib/pengine/pe_output.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c
+index e0b43d997a..d1c9f6e226 100644
+--- a/lib/pengine/pe_output.c
++++ b/lib/pengine/pe_output.c
+@@ -20,8 +20,7 @@ pe__resource_description(const pe_resource_t *rsc, uint32_t show_opts)
+ {
+     const char * desc = NULL;
+     // User-supplied description
+-    if (pcmk_any_flags_set(show_opts, pcmk_show_rsc_only|pcmk_show_description)
+-        || pcmk__list_of_multiple(rsc->running_on)) {
++    if (pcmk_any_flags_set(show_opts, pcmk_show_rsc_only|pcmk_show_description)) {
+         desc = crm_element_value(rsc->xml, XML_ATTR_DESC);
+     }
+     return desc;

pacemaker.spec

@@ -36,7 +36,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.1.6
-%global specversion 3
+%global specversion 4
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
 %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0
@@ -265,6 +265,8 @@ Source1:       nagios-agents-metadata-%{nagios_hash}.tar.gz
 # upstream commits
 Patch001:      001-remote-start-state.patch
 Patch002:      002-group-colocation-constraint.patch
+Patch003:      003-clone-shuffle.patch
+Patch004:      004-clone-rsc-display.patch
 
 # downstream-only commits
 #Patch1xx:      1xx-xxxx.patch
@@ -1003,6 +1005,14 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Jul 19 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-4
+- Clone instances should not shuffle unnecessarily
+- Fix a bug in clone resource description display
+- Resolves: rhbz1931023
+- Resolves: rhbz1688149
+- Related: rhbz2106642
+- Related: rhbz2189300
+
 * Mon Jul 10 2023 Chris Lumens <clumens@redhat.com> - 2.1.6-3
 - Fix moving groups when there's a constraint for a single group member
 - Resolves: rhbz2218232