starlingx/integ
Code Issues Proposed changes

Merge "remove create-var-run-resource-agents.patch"

Browse Source
This commit is contained in:
Zuul 2018-11-22 22:10:13 +00:00 committed by Gerrit Code Review
commit 77c5b314c3
11 changed files with 22 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/cluster-resource-agents/centos/meta_patches/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
View File

@ -11,17 +11,17 @@ 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
@@ -274,6 +274,7 @@ Patch1111: pgsql.patch
@@ -273,6 +273,7 @@ Patch1110: lvm_vg_activation.patch
Patch1111: pgsql.patch
Patch1113: create-var-run-resource-agents.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}
@@ -605,6 +606,7 @@ exit 1
@@ -603,6 +604,7 @@ exit 1
%patch1111 -p1
%patch1113 -p1
%patch1114 -p1
+%patch1115 -p1

1
base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER
View File

@ -1,6 +1,5 @@
spec-include-TiS-patches.patch
spec-avoid-dir-collisions.patch
spec-add-create-var-run-resource-agents.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

4
base/cluster-resource-agents/centos/meta_patches/ipaddr2-avoid-failing-svc-if-down-meta.patch
View File

@ -11,7 +11,7 @@ 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
@@ -283,6 +283,7 @@ Patch1117: lvm_cleanup_refs_on_stop.patch
@@ -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
@ -19,7 +19,7 @@ index 520d9c3..959f4db 100644
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -620,6 +621,7 @@ exit 1
@@ -618,6 +619,7 @@ exit 1
%patch1118 -p1
%patch1119 -p1
%patch1120 -p1

4
base/cluster-resource-agents/centos/meta_patches/ipaddr2-if-down.patch
View File

@ -11,7 +11,7 @@ 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
@@ -277,6 +277,7 @@ Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch
@@ -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
@ -19,7 +19,7 @@ index fd8bc97..bbf2754 100644
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -611,6 +612,7 @@ exit 1
@@ -609,6 +610,7 @@ exit 1
%patch1115 -p1
%patch1116 -p1
%patch1117 -p1

4
base/cluster-resource-agents/centos/meta_patches/metapatch-for-arp_bg.patch
View File

@ -11,7 +11,7 @@ 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
@@ -282,6 +282,7 @@ Patch1116: ocf-shellfuncs_change_logtag.patch
@@ -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
@ -19,7 +19,7 @@ index c70d20b..520d9c3 100644
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -618,6 +619,7 @@ exit 1
@@ -616,6 +617,7 @@ exit 1
%patch1117 -p1
%patch1118 -p1
%patch1119 -p1

32
base/cluster-resource-agents/centos/meta_patches/spec-add-create-var-run-resource-agents.patch
View File

@ -1,32 +0,0 @@
From 774432f5665f102f7de7b35be0cb753964c4905c Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:11:59 -0400
Subject: [PATCH 03/10] WRS: spec-add-create-var-run-resource-agents.patch
---
SPECS/resource-agents.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 7d53666..0725e97 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
+Patch1113: create-var-run-resource-agents.patch
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -601,6 +602,7 @@ exit 1
%patch1110 -p1
%patch1111 -p1
+%patch1113 -p1
%build
if [ ! -f configure ]; then
--
2.7.4

4
base/cluster-resource-agents/centos/meta_patches/spec-add-ipaddr2-ignore-lo-state.patch
View File

@ -11,7 +11,7 @@ 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
@@ -278,6 +278,7 @@ Patch1115: Fix-VG-activity-bug-in-heartbeat-LVM-script.patch
@@ -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
@ -19,7 +19,7 @@ index bbf2754..0a25ab0 100644
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -613,6 +614,7 @@ exit 1
@@ -611,6 +612,7 @@ exit 1
%patch1116 -p1
%patch1117 -p1
%patch1118 -p1

8
base/cluster-resource-agents/centos/meta_patches/spec-include-tis-logtag-patch.patch
View File

@ -11,16 +11,16 @@ 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
@@ -275,6 +275,7 @@ Patch1111: pgsql.patch
Patch1113: create-var-run-resource-agents.patch
@@ -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}
@@ -607,6 +608,7 @@ exit 1
%patch1113 -p1
@@ -605,6 +606,7 @@ exit 1
%patch1114 -p1
%patch1115 -p1
+%patch1116 -p1

4
base/cluster-resource-agents/centos/meta_patches/spec-lvm-cleanup-refs-on-stop.patch
View File

@ -11,7 +11,7 @@ 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
@@ -276,6 +276,7 @@ Patch1113: create-var-run-resource-agents.patch
@@ -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
@ -19,7 +19,7 @@ index c325197..21fa049 100644
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -609,6 +610,7 @@ exit 1
@@ -607,6 +608,7 @@ exit 1
%patch1114 -p1
%patch1115 -p1
%patch1116 -p1

8
base/cluster-resource-agents/centos/meta_patches/spec-notify-rmon-of-shutdown-before-shutting-down.patch
View File

@ -12,18 +12,18 @@ 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
@@ -273,6 +273,7 @@ Patch1110: lvm_vg_activation.patch
@@ -272,6 +272,7 @@ Patch1109: umount-in-namespace.patch
Patch1110: lvm_vg_activation.patch
Patch1111: pgsql.patch
Patch1113: create-var-run-resource-agents.patch
+Patch1114: notify-rmon-of-shutdown-before-shutting-down.patch
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -603,6 +604,7 @@ exit 1
@@ -601,6 +602,7 @@ exit 1
%patch1110 -p1
%patch1111 -p1
%patch1113 -p1
+%patch1114 -p1
%build

28
base/cluster-resource-agents/centos/patches/create-var-run-resource-agents.patch
View File

@ -1,28 +0,0 @@
From 5da3820896a51fd018371bbc08900f22ca0ea4a3 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 May 2016 21:53:21 -0400
Subject: [PATCH 1/1] Create /var/run/resource-agents, if needed
---
heartbeat/ocf-shellfuncs.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 7b5f831..3565e20 100644
--- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in
@@ -166,6 +166,11 @@ __ocf_set_defaults() {
ha_log "ERROR: Need to tell us our resource instance name."
exit $OCF_ERR_ARGS
fi
+
+ # TODO: Find a better way to ensure this dir exists
+ if [ ! -d "$HA_RSCTMP" ]; then
+ mkdir -p $HA_RSCTMP
+ fi
}
hadate() {
--
2.7.4