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

Accepting request 819984 from home:yan_gao:branches:network:ha-clustering:Factory

Browse Source 
- Fixes for %_libexecdir changing to /usr/libexec

- Update to version pacemaker-2.0.4+20200616.2deceaa3a (Pacemaker-2.0.4):
- cibsecret: don't use pssh -q option unless supported
- tools: verify newly created CIB connection is not NULL
- tools: check resource separately from managing parameter in cibsecret
- tools: improve cibsecret help

- Update to version 2.0.3+20200608.44045c027:
- scheduler: Add the node name back to bundle instances.

- Update to version 2.0.3+20200605.0db37d66f:
- rpm: add spec option for enabling CIB secrets
- build: avoid resource-agents as build dependency when cibsecrets are enabled

- Update to version 2.0.3+20200603.4ff9c412f:
- based: use crm_exit to free qb-logging

- Update to version 2.0.3+20200602.f7f36e8a8:
- libpe_status: Modify filtering of inactive resources.

- Update to version 2.0.3+20200527.e67fb5c73:
- rpm: put user-configurable items at top of spec
- tools: free IPC memory after closing connection
- resources: attribute name parameter doesn't have to be unique

- Update to version 2.0.3+20200516.b06fc662e:
- crm_ticket: avoid unnecessary issues with dynamic allocation
- crm_resource: avoid unnecessary issus with dynamic allocation
- crm_mon: NULL output-pointer when buffer is freed

OBS-URL: https://build.opensuse.org/request/show/819984
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=339
This commit is contained in:
Yan Gao 2020-07-10 12:16:26 +00:00 committed by Git OBS Bridge
parent f721689677
commit 02bf41c8c8
6 changed files with 123 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -8,9 +8,9 @@
To update to a new release, change "revision" to the desired To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary git commit hash and bump "version" if necessary
<param name="version">2.0.3</param> <param name="version">2.0.4</param>
--> -->
<param name="versionformat">2.0.3+%cd.%h</param> <param name="versionformat">2.0.4+%cd.%h</param>
<param name="revision">master</param> <param name="revision">master</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
</service> </service>

2
_servicedata
View File

@ -1,6 +1,6 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/pacemaker.git</param> <param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">1711f9e1e28db799b2fc25d1a8c6a3bc38cd8bae</param> <param name="changesrevision">2deceaa3ae1fbadd844f5c5b47fd33129fa2c227</param>
</service> </service>
</servicedata> </servicedata>

3
pacemaker-2.0.3+20200511.2b248d828.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13b64d620fffdea3ee7d946ab78ad48f6bcb393e10023bac94fa0964a91ebd3a
size 3293488

3
pacemaker-2.0.4+20200616.2deceaa3a.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c23ad4a7f688565bc1c46055c0ddfe8a30adea898c5abf82f12e01d06d179432
size 3299200

96
pacemaker.changes
View File

