pool/pacemaker
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 54302 from network:ha-clustering:Factory

Browse Source 
Accepted submit request 54302 from user colyli

OBS-URL: https://build.opensuse.org/request/show/54302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=32
This commit is contained in:
Marcus Rückert 2010-12-02 15:19:50 +00:00 committed by Git OBS Bridge
parent 6ecd79cfbd
commit 3465ba6902
5 changed files with 121 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pacemaker-cts-startcmd.patch
View File

@ -5,8 +5,8 @@ diff -r 93114fbc53ea cts/CM_ais.py
self.update({ self.update({
"Name" : "crm-flatiron", "Name" : "crm-flatiron",
- "StartCmd" : CTSvars.INITDIR+"/corosync start", - "StartCmd" : "service corosync start",
- "StopCmd" : CTSvars.INITDIR+"/corosync stop", - "StopCmd" : "service corosync stop",
+ "StartCmd" : CTSvars.INITDIR+"/openais start", + "StartCmd" : CTSvars.INITDIR+"/openais start",
+ "StopCmd" : CTSvars.INITDIR+"/openais stop", + "StopCmd" : CTSvars.INITDIR+"/openais stop",

25
pacemaker-pyexecdir.patch
View File

@ -1,25 +0,0 @@
Index: pacemaker/cts/Makefile.am
===================================================================
--- pacemaker.orig/cts/Makefile.am
+++ pacemaker/cts/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES = LSBDummy
EXTRA_DIST = $(cts_SCRIPTS) $(cts_DATA)
ctsdir = $(datadir)/$(PACKAGE)/tests/cts
-ctslibdir = $(pythondir)/cts
+ctslibdir = $(pyexecdir)/cts
ctslib_PYTHON = __init__.py \
CTSvars.py \
Index: pacemaker/shell/modules/Makefile.am
===================================================================
--- pacemaker.orig/shell/modules/Makefile.am
+++ pacemaker/shell/modules/Makefile.am
@@ -41,6 +41,6 @@ modules = __init__.py \
vars.py \
xmlutil.py
-shelllibdir = $(pythondir)/crm
+shelllibdir = $(pyexecdir)/crm
shelllib_PYTHON = $(modules)

115
pacemaker.changes
View File

@ -1,3 +1,111 @@
-------------------------------------------------------------------
Thu Nov 18 00:56:14 CET 2010 - meissner@suse.de
- SUSE_ASNEEDED also during %install, if by chance we rebuild
things in there.
-------------------------------------------------------------------
Mon Aug 16 20:08:41 UTC 2010 - lmb@novell.com
- cib: Allow backup files to proceed after wrap-around (bnc#630322)
- Upstream version cs: dfc6b2561373
-------------------------------------------------------------------
Mon Aug 9 20:17:36 UTC 2010 - lmb@novell.com
- stonith-ng: record exit code and log output for failed port list query
(bnc#625594)
- Upstream version cs: 0db65fda4b15
-------------------------------------------------------------------
Fri Aug 6 13:24:07 UTC 2010 - lmb@novell.com
- Shell: print error if a resource is not found in stop/start/manage
(bnc#627757)
- PE: Fix memory leak when unpacking recurring operations
- PE: Fix potential use-of-NULL when calculating the set of required
actions
- Shell: set shadow directory properly (bnc#626638)
- Core: Enable coredumps properly for MCP and AIS plugin (lf#2463)
- Upstream version cs: 61360150595d
-------------------------------------------------------------------
Thu Aug 5 14:55:22 UTC 2010 - tserong@novell.com
- Explicitly require libglue2 to avoid potential conflict with
libheartbeat2 (bnc#628243)
-------------------------------------------------------------------
Wed Jul 28 13:55:08 UTC 2010 - lmb@novell.com
- crmd: Prevent everyone from losing DC elections by correctly
initializing all relevant variables
- crmd: Ensure we activate the DC timer if we detect an alternate DC
- PE: Wait until stonith is available, don't fall back to shutdown for
nodes requesting termination
- Upstream version cs: e0d731c2b1be
-------------------------------------------------------------------
Wed Jul 21 10:15:37 UTC 2010 - lmb@novell.com
- PE: Correctly order clone startup after group/clone start
- stonith-ng: pass the configuration to the stonith program via
environment variables; requires cluster-glue >= 1.0.6 (bnc#620781,
CVE-2010-2496)
- Logging improvements.
- Upstream version cs: f9fbf97b0ce8
-------------------------------------------------------------------
Wed Jul 14 14:58:10 UTC 2010 - lmb@novell.com
- Shell: allow adding force parameter to resource migrate
- Shell: add the actions option to configure ptest (lf#2360)
- Shell: test early for duplicate elements in edit (bnc#620460)
- Shell: Use crm_attribute directly instead of the deprecated
crm_standby and crm_failcount wrappers
- PE: Correctly detect when there is a real failcount that expired and
needs to be cleared
- PE: Avoid creating invalid ordering constraints for probes that aren't
needed
- PE: Include the prefix for clone children when printing the clone
- PE: Bug lf#2453 - Enforce clone ordering in the absense of colocation
constraints (lf#2453, bnc#619581)
- crmd: Only log the failcount op if something is wrong
- crmd: Base DC election on process relative uptime
- crmd: Make sure we always poke the FSA after a transition to clear any
TE_HALT actions
- crmd: Make sure the membership cache is accurate after a sucessful
fencing operation
- crmd: All nodes should see status updates, not just the DC
- stonith-ng: Advertise stonith-ng options in the metadata
- Core: Correctly unpack HA_Messages containing multiple entries with
the same name
- ais: Sign everyone up for peer process updates, not just the crmd
- ais: Move the code for finding uid before the fork so that the child
does no logging
- Upstream version cs: e9b2f255a20e
-------------------------------------------------------------------
Tue Jul 6 14:53:24 UTC 2010 - lmb@novell.com
- PE: Fail unmanaged resources should not prevent other services from shutting down (lf#1959)
- crmd: Handle asynchronous notification of resource deletion events (lf#2439)
- Shell: add support for classes to the providers command
- crmd: Pass in the correct result when processing synchronous resource deletion operations
- ais: Fix unterminated recursion in init_ais_connection()
- Tools: Make sure crm_resource waits for the completion of crmd operations it sent
- stonith: Support the poweron/poweroff actions (bnc#618798)
- stonith: Map poweron/poweroff back to on/off expected by the stonith
tool from cluster-glue (bnc#618798)
- PE: Correctly handle pseudo action creation
- Tools: crm_node - Enable the -A parameter, the short form of --openais
- CLI: report bad ISO8601 duration specifiers (bnc#618808)
- crmd: Fix assertion failure when performing async resource failures
- crmd: Include the action for crm graph operations
- crmd: Allow non-DC nodes to clear failcounts too and tidy up logging
- Fix some valgrind reported leaks.
- Upstream version cs: ea6cdd9d9613
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 14 14:25:25 UTC 2010 - lmb@novell.com Mon Jun 14 14:25:25 UTC 2010 - lmb@novell.com
@ -15,7 +123,7 @@ Mon Jun 14 14:25:25 UTC 2010 - lmb@novell.com
- PE: Support colocation sets with negative scores (lf#2435) - PE: Support colocation sets with negative scores (lf#2435)
- PE: Ensure deallocated resources are stopped - PE: Ensure deallocated resources are stopped
- PE: Ordering dependencies on partially active groups not observed - PE: Ordering dependencies on partially active groups not observed
properly (lf#2422) properly (lf#2422, bnc#607125)
- PE: If there are no compatible peers when interleaving clones, ensure - PE: If there are no compatible peers when interleaving clones, ensure
the instance is stopped the instance is stopped
- PE: Fix colocation for interleaved clones - PE: Fix colocation for interleaved clones
@ -27,9 +135,8 @@ Mon Jun 14 14:25:25 UTC 2010 - lmb@novell.com
- ais: Improved processing when the peer crmd processes join/leave - ais: Improved processing when the peer crmd processes join/leave
(lf#2401) (lf#2401)
- Tools: crm_resource - Report crmd connection errors - Tools: crm_resource - Report crmd connection errors
- Tools: Drop the 'pingd' daemon and resource agent in favor of - Tools: Depreciate the 'pingd' daemon and resource agent in favor of
ocf:pacemaker:ping (WIP WIP WIP FIXME FIXME FIXME This is dangerous to ocf:pacemaker:ping
release as it stands now!)
- cib: Fix the application of unversioned diffs - cib: Fix the application of unversioned diffs
- Several valgrind + coverity issues fixed. - Several valgrind + coverity issues fixed.
- Upstream version cs: 8b9ec9ccc506 - Upstream version cs: 8b9ec9ccc506

9
pacemaker.spec
View File

@ -46,11 +46,12 @@ Source: pacemaker.tar.bz2
Source2: %{doc_pkg}.tar.gz Source2: %{doc_pkg}.tar.gz
Source100: pacemaker.rpmlintrc Source100: pacemaker.rpmlintrc
Patch1: pacemaker-cts-startcmd.patch Patch1: pacemaker-cts-startcmd.patch
Patch2: pacemaker-pyexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on AutoReqProv: on
Conflicts: heartbeat < 3.0 Conflicts: heartbeat < 3.0
PreReq: cluster-glue # We need libglue2, not libheartbeat2
Conflicts: libheartbeat2 < 3.0.0
PreReq: cluster-glue >= 1.0.6
Requires: resource-agents openais python python-xml Requires: resource-agents openais python python-xml
Requires: libpacemaker3 = %{version}-%{release} python-curses Requires: libpacemaker3 = %{version}-%{release} python-curses
BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libglue-devel libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel resource-agents swig BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libglue-devel libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel resource-agents swig
@ -154,7 +155,6 @@ Authors:
########################################################### ###########################################################
%setup -a 2 -n pacemaker -q %setup -a 2 -n pacemaker -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
########################################################### ###########################################################
%build %build
@ -175,6 +175,7 @@ fi
########################################################### ###########################################################
%install %install
export SUSE_ASNEEDED=0
########################################################### ###########################################################
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
if [ -e %{doc_pkg}/cibadmin.8 ]; then if [ -e %{doc_pkg}/cibadmin.8 ]; then
@ -189,6 +190,8 @@ rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so
# Don't want to ship this just yet: # Don't want to ship this just yet:
rm $RPM_BUILD_ROOT/usr/sbin/crm_report rm $RPM_BUILD_ROOT/usr/sbin/crm_report
rm $RPM_BUILD_ROOT/etc/init.d/pacemaker || true
rm $RPM_BUILD_ROOT/usr/sbin/pacemaker{d,} || true
#%if %with_ais_support #%if %with_ais_support
# mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso # mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso

4
pacemaker.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:92837f40a03d1709943b0f452baa4ab4dad3a13314316950a5a43d0410ad1b88 oid sha256:f07ef44dafa97025bcb55e359e5126d6778806aa43b40f9d386b0610b761d7e6
size 23281120 size 23299917