diff --git a/base/cluster-resource-agents/centos/meta_patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch b/base/cluster-resource-agents/centos/meta_patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch deleted file mode 100644 index 396fb7dda..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 75bbb081b6cd87f7da59d597e1737f7b4ed395c7 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 05/10] WRS: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 3d8ece2..9fa7f86 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -273,6 +273,7 @@ Patch1110: lvm_vg_activation.patch - Patch1111: pgsql.patch - - Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch -+Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -603,6 +604,7 @@ exit 1 - %patch1111 -p1 - - %patch1114 -p1 -+%patch1115 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER b/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER index 9bc683e76..4ee820903 100644 --- a/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER +++ b/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER @@ -1,13 +1,4 @@ spec-include-TiS-patches.patch spec-avoid-dir-collisions.patch -spec-notify-rmon-of-shutdown-before-shutting-down.patch -Fix-VG-activity-bug-in-heartbeat-LVM-script.patch -spec-include-tis-logtag-patch.patch -spec-lvm-cleanup-refs-on-stop.patch 0001-Update-package-versioning-for-TIS-format.patch -ipaddr2-if-down.patch -spec-add-ipaddr2-ignore-lo-state.patch Disable-creation-of-the-debug-package.patch -metapatch-for-arp_bg.patch -ipaddr2-avoid-failing-svc-if-down-meta.patch -spec-ipaddr2-use-host-scope-for-addresses-on-loopbac.patch diff --git a/base/cluster-resource-agents/centos/meta_patches/ipaddr2-avoid-failing-svc-if-down-meta.patch b/base/cluster-resource-agents/centos/meta_patches/ipaddr2-avoid-failing-svc-if-down-meta.patch deleted file mode 100644 index 0142432fd..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/ipaddr2-avoid-failing-svc-if-down-meta.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 72bfa2ad793df8fc68b3b6abe87bd7bfbaf99fb1 Mon Sep 17 00:00:00 2001 -From: Bin Qian -Date: Wed, 29 Aug 2018 11:22:32 -0400 -Subject: [PATCH] ipaddr2 avoid failing when svc i/f down - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 520d9c3..959f4db 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -282,6 +282,7 @@ Patch1117: lvm_cleanup_refs_on_stop.patch - Patch1118: ipaddr2_if_down.patch - Patch1119: ipaddr2_ignore_lo_if_state.patch - Patch1120: Re-enable-background-execution-of-arp-commands.patch -+Patch1121: ipaddr2-avoid-failing-svc-if-down.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -618,6 +619,7 @@ exit 1 - %patch1118 -p1 - %patch1119 -p1 - %patch1120 -p1 -+%patch1121 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/ipaddr2-if-down.patch b/base/cluster-resource-agents/centos/meta_patches/ipaddr2-if-down.patch deleted file mode 100644 index c316a9f76..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/ipaddr2-if-down.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 87673fd8f797034a206ac4e54ac85d258daece13 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 09/10] WRS: ipaddr2-if-down.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index fd8bc97..bbf2754 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -276,6 +276,7 @@ Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch - Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch - Patch1116: ocf-shellfuncs_change_logtag.patch - Patch1117: lvm_cleanup_refs_on_stop.patch -+Patch1118: ipaddr2_if_down.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -609,6 +610,7 @@ exit 1 - %patch1115 -p1 - %patch1116 -p1 - %patch1117 -p1 -+%patch1118 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/metapatch-for-arp_bg.patch b/base/cluster-resource-agents/centos/meta_patches/metapatch-for-arp_bg.patch deleted file mode 100644 index 03cf5666b..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/metapatch-for-arp_bg.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 00b88829aad297c6732617a706501b466bb9be7a Mon Sep 17 00:00:00 2001 -From: Al Bailey -Date: Mon, 28 May 2018 14:12:45 -0500 -Subject: [PATCH] metapatch for arp_bg - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index c70d20b..520d9c3 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -281,6 +281,7 @@ Patch1116: ocf-shellfuncs_change_logtag.patch - Patch1117: lvm_cleanup_refs_on_stop.patch - Patch1118: ipaddr2_if_down.patch - Patch1119: ipaddr2_ignore_lo_if_state.patch -+Patch1120: Re-enable-background-execution-of-arp-commands.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -616,6 +617,7 @@ exit 1 - %patch1117 -p1 - %patch1118 -p1 - %patch1119 -p1 -+%patch1120 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-add-ipaddr2-ignore-lo-state.patch b/base/cluster-resource-agents/centos/meta_patches/spec-add-ipaddr2-ignore-lo-state.patch deleted file mode 100644 index eafe24874..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/spec-add-ipaddr2-ignore-lo-state.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0af59dc6da82061d551c452fac36fa9c93c313f2 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 10/10] WRS: spec-add-ipaddr2-ignore-lo-state.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index bbf2754..0a25ab0 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -277,6 +277,7 @@ Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch - Patch1116: ocf-shellfuncs_change_logtag.patch - Patch1117: lvm_cleanup_refs_on_stop.patch - Patch1118: ipaddr2_if_down.patch -+Patch1119: ipaddr2_ignore_lo_if_state.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -611,6 +612,7 @@ exit 1 - %patch1116 -p1 - %patch1117 -p1 - %patch1118 -p1 -+%patch1119 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch b/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch index 0c1d0dea7..f0c73aedc 100644 --- a/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch +++ b/base/cluster-resource-agents/centos/meta_patches/spec-avoid-dir-collisions.patch @@ -3,28 +3,26 @@ From: Scott Little Date: Mon, 2 Oct 2017 15:11:58 -0400 Subject: [PATCH 02/10] WRS: spec-avoid-dir-collisions.patch +Signed-off-by: zhipengl --- - SPECS/resource-agents.spec | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + SPECS/resource-agents.spec | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 6c1ec89..7d53666 100644 +index ec85fc2..bb96485 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec -@@ -704,14 +704,15 @@ rm -rf %{buildroot} +@@ -722,14 +722,11 @@ rm -rf %{buildroot} %endif %if %{with linuxha} -%dir /usr/lib/ocf -%dir /usr/lib/ocf/resource.d -%dir /usr/lib/ocf/lib -+#%dir /usr/lib/ocf -+#%dir /usr/lib/ocf/resource.d -+#%dir /usr/lib/ocf/lib - --/usr/lib/ocf/lib/heartbeat +/usr/lib/ocf/lib/heartbeat/* +-/usr/lib/ocf/lib/heartbeat +- -/usr/lib/ocf/resource.d/heartbeat -/usr/lib/ocf/resource.d/openstack +/usr/lib/ocf/resource.d/heartbeat/* @@ -33,24 +31,23 @@ index 6c1ec89..7d53666 100644 %if %{with rgmanager} /usr/lib/ocf/resource.d/redhat %endif -@@ -734,7 +735,7 @@ rm -rf %{buildroot} +@@ -752,8 +749,6 @@ rm -rf %{buildroot} %{_includedir}/heartbeat -%dir %attr (1755, root, root) %{_var}/run/resource-agents -+#%dir %attr (1755, root, root) %{_var}/run/resource-agents - +- %{_mandir}/man7/*.7* -@@ -845,7 +846,7 @@ rm -rf %{buildroot} + ### +@@ -863,7 +858,6 @@ rm -rf %{buildroot} %exclude %{_mandir}/man8/ldirectord.8.gz # For compatability with pre-existing agents -%dir %{_sysconfdir}/ha.d -+#%dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/shellfuncs %{_libexecdir}/heartbeat -- -2.7.4 +1.8.3.1 diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch b/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch index d66068caf..19877b142 100644 --- a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch +++ b/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch @@ -3,15 +3,16 @@ From: Scott Little Date: Mon, 2 Oct 2017 15:11:58 -0400 Subject: [PATCH] WRS: spec-include-TiS-patches.patch +Signed-off-by: zhipengl --- - SPECS/resource-agents.spec | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + SPECS/resource-agents.spec | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index a16660a..6c1ec89 100644 +index a16660a..ec85fc2 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec -@@ -263,6 +263,16 @@ Patch202: bz1536548-sap_redhat_cluster_connector-fix-unknown-gvi-function.patch +@@ -263,6 +263,25 @@ Patch202: bz1536548-sap_redhat_cluster_connector-fix-unknown-gvi-function.patch Patch203: bz1543366-redis-add-support-for-tunneling-replication-traffic.patch Patch204: bz1546083-galera-fix-temp-logfile-rights.patch @@ -25,10 +26,19 @@ index a16660a..6c1ec89 100644 +Patch1111: pgsql.patch + + ++Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch ++Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch ++Patch1116: ocf-shellfuncs_change_logtag.patch ++Patch1117: lvm_cleanup_refs_on_stop.patch ++Patch1118: ipaddr2_if_down.patch ++Patch1119: ipaddr2_ignore_lo_if_state.patch ++Patch1120: Re-enable-background-execution-of-arp-commands.patch ++Patch1121: ipaddr2-avoid-failing-svc-if-down.patch ++Patch1122: ipaddr2-use-host-scope-for-addresses-on-loopback.patch Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} -@@ -582,6 +592,16 @@ exit 1 +@@ -582,6 +601,25 @@ exit 1 %patch203 -p1 %patch204 -p1 @@ -41,10 +51,20 @@ index a16660a..6c1ec89 100644 +%patch1110 -p1 +%patch1111 -p1 + ++ ++%patch1114 -p1 ++%patch1115 -p1 ++%patch1116 -p1 ++%patch1117 -p1 ++%patch1118 -p1 ++%patch1119 -p1 ++%patch1120 -p1 ++%patch1121 -p1 ++%patch1122 -p1 + %build if [ ! -f configure ]; then ./autogen.sh -- -2.7.4 +1.8.3.1 diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-include-tis-logtag-patch.patch b/base/cluster-resource-agents/centos/meta_patches/spec-include-tis-logtag-patch.patch deleted file mode 100644 index e43f69ee6..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/spec-include-tis-logtag-patch.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bb2ed3ed905824f2d8fb02bfbd7bc271843361a5 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 06/10] WRS: spec-include-tis-logtag-patch.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 9fa7f86..c325197 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -274,6 +274,7 @@ Patch1111: pgsql.patch - - Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch - Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch -+Patch1116: ocf-shellfuncs_change_logtag.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -605,6 +606,7 @@ exit 1 - - %patch1114 -p1 - %patch1115 -p1 -+%patch1116 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-ipaddr2-use-host-scope-for-addresses-on-loopbac.patch b/base/cluster-resource-agents/centos/meta_patches/spec-ipaddr2-use-host-scope-for-addresses-on-loopbac.patch deleted file mode 100644 index 21762c731..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/spec-ipaddr2-use-host-scope-for-addresses-on-loopbac.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d5796dce7ea3bc1a90a3faed3b7acff36583c5e0 Mon Sep 17 00:00:00 2001 -From: Bart Wensley -Date: Wed, 21 Nov 2018 12:21:41 -0600 -Subject: [PATCH 1/1] spec ipaddr2 use host scope for addresses on loopback - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 959f4db..a98064a 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -284,6 +284,7 @@ Patch1118: ipaddr2_if_down.patch - Patch1119: ipaddr2_ignore_lo_if_state.patch - Patch1120: Re-enable-background-execution-of-arp-commands.patch - Patch1121: ipaddr2-avoid-failing-svc-if-down.patch -+Patch1122: ipaddr2-use-host-scope-for-addresses-on-loopback.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -622,6 +623,7 @@ exit 1 - %patch1119 -p1 - %patch1120 -p1 - %patch1121 -p1 -+%patch1122 -p1 - - %build - if [ ! -f configure ]; then --- -1.8.3.1 - diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-lvm-cleanup-refs-on-stop.patch b/base/cluster-resource-agents/centos/meta_patches/spec-lvm-cleanup-refs-on-stop.patch deleted file mode 100644 index 63ca2027b..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/spec-lvm-cleanup-refs-on-stop.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d8db42cf6aac88403c9f9101230061864a96eec0 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 07/10] WRS: spec-lvm-cleanup-refs-on-stop.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index c325197..21fa049 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -275,6 +275,7 @@ Patch1111: pgsql.patch - Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch - Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch - Patch1116: ocf-shellfuncs_change_logtag.patch -+Patch1117: lvm_cleanup_refs_on_stop.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -607,6 +608,7 @@ exit 1 - %patch1114 -p1 - %patch1115 -p1 - %patch1116 -p1 -+%patch1117 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 - diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-notify-rmon-of-shutdown-before-shutting-down.patch b/base/cluster-resource-agents/centos/meta_patches/spec-notify-rmon-of-shutdown-before-shutting-down.patch deleted file mode 100644 index 75b9c2d06..000000000 --- a/base/cluster-resource-agents/centos/meta_patches/spec-notify-rmon-of-shutdown-before-shutting-down.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6dc1e2534a877800b35dd3cf7312c332cd83edb0 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:11:59 -0400 -Subject: [PATCH 04/10] WRS: - spec-notify-rmon-of-shutdown-before-shutting-down.patch - ---- - SPECS/resource-agents.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec -index 0725e97..3d8ece2 100644 ---- a/SPECS/resource-agents.spec -+++ b/SPECS/resource-agents.spec -@@ -272,6 +272,7 @@ Patch1109: umount-in-namespace.patch - Patch1110: lvm_vg_activation.patch - Patch1111: pgsql.patch - -+Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch - - Obsoletes: heartbeat-resources <= %{version} - Provides: heartbeat-resources = %{version} -@@ -601,6 +602,7 @@ exit 1 - %patch1110 -p1 - %patch1111 -p1 - -+%patch1114 -p1 - - %build - if [ ! -f configure ]; then --- -2.7.4 -