@ -1,4 +1,66 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 7 09:47:46 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec
-------------------------------------------------------------------
Wed Jun 24 08:19:39 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version pacemaker-2.0.4+20200616.2deceaa3a (Pacemaker-2.0.4):
- cibsecret: don't use pssh -q option unless supported
- tools: verify newly created CIB connection is not NULL
- tools: check resource separately from managing parameter in cibsecret
- tools: improve cibsecret help
-------------------------------------------------------------------
Thu Jun 18 10:55:19 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200608.44045c027:
- scheduler: Add the node name back to bundle instances.
-------------------------------------------------------------------
Thu Jun 18 10:54:09 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200605.0db37d66f:
- rpm: add spec option for enabling CIB secrets
- build: avoid resource-agents as build dependency when cibsecrets are enabled
-------------------------------------------------------------------
Thu Jun 18 10:51:41 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200603.4ff9c412f:
- based: use crm_exit to free qb-logging
-------------------------------------------------------------------
Thu Jun 18 10:50:12 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200602.f7f36e8a8:
- libpe_status: Modify filtering of inactive resources.
-------------------------------------------------------------------
Tue Jun 02 07:42:10 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200527.e67fb5c73:
- rpm: put user-configurable items at top of spec
- tools: free IPC memory after closing connection
- resources: attribute name parameter doesn't have to be unique
-------------------------------------------------------------------
Wed May 20 12:38:55 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200516.b06fc662e:
- crm_ticket: avoid unnecessary issues with dynamic allocation
- crm_resource: avoid unnecessary issus with dynamic allocation
- crm_mon: NULL output-pointer when buffer is freed
- crm_error: use g_free for a proper match
- libreplace: closedir when bailing out dir traversal
- libcrmcommon: return ENOMEM directly instead of errno
- libcrmcommon: free basename after setting prgname
- silence some false positives static analysis stumbled over
- move bcond_with/without up front for e.g. pcmk_release
- fencer: avoid infinite loop if device is removed during operation
------------------------------------------------------------------
Tue May 12 06:30:23 UTC 2020 - Yan Gao <ygao@suse.com> Tue May 12 06:30:23 UTC 2020 - Yan Gao <ygao@suse.com>
- libcrmcommon: lower message on reading proc file to info - libcrmcommon: lower message on reading proc file to info
@ -49,8 +111,8 @@ Thu May 07 21:48:11 UTC 2020 - Yan Gao <ygao@suse.com>
Mon May 04 17:11:07 UTC 2020 - Yan Gao <ygao@suse.com> Mon May 04 17:11:07 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200429.029571144: - Update to version 2.0.3+20200429.029571144:
- stonith_admin: --delay is an optional option for --fence/--unfence/--reboot commands (ECO-1611, SLE-12239, SLE-12240) - stonith_admin: --delay is an optional option for --fence/--unfence/--reboot commands (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- controller: avoid possible use-of-NULL on logging fencing message (ECO-1611, SLE-12239, SLE-12240) - controller: avoid possible use-of-NULL on logging fencing message (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 04 17:08:14 UTC 2020 - Yan Gao <ygao@suse.com> Mon May 04 17:08:14 UTC 2020 - Yan Gao <ygao@suse.com>
@ -95,12 +157,12 @@ Thu Apr 09 11:48:23 UTC 2020 - Yan Gao <ygao@suse.com>
Thu Apr 09 11:46:28 UTC 2020 - Yan Gao <ygao@suse.com> Thu Apr 09 11:46:28 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200403.eb73f2237: - Update to version 2.0.3+20200403.eb73f2237:
- fencer: update cpg_topology_delay test to also verify pcmk_delay_base is added (ECO-1611, SLE-12239, SLE-12240) - fencer: update cpg_topology_delay test to also verify pcmk_delay_base is added (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- controller: requested priority fencing delay defaults to 0 (ECO-1611, SLE-12239, SLE-12240) - controller: requested priority fencing delay defaults to 0 (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- stonith_admin: --delay option defaults to 0 (ECO-1611, SLE-12239, SLE-12240) - stonith_admin: --delay option defaults to 0 (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- fencer: any delays from pcmk_delay_base/max are added to requested fencing delay (ECO-1611, SLE-12239, SLE-12240) - fencer: any delays from pcmk_delay_base/max are added to requested fencing delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- scheduler: do not differentiate the case where all the nodes have equal priority (ECO-1611, SLE-12239, SLE-12240) - scheduler: do not differentiate the case where all the nodes have equal priority (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- scheduler: priority-fencing-delay defaults to 0 meaning disabled (ECO-1611, SLE-12239, SLE-12240) - scheduler: priority-fencing-delay defaults to 0 meaning disabled (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 09 11:42:27 UTC 2020 - Yan Gao <ygao@suse.com> Thu Apr 09 11:42:27 UTC 2020 - Yan Gao <ygao@suse.com>
@ -129,15 +191,15 @@ Thu Apr 09 11:30:56 UTC 2020 - Yan Gao <ygao@suse.com>
Thu Apr 09 11:19:36 UTC 2020 - Yan Gao <ygao@suse.com> Thu Apr 09 11:19:36 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200321.3e73aefb8: - Update to version 2.0.3+20200321.3e73aefb8:
- Pacemaker Explained: document priority-fencing-delay cluster option (ECO-1611, SLE-12239, SLE-12240) - Pacemaker Explained: document priority-fencing-delay cluster option (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- fencer: add cpg_topology_delay test to verify enforced fencing delay with fencing topology (ECO-1611, SLE-12239, SLE-12240) - fencer: add cpg_topology_delay test to verify enforced fencing delay with fencing topology (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- fencer: handle any enforced fencing delay (ECO-1611, SLE-12239, SLE-12240) - fencer: handle any enforced fencing delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- stonith_admin: add --delay option to support enforced fencing delay (ECO-1611, SLE-12239, SLE-12240) - stonith_admin: add --delay option to support enforced fencing delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- controller: request fencing with any enforced priority fencing delay (ECO-1611, SLE-12239, SLE-12240) - controller: request fencing with any enforced priority fencing delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- libstonithd: introduce fence_with_delay() operation (ECO-1611, SLE-12239, SLE-12240) - libstonithd: introduce fence_with_delay() operation (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- scheduler: add regression test for priority-fencing-delay (ECO-1611, SLE-12239, SLE-12240) - scheduler: add regression test for priority-fencing-delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- scheduler: implement priority-fencing-delay (ECO-1611, SLE-12239, SLE-12240) - scheduler: implement priority-fencing-delay (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
- scheduler: add priority-fencing-delay cluster option (ECO-1611, SLE-12239, SLE-12240) - scheduler: add priority-fencing-delay cluster option (jsc#ECO-1611, jsc#SLE-12239, jsc#SLE-12240)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 09 10:16:15 UTC 2020 - Yan Gao <ygao@suse.com> Thu Apr 09 10:16:15 UTC 2020 - Yan Gao <ygao@suse.com>

80
pacemaker.spec
View File

@ -16,12 +16,8 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017 # User-configurable globals and defines to control package behavior
%if ! %{defined _fillupdir} # (these should not test {with X} values, which are declared later)
%define _fillupdir /var/adm/fillup-templates
%endif
# Globals and defines to control package behavior (configure these as desired)
## User and group to use for nonprivileged services ## User and group to use for nonprivileged services
%global uname hacluster %global uname hacluster
@ -30,27 +26,15 @@
## Where to install Pacemaker documentation ## Where to install Pacemaker documentation
%global pcmk_docdir %{_docdir}/%{name} %global pcmk_docdir %{_docdir}/%{name}
%define _rundir /run
## Path to Python interpreter (leave commented to auto-detect,
## or uncomment and edit to use a specific version)
%global python_path /usr/bin/python%{python3_version}
## Corosync version
%define cs_version 2
%define with_nagios 1
%define with_cibsecrets 1
%define enable_lib_cluster_pkg 0
%define enable_fatal_warnings 0
%define with_regression_tests 0
# Define conditionals so that "rpmbuild --with <feature>" and # Define conditionals so that "rpmbuild --with <feature>" and
# "rpmbuild --without <feature>" can enable and disable specific features # "rpmbuild --without <feature>" can enable and disable specific features
## Add option to enable support for stonith/external fencing agents ## Add option to enable support for stonith/external fencing agents
%bcond_without stonithd %bcond_without stonithd
## Add option to enable support for storing sensitive information outside CIB
%bcond_without cibsecrets
## Add option to create binaries suitable for use with profiling tools ## Add option to create binaries suitable for use with profiling tools
%bcond_with profiling %bcond_with profiling
@ -67,6 +51,14 @@
## Add option to disable links for legacy daemon names ## Add option to disable links for legacy daemon names
%bcond_without legacy_links %bcond_without legacy_links
# Define globals for convenient use later
%define _rundir /run
## Path to Python interpreter (leave commented to auto-detect,
## or uncomment and edit to use a specific version)
%global python_path /usr/bin/python%{python3_version}
# Keep sane profiling data if requested # Keep sane profiling data if requested
%if %{with profiling} %if %{with profiling}
@ -75,8 +67,18 @@
%endif %endif
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define with_nagios 1
%define enable_lib_cluster_pkg 0
%define enable_fatal_warnings 0
%define with_regression_tests 0
Name: pacemaker Name: pacemaker
Version: 2.0.3+20200511.2b248d828 Version: 2.0.4+20200616.2deceaa3a
Release: 0 Release: 0
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -114,10 +116,6 @@ BuildRequires: pkgconfig
# Required for agent_config.h which specifies the correct scratch directory # Required for agent_config.h which specifies the correct scratch directory
BuildRequires: resource-agents BuildRequires: resource-agents
BuildRequires: sed BuildRequires: sed
%if %{with_cibsecrets}
BuildRequires: openssh
BuildRequires: procps
%endif
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(corosync) >= 2.0.0 BuildRequires: pkgconfig(corosync) >= 2.0.0
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
@ -344,9 +342,6 @@ autoreconf -fvi
%if %{with_nagios} %if %{with_nagios}
--with-nagios=true \ --with-nagios=true \
%endif %endif
%if %{with_cibsecrets}
--with-cibsecrets=true \
%endif
%if !%{enable_fatal_warnings} %if !%{enable_fatal_warnings}
--enable-fatal-warnings=no \ --enable-fatal-warnings=no \
%endif %endif
@ -355,6 +350,7 @@ autoreconf -fvi
%{!?with_legacy_links: --disable-legacy-links} \ %{!?with_legacy_links: --disable-legacy-links} \
%{?with_profiling: --with-profiling} \ %{?with_profiling: --with-profiling} \
%{?with_coverage: --with-coverage} \ %{?with_coverage: --with-coverage} \
%{?with_cibsecrets: --with-cibsecrets} \
%{!?with_doc: --with-brand=} \ %{!?with_doc: --with-brand=} \
--with-initdir=%{_initddir} \ --with-initdir=%{_initddir} \
--with-runstatedir=%{_rundir} \ --with-runstatedir=%{_rundir} \
@ -401,7 +397,7 @@ ln -s service %{buildroot}%{_sbindir}/rccrm_mon
mv %{buildroot}%{_sbindir}/crm_report %{buildroot}%{_sbindir}/crm_report.pacemaker mv %{buildroot}%{_sbindir}/crm_report %{buildroot}%{_sbindir}/crm_report.pacemaker
install -m 755 %{SOURCE1} %{buildroot}%{_sbindir}/crm_report install -m 755 %{SOURCE1} %{buildroot}%{_sbindir}/crm_report
ln -s ../heartbeat/NodeUtilization %{buildroot}%{_libexecdir}/ocf/resource.d/pacemaker/ ln -s ../heartbeat/NodeUtilization %{buildroot}%{_prefix}/lib/ocf/resource.d/pacemaker/
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
@ -504,7 +500,6 @@ fi
%dir %{_libexecdir}/pacemaker %dir %{_libexecdir}/pacemaker
%{_libexecdir}/pacemaker/* %{_libexecdir}/pacemaker/*
%{_sbindir}/cibsecret
%{_sbindir}/fence_legacy %{_sbindir}/fence_legacy
%{_mandir}/man7/pacemaker-controld.7%{ext_man} %{_mandir}/man7/pacemaker-controld.7%{ext_man}
@ -513,7 +508,6 @@ fi
%{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man}
%{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man}
%{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man}
%{_mandir}/man8/cibsecret.8%{ext_man}
%{_mandir}/man8/fence_legacy.8%{ext_man} %{_mandir}/man8/fence_legacy.8%{ext_man}
%{_mandir}/man8/pacemakerd.8%{ext_man} %{_mandir}/man8/pacemakerd.8%{ext_man}
@ -524,9 +518,9 @@ fi
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
%{_libexecdir}/ocf/resource.d/pacemaker/controld %{_prefix}/lib/ocf/resource.d/pacemaker/controld
%{_libexecdir}/ocf/resource.d/pacemaker/o2cb %{_prefix}/lib/ocf/resource.d/pacemaker/o2cb
%{_libexecdir}/ocf/resource.d/pacemaker/remote %{_prefix}/lib/ocf/resource.d/pacemaker/remote
%files cli %files cli
%defattr(-,root,root) %defattr(-,root,root)
@ -536,6 +530,9 @@ fi
%{_sbindir}/rccrm_mon %{_sbindir}/rccrm_mon
%{_sbindir}/attrd_updater %{_sbindir}/attrd_updater
%{_sbindir}/cibadmin %{_sbindir}/cibadmin
%if %{with cibsecrets}
%{_sbindir}/cibsecret
%endif
%{_sbindir}/crm_attribute %{_sbindir}/crm_attribute
%{_sbindir}/crm_diff %{_sbindir}/crm_diff
%{_sbindir}/crm_error %{_sbindir}/crm_error
@ -561,13 +558,13 @@ fi
%{_datadir}/pkgconfig/pacemaker-schemas.pc %{_datadir}/pkgconfig/pacemaker-schemas.pc
%{_datadir}/snmp/mibs/PCMK-MIB.txt %{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude %{_libexecdir}/ocf/resource.d/pacemaker/controld %exclude %{_prefix}/lib/ocf/resource.d/pacemaker/controld
%exclude %{_libexecdir}/ocf/resource.d/pacemaker/o2cb %exclude %{_prefix}/lib/ocf/resource.d/pacemaker/o2cb
%exclude %{_libexecdir}/ocf/resource.d/pacemaker/remote %exclude %{_prefix}/lib/ocf/resource.d/pacemaker/remote
%dir %{_libexecdir}/ocf %dir %{_prefix}/lib/ocf
%dir %{_libexecdir}/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d
%{_libexecdir}/ocf/resource.d/pacemaker %{_prefix}/lib/ocf/resource.d/pacemaker
%config(noreplace) %{_fillupdir}/sysconfig.pacemaker %config(noreplace) %{_fillupdir}/sysconfig.pacemaker
%config(noreplace) %{_fillupdir}/sysconfig.crm_mon %config(noreplace) %{_fillupdir}/sysconfig.crm_mon
@ -579,7 +576,6 @@ fi
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.* %exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
%exclude %{_mandir}/man7/ocf_pacemaker_remote.* %exclude %{_mandir}/man7/ocf_pacemaker_remote.*
%{_mandir}/man8/* %{_mandir}/man8/*
%exclude %{_mandir}/man8/cibsecret.*
%exclude %{_mandir}/man8/fence_legacy.* %exclude %{_mandir}/man8/fence_legacy.*
%exclude %{_mandir}/man8/pacemakerd.* %exclude %{_mandir}/man8/pacemakerd.*
%exclude %{_mandir}/man8/pacemaker-remoted.* %exclude %{_mandir}/man8/pacemaker-remoted.*