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

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

Browse Source 
- fencing: Correctly make args for fencing agents (bsc#925751)
- fence_legacy: Avoid passing 'port' to cluster-glue agents (bsc#925751)
- corosync: Bug cl#5232 - Somewhat gracefully handle nodes with invalid UUIDs
- HealthSMART: OCF_RESKEY_drives could contain multiple values
- pengine: restart master instances on instance attribute changes
- spec: move report.common and report.collector to cli package
- pengine: only kill process group on timeout when on-fail does not equal block.
- lrmd: Hint to child processes that using sd_notify is not required
- Agents: Fix the HealthSMART metadata
- make targetted reprobe for remote node work, crm_resource -C -N <remote node>
- crmd: include remote nodes when forcing cluster wide resource reprobe
- crm_mon: Support of the start from systemd of crm_mon
- Upstream version cs: 195559d47b0e9186b5d131981f6f7fee96ecad76

OBS-URL: https://build.opensuse.org/request/show/304812
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=204
This commit is contained in:
Yan Gao 2015-04-30 11:41:46 +00:00 committed by Git OBS Bridge
parent 73bb4532d0
commit 78f1c51d27
5 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">1.1.12</param>
-->
<param name="versionformat">1.1.12.git%cd.%h</param>
<param name="revision">7a2e3ae6b736621933b24f4cdc9ea260021d878d</param>
<param name="revision">195559d47b0e9186b5d131981f6f7fee96ecad76</param>
</service>
<service name="recompress" mode="disabled">

3
pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2
View File

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

3
pacemaker-1.1.12.git20150430.195559d.tar.bz2 Normal file
View File

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

17
pacemaker.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Apr 30 11:31:46 UTC 2015 - ygao@suse.com
- fencing: Correctly make args for fencing agents (bsc#925751)
- fence_legacy: Avoid passing 'port' to cluster-glue agents (bsc#925751)
- corosync: Bug cl#5232 - Somewhat gracefully handle nodes with invalid UUIDs
- HealthSMART: OCF_RESKEY_drives could contain multiple values
- pengine: restart master instances on instance attribute changes
- spec: move report.common and report.collector to cli package
- pengine: only kill process group on timeout when on-fail does not equal block.
- lrmd: Hint to child processes that using sd_notify is not required
- Agents: Fix the HealthSMART metadata
- make targetted reprobe for remote node work, crm_resource -C -N <remote node>
- crmd: include remote nodes when forcing cluster wide resource reprobe
- crm_mon: Support of the start from systemd of crm_mon
- Upstream version cs: 195559d47b0e9186b5d131981f6f7fee96ecad76
-------------------------------------------------------------------
Mon Apr 13 08:57:35 UTC 2015 - ygao@suse.com

36
pacemaker.spec
View File

@ -99,7 +99,7 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Version: 1.1.12.git20150413.7a2e3ae
Version: 1.1.12.git20150430.195559d
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@ -457,11 +457,14 @@ install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p ${RPM_BUILD_ROOT}%{_var}/lib/pacemaker/cores
#install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
install -m 644 mcp/pacemaker.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pacemaker
#install -m 644 tools/crm_mon.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/crm_mon
install -m 644 tools/crm_mon.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.crm_mon
%if %{with upstart_job}
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/init
install -m 644 mcp/pacemaker.upstart ${RPM_BUILD_ROOT}%{_sysconfdir}/init/pacemaker.conf
install -m 644 mcp/pacemaker.combined.upstart ${RPM_BUILD_ROOT}%{_sysconfdir}/init/pacemaker.combined.conf
install -m 644 tools/crm_mon.upstart ${RPM_BUILD_ROOT}%{_sysconfdir}/init/crm_mon.conf
%endif
# Scripts that should be executable
@ -487,6 +490,7 @@ rm -f %{buildroot}/%{_initrddir}/pacemaker_remote
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker_remote
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccrm_mon
%endif
# Only useful on rhel6
@ -544,6 +548,25 @@ fi
#%systemd_postun_with_restart pacemaker_remote.service
%service_del_postun pacemaker_remote.service
%post cli
#%systemd_post crm_mon.service
%service_add_post crm_mon.service
if [ ! -e %{_sysconfdir}/sysconfig/crm_mon ]; then
%fillup_only crm_mon
fi
%pre cli
%service_add_pre crm_mon.service
%preun cli
#%systemd_preun crm_mon.service
%service_del_preun crm_mon.service
%postun cli
#%systemd_postun_with_restart crm_mon.service
%service_del_postun crm_mon.service
%else
%post
@ -670,6 +693,16 @@ fi
%files cli
%defattr(-,root,root)
%if %{defined _unitdir}
%{_unitdir}/crm_mon.service
%{_sbindir}/rccrm_mon
%endif
%if %{with upstart_job}
%config(noreplace) %{_sysconfdir}/init/crm_mon.conf
%endif
%{_sbindir}/cibadmin
%{_sbindir}/crm_diff
%{_sbindir}/crm_error
@ -684,6 +717,7 @@ fi
%{_sbindir}/crm_simulate
%{_sbindir}/crm_report
%{_sbindir}/crm_ticket
%config(noreplace) /var/adm/fillup-templates/sysconfig.crm_mon
%doc %{_mandir}/man8/*
%exclude %{_mandir}/man8/attrd_updater.*
%exclude %{_mandir}/man8/crm_attribute.*