Accepting request 229447 from network:ha-clustering:Factory
- pengine: Support id-ref in nvpair with optional "name" (FATE#316118) Drop the patches that have been merged upstream: * pacemaker-pengine-nvpair-id-ref.patch * pacemaker-pengine-nvpair-id-ref-test.patch - Upstream version cs: 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202 - xml: INFINITY could overflow for 16-bit ints - explicitly cast it - xml: Correctly determine the lowest allowed schema version - xml: Construct the table of supported schemas - cib: All schema upgrade requests must go via the DC - cib: Determine the best value of validate-with if one is not supplied - acl: Ensure known users are not able to read the cib by default - xml: Add missing schema file - Upstream version cs: d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59 - crmd: Correctly react to successful unfencing operations - PE: Delay unfencing until after we know the state of all resources that require unfencing - PE: Fencing devices default to only requiring quorum in order to start - PE: Automatically re-unfence a node if the fencing device definition changes - pengine: Only report 'migrate' in transition summary if migration is actually taking place - crm_node: Set correct subsystem in node rm cache msg - crm_node: Prevent use-after-free in tools_remove_node_cache() - crmd: make resource ID case sensitive - fencing: Correction of the registration from a difference. - crm_report: Add support for ISO8601 time format in logs (bnc#870886) - PE: Potential memory leak - xml: Support resources that require unfencing - crmd: make node_state erase correctly - xml: Add the ability to have lightweight schema revisions - xml: Split up the RelaxNG schema files so they're easier to version individually OBS-URL: https://build.opensuse.org/request/show/229447 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=68
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
577ac3a10f
2
_service
2
_service
@ -11,7 +11,7 @@
|
|||||||
<param name="version">1.1.11</param>
|
<param name="version">1.1.11</param>
|
||||||
-->
|
-->
|
||||||
<param name="versionformat">1.1.11+git%cd.%h</param>
|
<param name="versionformat">1.1.11+git%cd.%h</param>
|
||||||
<param name="revision">0b7d85a159cc92e00ebded65c9a33edce7ba1c22</param>
|
<param name="revision">6442c5a67cdd4cbaeedb2c532e0dc0667a79c202</param>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
|||||||
@ -1,72 +0,0 @@
|
|||||||
commit c9765144c0c23808b37adaf56c3305e2e2167173
|
|
||||||
Author: Gao,Yan <ygao@suse.com>
|
|
||||||
Date: Mon Dec 17 16:09:28 2012 +0800
|
|
||||||
|
|
||||||
Low: fencing: Suppress logging for stonith monitor actions (bnc#792124)
|
|
||||||
|
|
||||||
Index: pacemaker/fencing/commands.c
|
|
||||||
===================================================================
|
|
||||||
--- pacemaker.orig/fencing/commands.c
|
|
||||||
+++ pacemaker/fencing/commands.c
|
|
||||||
@@ -1296,7 +1296,13 @@ log_operation(async_command_t * cmd, int
|
|
||||||
/* Logging the whole string confuses syslog when the string is xml */
|
|
||||||
char *prefix = g_strdup_printf("%s:%d", cmd->device, pid);
|
|
||||||
|
|
||||||
- crm_log_output(rc == 0 ? LOG_INFO : LOG_WARNING, prefix, output);
|
|
||||||
+ int success_log_level = LOG_INFO;
|
|
||||||
+
|
|
||||||
+ if (safe_str_eq(cmd->action, "monitor") ||
|
|
||||||
+ safe_str_eq(cmd->action, "status")) {
|
|
||||||
+ success_log_level = LOG_DEBUG;
|
|
||||||
+ }
|
|
||||||
+ crm_log_output(rc==0?success_log_level:LOG_WARNING, prefix, output);
|
|
||||||
g_free(prefix);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1954,6 +1960,7 @@ stonith_command(crm_client_t * client, u
|
|
||||||
* by 0x40AD4F: stonith_command (commands.c:1891)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+ int error_log_level = LOG_INFO;
|
|
||||||
|
|
||||||
if (get_xpath_object("//" T_STONITH_REPLY, request, LOG_DEBUG_3)) {
|
|
||||||
is_reply = TRUE;
|
|
||||||
@@ -1973,7 +1980,16 @@ stonith_command(crm_client_t * client, u
|
|
||||||
rc = handle_request(client, id, flags, request, remote_peer);
|
|
||||||
}
|
|
||||||
|
|
||||||
- do_crm_log_unlikely(rc > 0 ? LOG_DEBUG : LOG_INFO, "Processed %s%s from %s: %s (%d)", op,
|
|
||||||
+ if (rc == -EINPROGRESS) {
|
|
||||||
+ xmlNode *op = get_xpath_object("//@"F_STONITH_ACTION, request, LOG_DEBUG_3);
|
|
||||||
+ const char *action = crm_element_value(op, F_STONITH_ACTION);
|
|
||||||
+
|
|
||||||
+ if (safe_str_eq(action, "monitor") ||
|
|
||||||
+ safe_str_eq(action, "status")) {
|
|
||||||
+ error_log_level = LOG_DEBUG;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ do_crm_log_unlikely(rc > 0 ? LOG_DEBUG : error_log_level, "Processed %s%s from %s: %s (%d)", op,
|
|
||||||
is_reply ? " reply" : "", client ? client->name : remote_peer,
|
|
||||||
rc > 0 ? "" : pcmk_strerror(rc), rc);
|
|
||||||
|
|
||||||
Index: pacemaker/lib/fencing/st_client.c
|
|
||||||
===================================================================
|
|
||||||
--- pacemaker.orig/lib/fencing/st_client.c
|
|
||||||
+++ pacemaker/lib/fencing/st_client.c
|
|
||||||
@@ -561,8 +561,15 @@ stonith_action_create(const char *agent,
|
|
||||||
{
|
|
||||||
stonith_action_t *action;
|
|
||||||
|
|
||||||
+ int log_level = LOG_INFO;
|
|
||||||
+
|
|
||||||
+ if (safe_str_eq(_action, "monitor") ||
|
|
||||||
+ safe_str_eq(_action, "status")) {
|
|
||||||
+ log_level = LOG_DEBUG;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
action = calloc(1, sizeof(stonith_action_t));
|
|
||||||
- crm_info("Initiating action %s for agent %s (target=%s)", _action, agent, victim);
|
|
||||||
+ do_crm_log(log_level, "Initiating action %s for agent %s (target=%s)", _action, agent, victim);
|
|
||||||
action->args = make_args(_action, victim, victim_nodeid, device_args, port_map);
|
|
||||||
action->agent = strdup(agent);
|
|
||||||
action->action = strdup(_action);
|
|
||||||
@ -4,10 +4,10 @@ Date: Thu Apr 18 16:00:02 2013 +0800
|
|||||||
|
|
||||||
Log: fencing: Drop the severity of the messages on registering a stonith device
|
Log: fencing: Drop the severity of the messages on registering a stonith device
|
||||||
|
|
||||||
Index: pacemaker/fencing/commands.c
|
Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pacemaker.orig/fencing/commands.c
|
--- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/commands.c
|
||||||
+++ pacemaker/fencing/commands.c
|
+++ pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c
|
||||||
@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c
|
@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c
|
||||||
|
|
||||||
dup = device_has_duplicate(device);
|
dup = device_has_duplicate(device);
|
||||||
@ -26,16 +26,16 @@ Index: pacemaker/fencing/commands.c
|
|||||||
g_hash_table_size(device_list));
|
g_hash_table_size(device_list));
|
||||||
}
|
}
|
||||||
if (desc) {
|
if (desc) {
|
||||||
Index: pacemaker/fencing/main.c
|
Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/main.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pacemaker.orig/fencing/main.c
|
--- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/main.c
|
||||||
+++ pacemaker/fencing/main.c
|
+++ pacemaker-1.1.11+git20140303.ca8234d/fencing/main.c
|
||||||
@@ -878,7 +878,7 @@ update_cib_cache_cb(const char *event, x
|
@@ -981,7 +981,7 @@ update_cib_cache_cb(const char *event, x
|
||||||
switch (rc) {
|
break;
|
||||||
case -pcmk_err_diff_resync:
|
case -pcmk_err_diff_resync:
|
||||||
case -pcmk_err_diff_failed:
|
case -pcmk_err_diff_failed:
|
||||||
- crm_notice("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
|
- crm_notice("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
|
||||||
+ crm_info("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
|
+ crm_info("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
|
||||||
case pcmk_ok:
|
free_xml(local_cib);
|
||||||
|
local_cib = NULL;
|
||||||
break;
|
break;
|
||||||
default:
|
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:4209bd9bd0deed4aa6a9254ab2606e18cb9b9b4f31394c96811139a33f977268
|
|
||||||
size 9254287
|
|
||||||
3
pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
Normal file
3
pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d5e3e3b0ec854e1b571bebe4f22a6628357ebb0894299055815ac4f5b34ffbb0
|
||||||
|
size 9428490
|
||||||
@ -1,3 +1,190 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 9 04:41:38 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- pengine: Support id-ref in nvpair with optional "name" (FATE#316118)
|
||||||
|
Drop the patches that have been merged upstream:
|
||||||
|
* pacemaker-pengine-nvpair-id-ref.patch
|
||||||
|
* pacemaker-pengine-nvpair-id-ref-test.patch
|
||||||
|
- Upstream version cs: 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 8 13:34:59 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- xml: INFINITY could overflow for 16-bit ints - explicitly cast it
|
||||||
|
- xml: Correctly determine the lowest allowed schema version
|
||||||
|
- xml: Construct the table of supported schemas
|
||||||
|
- cib: All schema upgrade requests must go via the DC
|
||||||
|
- cib: Determine the best value of validate-with if one is not supplied
|
||||||
|
- acl: Ensure known users are not able to read the cib by default
|
||||||
|
- xml: Add missing schema file
|
||||||
|
- Upstream version cs: d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 4 10:46:58 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- crmd: Correctly react to successful unfencing operations
|
||||||
|
- PE: Delay unfencing until after we know the state of all resources that require unfencing
|
||||||
|
- PE: Fencing devices default to only requiring quorum in order to start
|
||||||
|
- PE: Automatically re-unfence a node if the fencing device definition changes
|
||||||
|
- pengine: Only report 'migrate' in transition summary if migration is actually taking place
|
||||||
|
- crm_node: Set correct subsystem in node rm cache msg
|
||||||
|
- crm_node: Prevent use-after-free in tools_remove_node_cache()
|
||||||
|
- crmd: make resource ID case sensitive
|
||||||
|
- fencing: Correction of the registration from a difference.
|
||||||
|
- crm_report: Add support for ISO8601 time format in logs (bnc#870886)
|
||||||
|
- PE: Potential memory leak
|
||||||
|
- xml: Support resources that require unfencing
|
||||||
|
- crmd: make node_state erase correctly
|
||||||
|
- xml: Add the ability to have lightweight schema revisions
|
||||||
|
- xml: Split up the RelaxNG schema files so they're easier to version individually
|
||||||
|
- crm_get_msec: prevent integer overflow
|
||||||
|
- corosync: Reduce log severity for a redundant message (bnc#870624)
|
||||||
|
- attrd: Reduce log severity for normal messages (bnc#870624)
|
||||||
|
- cib: When data was old, it fixed so that the newest cib might not be acquired.
|
||||||
|
- crm_attribute: Default --lifetime to forever when using --node (bnc#870696)
|
||||||
|
- Upstream version cs: 76579e813b5aaa1972d400055233519f58bbc0c6
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 31 07:19:00 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- pengine: Do not fence remote-node entries left over in the node section that have no connection rsc
|
||||||
|
- pengine: properly handle remote-node without connection resource.
|
||||||
|
- xml: Update xml validation to allow '<node type=remote />'
|
||||||
|
- cib: allow setting permanent remote-node attributes
|
||||||
|
- Upstream version cs: d63eaf41fa8173de3e29873d0461bfb888b83b37
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 28 07:52:07 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- xml: Allow first-acl-match-wins semantics to be supported if desired
|
||||||
|
- crm_report: extract additional DLM lockspace data
|
||||||
|
- xml: If validate-with is missing, we find the most recent schema that accepts it and go from there
|
||||||
|
- tools: fix "crm_shadow --reset <name>"
|
||||||
|
- controld: Remove '-q 0' from default dlm_controld arguments
|
||||||
|
- acl: Authenticate pacemaker-remote requests with the node name as the client
|
||||||
|
- controld: Verify killall is available on resource start
|
||||||
|
- Prevent use-of-NULL spotted by coverity
|
||||||
|
- crmd: Correctly detect changes to the configuration root
|
||||||
|
- crmd: Fenced nodes that return prior to an election do not need to have their status section reset
|
||||||
|
- xml: Do not log deleted attributes
|
||||||
|
- xml: Correctly mark the parent's of deleted attributes as dirty
|
||||||
|
- crm_diff: Allow the generation of xml patchsets without digests
|
||||||
|
- crmd: Prevent memory leak when accepting a new DC
|
||||||
|
- xml: Find the minimal set of changes when part of a document is replaced
|
||||||
|
- xml: Create the correct diff when only part of a document is changed
|
||||||
|
- Upstream version cs: 61e95e4864be0301be528874eed65266f4e62cf0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 21 05:51:05 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- pengine: fixes invalid transition caused by clones with more than 10 instances
|
||||||
|
- services_action_cancel: Interpret return code from mainloop_child_kill() correctly
|
||||||
|
- fencing: make hashtable mapping hostname->alias case insensitive for hostname
|
||||||
|
- attrd: Make hostname hashtable case insensitive
|
||||||
|
- membership: make caching peers by uname case insensitive
|
||||||
|
- crmd: make lrm_state hash table not case sensitive
|
||||||
|
- lrmd: clean up the agent's entire process group
|
||||||
|
- xml: Enable resource sets in location constraints for 1.2 schema (bnc#867880)
|
||||||
|
- Upstream version cs: 8bee850bb95ee01dcba03038ddfd65d22e195cf6
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 13 10:44:49 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- Drop obsolete bug-792124_pacemaker-stonith-monitor-log.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 13 09:38:46 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- mainloop: Fixes use after free in process monitor code
|
||||||
|
- lrmd: Cancel recurring operations before stop action is executed
|
||||||
|
- lrmd: Merge duplicate recurring monitor operations
|
||||||
|
- services: Do not allow duplicate recurring op entries
|
||||||
|
- crmd: Ack pending operations that were cancelled due to rsc deletion
|
||||||
|
- crm_mon: Add failures to --as-xml output
|
||||||
|
- cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib() (bnc#866618)
|
||||||
|
- crmd: Do not start timers for already completed operations
|
||||||
|
- acl: Read access must be explicitly granted
|
||||||
|
- xml: Better move detection logic for xml nodes
|
||||||
|
- cib: Do not disable cib disk writes if on-disk cib is corrupt (bnc#866618)
|
||||||
|
- xml: Correctly calculate the adjusted offset of xml elements
|
||||||
|
- crm_diff: Mirror how the cib operates for better testing
|
||||||
|
- cib: Ingore patch failures if we already have their contents
|
||||||
|
- cib: Prevent use-after-free when cleaning up after query operations
|
||||||
|
- xml: Mark the parents of a partial replace as dirty
|
||||||
|
- xml: Correctly enforce ACLs after a replace operation
|
||||||
|
- cib: Do not try to use an empty value for CIB_shadow
|
||||||
|
- crm_resource: Gracefully handle -EACCESS when querying the cib
|
||||||
|
- xml: Correctly observe ACLs when creating filtered copies of xml documents
|
||||||
|
- xml: Only test write permissions for attributes that are being changed
|
||||||
|
- xml: Always allow new scaffolding - node with no attributes or only an id field
|
||||||
|
- cib: Memory leaks caused by ACLs returning filtered copies
|
||||||
|
- xml: Set flags to indicate when updates were rejected by an ACL
|
||||||
|
- cib: Respect the CIB_user environment variable for ACLs
|
||||||
|
- xml: Unpack and apply ACLs when tracking changes
|
||||||
|
- cib: Implement CIB_file-mode ACLs for testing
|
||||||
|
- remote: Enable migration support for baremetal connection resources by default
|
||||||
|
- cibadmin: Allow priviliged clients to perform tasks as unpriviliged users
|
||||||
|
- cibadmin: Remove dangerous commands that exposed unnecessary implementation internal details
|
||||||
|
- cibadmin: Purge legacy command options deprecated since 2008 to make the short-forms available for new options
|
||||||
|
- cib: Include a request with file-mode cib actions for the acl code to interrogate
|
||||||
|
- cib: Switch over completely to the new ACL code
|
||||||
|
- xml: Allow new objects to be created provided they subseqently match a configured ACL
|
||||||
|
- cib: Use the new acl filtering functionality
|
||||||
|
- xml: Support the creation of filtered copies based on ACLs
|
||||||
|
- xml: Convert all ACLs to xpaths during unpack
|
||||||
|
- xml: Add ACL flags for xpath selectors when tracking is enabled
|
||||||
|
- cib: ACL improvements
|
||||||
|
- cib: Simplify ACL handling for read-only cib queries
|
||||||
|
- cib: Check ACLs prior to making the update instead of parsing the diff afterwards
|
||||||
|
- cib: Default ACL support to on
|
||||||
|
- Upstream version cs: 38c5972cd284ea6627b3309b619dad4d27442ab0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 3 11:42:04 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- Add symlinks rcpacemaker and rcpacemaker_remote to /usr/bin/service (bnc#866057)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 3 09:32:30 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- Rebase bug-812269_pacemaker-fencing-device-register-messages.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 3 07:40:22 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- xml: Memory leak when free'ing xml documents
|
||||||
|
- systemd: Prevent use-of-NULL when determining if an agent exists
|
||||||
|
- xml: Fix segfault in TRACKING_CHANGES() (bnc#865345)
|
||||||
|
- PE: Memory leak when updating cancel operations
|
||||||
|
- xml: Prevent memory leak in xml _private field
|
||||||
|
- pengine: Performance increase, stack allocated score2char
|
||||||
|
- crm_report: Only gather dlm data if dlm_controld is running
|
||||||
|
- Fix: memory leak found by valgrind was corrected.
|
||||||
|
- Fencing: Add the ability to call stonith_api_time() from stonith_admin
|
||||||
|
- Fencing: Pass the correct options when looking up the history by node name
|
||||||
|
- cib: Ensure 'cibadmin -R/--replace' commands get replies
|
||||||
|
- xml: Correctly initialize and find v1-style patch version numbers
|
||||||
|
- crm_mon: Add -R switch to show clone details
|
||||||
|
- Build: Install compatibility.h
|
||||||
|
- fencing: Teach stonith-ng about finding device and topology changes in the v2 patch format
|
||||||
|
- crm_report: Additional dlm detail
|
||||||
|
- crm_report: Allow ssh alternatives to be used
|
||||||
|
- crmd: Correctly recognise operation cancellations we initiated
|
||||||
|
- crmd: Improved logging of transition cancellations
|
||||||
|
- crmd: Correctly detect lrm refreshes
|
||||||
|
- crmd: Ignore 'move' operations to the cib, we only care about content changes
|
||||||
|
- PE: Ensure instance numbers are preserved for cloned templates
|
||||||
|
- Bug cl#5196 - PE: Check values after expanding templates
|
||||||
|
- crm_mon: Ensure resource attributes have been unpacked before displaying connectivity data
|
||||||
|
- Upstream version cs: ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 3 06:14:23 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
- pengine: Support id-ref in nvpair with optional "name" (FATE#316118)
|
||||||
|
* pacemaker-pengine-nvpair-id-ref.patch
|
||||||
|
* pacemaker-pengine-nvpair-id-ref-test.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 21 07:05:40 UTC 2014 - ygao@suse.com
|
Fri Feb 21 07:05:40 UTC 2014 - ygao@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -95,7 +95,7 @@ Name: pacemaker
|
|||||||
Summary: Scalable High-Availability cluster resource manager
|
Summary: Scalable High-Availability cluster resource manager
|
||||||
License: GPL-2.0+ and LGPL-2.1+
|
License: GPL-2.0+ and LGPL-2.1+
|
||||||
Group: Productivity/Clustering/HA
|
Group: Productivity/Clustering/HA
|
||||||
Version: 1.1.11+git20140221.0b7d85a
|
Version: 1.1.11+git20140409.6442c5a
|
||||||
Release: 0
|
Release: 0
|
||||||
#Release: %{pcmk_release}%{?dist}
|
#Release: %{pcmk_release}%{?dist}
|
||||||
Url: http://www.clusterlabs.org
|
Url: http://www.clusterlabs.org
|
||||||
@ -106,12 +106,11 @@ Source0: %{name}-%{version}.tar.bz2
|
|||||||
Source100: pacemaker.rpmlintrc
|
Source100: pacemaker.rpmlintrc
|
||||||
Patch1: bug-806256_pacemaker-log-level-notice.patch
|
Patch1: bug-806256_pacemaker-log-level-notice.patch
|
||||||
Patch2: bug-728579_pacemaker-stonith-dev-id.patch
|
Patch2: bug-728579_pacemaker-stonith-dev-id.patch
|
||||||
Patch3: bug-792124_pacemaker-stonith-monitor-log.patch
|
Patch3: pacemaker-NodeUtilization-RA.patch
|
||||||
Patch4: pacemaker-NodeUtilization-RA.patch
|
Patch4: pacemaker-colocated-utilization.patch
|
||||||
Patch5: pacemaker-colocated-utilization.patch
|
Patch5: pacemaker-cibsecret-tool-temp-disabled.patch
|
||||||
Patch6: pacemaker-cibsecret-tool-temp-disabled.patch
|
Patch6: pacemaker-nagios-plugin-dir.patch
|
||||||
Patch7: pacemaker-nagios-plugin-dir.patch
|
Patch7: bug-812269_pacemaker-fencing-device-register-messages.patch
|
||||||
Patch8: bug-812269_pacemaker-fencing-device-register-messages.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: pacemaker-ticket-support = 2.0
|
Provides: pacemaker-ticket-support = 2.0
|
||||||
Conflicts: heartbeat < 3.0
|
Conflicts: heartbeat < 3.0
|
||||||
@ -396,7 +395,6 @@ manager for Corosync, CMAN and/or Linux-HA.
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
|
||||||
|
|
||||||
# Force the local time
|
# Force the local time
|
||||||
#
|
#
|
||||||
@ -483,6 +481,9 @@ rm -f %{buildroot}/%{_libdir}/service_crm.so
|
|||||||
%if %{defined _unitdir}
|
%if %{defined _unitdir}
|
||||||
rm -f %{buildroot}/%{_initrddir}/pacemaker
|
rm -f %{buildroot}/%{_initrddir}/pacemaker
|
||||||
rm -f %{buildroot}/%{_initrddir}/pacemaker_remote
|
rm -f %{buildroot}/%{_initrddir}/pacemaker_remote
|
||||||
|
|
||||||
|
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker
|
||||||
|
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker_remote
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Only useful on rhel6
|
# Only useful on rhel6
|
||||||
@ -603,6 +604,7 @@ fi
|
|||||||
|
|
||||||
%if %{defined _unitdir}
|
%if %{defined _unitdir}
|
||||||
%{_unitdir}/pacemaker.service
|
%{_unitdir}/pacemaker.service
|
||||||
|
%{_sbindir}/rcpacemaker
|
||||||
%else
|
%else
|
||||||
%{_initrddir}/pacemaker
|
%{_initrddir}/pacemaker
|
||||||
%endif
|
%endif
|
||||||
@ -717,6 +719,7 @@ fi
|
|||||||
#%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
|
#%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
|
||||||
%if %{defined _unitdir}
|
%if %{defined _unitdir}
|
||||||
%{_unitdir}/pacemaker_remote.service
|
%{_unitdir}/pacemaker_remote.service
|
||||||
|
%{_sbindir}/rcpacemaker_remote
|
||||||
%else
|
%else
|
||||||
%{_initrddir}/pacemaker_remote
|
%{_initrddir}/pacemaker_remote
|
||||||
%endif
|
%endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user