diff --git a/_service b/_service index 9400b92..aae6e18 100644 --- a/_service +++ b/_service @@ -8,10 +8,10 @@ To update to a new release, change "revision" to the desired git commit hash and bump "version" if necessary - 1.1.14 + 1.1.15 --> - 1.1.14+git%cd.%h - dd46368eead0d756735216a4bc765466b99274fc + 1.1.15+git%cd.%h + 630d0d112092042b6f79c2a02bb442e82fee93ec diff --git a/pacemaker-1.1.14+git20160612.dd46368.tar.bz2 b/pacemaker-1.1.14+git20160612.dd46368.tar.bz2 deleted file mode 100644 index c8c883a..0000000 --- a/pacemaker-1.1.14+git20160612.dd46368.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8abb5c69dc833c7fb28e093ed7706eabd2f6355a8d36e718ab3e645c044772f -size 3821850 diff --git a/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 b/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 new file mode 100644 index 0000000..41d70dd --- /dev/null +++ b/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9587853126135f54777779084e9ea2946536d02a6e06b93695ee215d4c535179 +size 3844245 diff --git a/pacemaker.changes b/pacemaker.changes index 7e836b1..6bc55f4 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Fri Jul 1 23:10:54 UTC 2016 - ygao@suse.com + +- ping: Log sensible error when /tmp is full (bsc#987348) +- crm_mon: Do not log errors for the known CIB changes that should be ignored (bsc#986931) +- logging: Enable synchronous logging when blackboxes are enabled +- libpengine: print target role and blocked status in XML output +- tools: add maintenance mode and disabled/blocked resources to crm_mon XML/HTML output +- tools: break up long lines in crm_mon console output +- libservices: include socket units when listing all systemd agents +- fencing: fence_legacy - Search capable devices by querying them through "list" action for cluster-glue stonith agents (bsc#986265) +- extra: correct quoting of timestamp-format in alert-snmp-example +- pengine,tools: Display pending resource state by default when it's available (bsc#986201) +- rng: Allow rsc-pattern in locations for version 2.6 +- pengine: Expand regexp references in location constraints +- pengine: Allow to set base score for progressive node health strategy +- systemd: Allow unit names ending in .socket. +- watchdog: Correction to do to change action of the system reboot by fail_fast +- Upstream version cs: 630d0d112092042b6f79c2a02bb442e82fee93ec + +------------------------------------------------------------------- +Thu Jun 30 13:16:25 UTC 2016 - tchvatal@suse.com + +- Remove conditionals that are not really needed as they always kept + the values +- Remove the cman conditional as we do not even have the dependencies + to build with it in OBS +- Convert deps to pkgconfig style ones and remove deps that are + not mentioned by the testsuite or the configure.ac + +------------------------------------------------------------------- +Wed Jun 22 12:25:47 UTC 2016 - ygao@suse.com + +- Update to version 1.1.15 +- crmd: mention that graceful remote shutdowns may cause connection failures (bsc#981489) +- alerts - drop 5min timeout to 30s since it is configurable now +- Bug bz#5292 - crmd: wait for alerts to finish +- libais,libcluster,libcrmcommon,liblrmd: don't use %z specifier +- alerts: ensure sample alert agents handle undefined recipient +- tools: crm_resource -T option should not be hidden anymore +- PE: Correctly update the dependant actions of un-runnable clones +- alerts: make timestamp-format-string work properly if strftime-escape is the last character +- extra: make alert-file-example cope with spaces in timeformat-string +- attrd,ipc: Prevent possible segfault on exit (bsc#986056) +- alerts: fix SMTP recipient defaulting +- tools: properly handle crm_resource --restart with a resource in a group +- tools: don't assume all resources restart on same node with crm_resource --restart +- tools: avoid memory leaks in crm_resource --restart +- tools: remember any existing target-role when doing crm_resource --restart +- tools: correctly count starting resources when doing crm_resource --restart +- Upstream version cs: e174ec84857e087210b9dacee3318f8203176129 (Pacemaker-1.1.15) + ------------------------------------------------------------------- Tue Jun 14 11:35:04 UTC 2016 - tchvatal@suse.com @@ -78,8 +130,8 @@ Sun May 29 14:44:18 UTC 2016 - ygao@suse.com - crmd: Acknowledge cancellation operations for remote connection resources (bsc#976865) - controld: improve DLM check with stateful_merge_wait (bsc#977201) - attrd, libcrmcommon: validate attrd requests better -- crmd: clear remote node transient attributes on disconnect -- Revert "Fix: attrd: Correctly implement mass removal of a node's attributes" +- crmd: clear remote node transient attributes on disconnect (bsc#981489) +- Revert "Fix: attrd: Correctly implement mass removal of a node's attributes" (bsc#981489) - crm_mon: Fix time formatting on x32 - resources: use OCF version tagging correctly - libcommon: crm_procfs_pid_of() would always return last /proc entry checked @@ -200,8 +252,8 @@ Thu Feb 11 13:28:13 UTC 2016 - ygao@suse.com - crmd: Prevent potential use-after-free (bsc#964183) - liblrmd: Prevent potential use-after-free issues (bsc#964183) - PE: Fix conditions for internal sanity check (bsc#971129) -- attrd: ensure remote nodes are in correct peer cache -- crmd: set remote flag when gracefully shutting down remote nodes +- attrd: ensure remote nodes are in correct peer cache (bsc#981489) +- crmd: set remote flag when gracefully shutting down remote nodes (bsc#981489) - fencing: Correctly track active stonith actions (bsc#938545) - fencing: Functionize adding and removing active pids of device (bsc#938545) - crm_shadow: Do not invoke shells with --noprofile option other than bash (bsc#961392) @@ -213,13 +265,13 @@ Thu Feb 11 13:28:13 UTC 2016 - ygao@suse.com - spec: C++ compiler is not something currently needed - RHBZ#1286316: Do an ordered shutdown of systemd resources - header == NULL when parsing compressed message -- attrd: Correctly implement mass removal of a node's attributes +- attrd: Correctly implement mass removal of a node's attributes (bsc#981489) - attrd: Hook up the client name so we can track requests -- crmd: Set the shutdown transient attribute in response to LRMD_IPC_OP_SHUTDOWN_REQ from remote nodes -- PE: Honor the shutdown transient attributes for remote nodes -- pacemaker_remote: support graceful stops -- crmd: support graceful pacemaker_remote stops -- lrmd,liblrmd: add lrmd IPC operations for requesting and acknowledging shutdown +- crmd: Set the shutdown transient attribute in response to LRMD_IPC_OP_SHUTDOWN_REQ from remote nodes (bsc#981489) +- PE: Honor the shutdown transient attributes for remote nodes (bsc#981489) +- pacemaker_remote: support graceful stops (bsc#981489) +- crmd: support graceful pacemaker_remote stops (bsc#981489) +- lrmd,liblrmd: add lrmd IPC operations for requesting and acknowledging shutdown (bsc#981489) - fencing: Support concurrent fencing actions on each device (bsc#938545) - pengine: Support concurrent fencing (bsc#938545) - Upstream version cs: c54f10440a7bba5a1491ea8506925c7d6d9ca2a3 @@ -338,7 +390,7 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com - crmd: properly detect CIB update failures for remote nodes - cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180) - Fencing: The device list is expected to be comma separated -- Tools: Do not send command lines to syslog +- Tools: Do not send command lines to syslog (bsc#986676) - Tools: Repair the logging of 'interesting' command-lines - PE: resolve memory leak - libfencing: make topology level removal compatible with latest stonithd API diff --git a/pacemaker.spec b/pacemaker.spec index 2576bdb..a759640 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -19,17 +19,14 @@ %global gname haclient %global uname hacluster %global pcmk_docdir %{_docdir}/%{name} -%define with_corosync_support 1 +%global cs_version 2 %define with_nagios 1 +%define with_snmp 1 %define with_esmtp 1 -%define with_acl 1 %define with_cibsecrets 1 %define enable_lib_cluster_pkg 0 -%define enable_fatal_warnings 1 +%define enable_fatal_warnings 0 %define with_regression_tests 0 -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif # Conditionals # Invoke "rpmbuild --without " or "rpmbuild --with " # to disable or enable specific features @@ -37,17 +34,13 @@ %bcond_without stonithd # We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere %bcond_with doc -# Use a different versioning scheme -%bcond_with pre_release -# Turn off cman support -%bcond_with cman Name: pacemaker -# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary -Version: 1.1.14+git20160612.dd46368 +Version: 1.1.15+git20160701.630d0d1 Release: 0 Summary: Scalable High-Availability cluster resource manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA +# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary Url: http://www.clusterlabs.org # eg. https://github.com/ClusterLabs/pacemaker/archive/8ae45302394b039fb098e150f156df29fc0cb576/pacemaker-8ae4530.tar.gz Source0: %{name}-%{version}.tar.bz2 @@ -65,35 +58,32 @@ Patch9: bug-977201_pacemaker-controld-self-fencing.patch # Required for core functionality (python-devel depends on python) BuildRequires: autoconf BuildRequires: automake -# Enables optional functionality BuildRequires: bison -BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: flex BuildRequires: help2man -BuildRequires: libbz2-devel -BuildRequires: libgnutls-devel -# We need reasonably recent versions of libqb -BuildRequires: libqb-devel > 0.11.0 -BuildRequires: libselinux-devel BuildRequires: libtool -BuildRequires: libtool-ltdl-devel -BuildRequires: libuuid-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel BuildRequires: ncurses-devel -BuildRequires: net-snmp-devel -BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: python -BuildRequires: python-devel # Required for agent_config.h which specifies the correct scratch directory BuildRequires: resource-agents +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(corosync) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libexslt) +# We need reasonably recent versions of libqb +BuildRequires: pkgconfig(libqb) > 0.11.0 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(uuid) Requires: %{name}-cli = %{version}-%{release} +Requires: corosync Requires: libpacemaker3 = %{version}-%{release} Requires: libqb > 0.11.0 Requires: psmisc @@ -112,24 +102,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{enable_lib_cluster_pkg} Requires: libpacemaker3-cluster = %{version}-%{release} %endif -%if %{with cman} -BuildRequires: clusterlib-devel -# pacemaker initscript: cman initscript, fence_tool (+ some soft-dependencies) -# "post" scriptlet: ccs_update_schema -Requires: cman -%endif -%if %{with_corosync_support} -BuildRequires: libcorosync-devel -Requires: corosync +# Enables optional functionality +%if 0%{?suse_version} > 1100 +BuildRequires: docbook-xsl-stylesheets +%else +BuildRequires: docbook-style-xsl %endif %if %{with stonithd} +%if 0%{?suse_version} BuildRequires: libglue-devel +%else +BuildRequires: cluster-glue-libs-devel +%endif %endif %if %{with doc} BuildRequires: asciidoc BuildRequires: inkscape BuildRequires: publican %endif +%if %{with_snmp} +BuildRequires: net-snmp-devel +%endif %if %{with_esmtp} BuildRequires: libesmtp-devel %endif @@ -137,7 +130,6 @@ BuildRequires: libesmtp-devel BuildRequires: procps BuildRequires: python-curses BuildRequires: python-xml -BuildRequires: vim-base %endif %description @@ -154,7 +146,7 @@ resource health. %package cli Summary: Command line tools for controlling Pacemaker clusters Group: Productivity/Clustering/HA -Requires: libpacemaker3 = %{version} +Requires: libpacemaker3 = %{version}-%{release} Requires: logrotate Requires: perl-TimeDate @@ -181,7 +173,7 @@ nodes and those just running the CLI tools. %package -n libpacemaker3-cluster Summary: Cluster Libraries used by Pacemaker Group: Productivity/Clustering/HA -Requires: libpacemaker3 = %{version} +Requires: libpacemaker3 = %{version}-%{release} %description -n libpacemaker3-cluster Pacemaker is an advanced, scalable High-Availability cluster resource @@ -194,8 +186,8 @@ libraries needed for nodes that will form part of the cluster nodes. %package remote Summary: Pacemaker remote daemon for non-cluster nodes Group: Productivity/Clustering/HA -Requires: %{name}-cli = %{version} -Requires: libpacemaker3 = %{version} +Requires: %{name}-cli = %{version}-%{release} +Requires: libpacemaker3 = %{version}-%{release} Requires: resource-agents %{?systemd_requires} @@ -211,17 +203,18 @@ nodes not running the full corosync/cluster stack. Summary: Pacemaker development package Group: Development/Libraries/C and C++ Requires: %{name}-cts = %{version}-%{release} -Requires: glib2-devel -Requires: libbz2-devel -Requires: libcorosync-devel -Requires: libpacemaker3 = %{version} -Requires: libqb-devel +Requires: libpacemaker3 = %{version}-%{release} Requires: libtool-ltdl-devel -Requires: libuuid-devel -Requires: libxml2-devel -Requires: libxslt-devel +Requires: pkgconfig +Requires: pkgconfig(bzip2) +Requires: pkgconfig(corosync) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(libqb) +Requires: pkgconfig(libxml-2.0) +Requires: pkgconfig(libxslt) +Requires: pkgconfig(uuid) %if %{enable_lib_cluster_pkg} -Requires: libpacemaker3-cluster = %{version} +Requires: libpacemaker3-cluster = %{version}-%{release} %endif %if %{with_regression_tests} # For the regression tests, we can run them only if all pacemaker @@ -238,13 +231,13 @@ The libpacemaker-devel package contains headers and shared libraries for developing tools for Pacemaker. %package cts -Summary: Test framework for cluster-related technologies like Pacemaker +Summary: Test framework for cluster-related technologies Group: Productivity/Clustering/HA -Requires: libpacemaker3 = %{version} +Requires: libpacemaker3 = %{version}-%{release} Requires: python %description cts -Testing framework for cluster-related technologies like Pacemaker +Test framework for cluster-related technologies like Pacemaker %if %{with doc} %package doc @@ -274,37 +267,38 @@ manager for Corosync, CMAN and/or Linux-HA. autoreconf -fvi %configure \ - --disable-static \ - --disable-silent-rules\ - --without-profiling \ - --without-coverage \ - %{!?with_cman: --without-cman} \ - --without-heartbeat \ + --docdir=%{_docdir}/%{name} \ + --disable-static \ + --disable-silent-rules \ + --without-profiling \ + --without-coverage \ + --without-cman \ + --without-heartbeat \ + --with-acl=true \ %if %{with_nagios} --with-nagios=true \ %endif +%if %{with_snmp} --with-snmp=true \ +%endif %if %{with_esmtp} --with-esmtp=true \ %endif -%if %{with_acl} - --with-acl=true \ -%endif %if %{with_cibsecrets} --with-cibsecrets=true \ %endif %if !%{enable_fatal_warnings} --enable-fatal-warnings=no \ %endif - %{!?with doc: --with-brand=} \ + %{!?with_doc: --with-brand=} \ --with-initdir=%{_initddir} \ --localstatedir=%{_var} \ - --with-version=%{version} + --with-version=%{version}-%{release} make %{?_smp_mflags} all %install -make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} install +%make_install install -d -m755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker @@ -325,9 +319,7 @@ rm -f %{buildroot}/%{_initddir}/pacemaker rm -f %{buildroot}/%{_initddir}/pacemaker_remote # Don't ship fence_pcmk where it has no use -%if %{without cman} rm -f %{buildroot}/%{_sbindir}/fence_pcmk -%endif ln -s service %{buildroot}%{_sbindir}/rcpacemaker ln -s service %{buildroot}%{_sbindir}/rcpacemaker_remote @@ -412,8 +404,6 @@ fi %files %defattr(-,root,root) -########################################################### -%defattr(-,root,root) %{_sbindir}/pacemakerd %{_unitdir}/pacemaker.service @@ -426,23 +416,15 @@ fi %{_sbindir}/crm_node %{_sbindir}/fence_legacy -%if %{with cman} -%{_sbindir}/fence_pcmk -%endif %{_sbindir}/stonith_admin %{_mandir}/man7/crmd.7%{ext_man} %{_mandir}/man7/pengine.7%{ext_man} %{_mandir}/man7/stonithd.7%{ext_man} -%if %{without cman} %{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man} -%endif %{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man} %{_mandir}/man8/crm_node.8%{ext_man} -%if %{with cman} -%{_mandir}/man8/fence_pcmk.8%{ext_man} -%endif %{_mandir}/man8/fence_legacy.8%{ext_man} %{_mandir}/man8/pacemakerd.8%{ext_man} %{_mandir}/man8/stonith_admin.8%{ext_man} @@ -453,13 +435,17 @@ fi %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine -%if %{without cman} %{_libexecdir}/ocf/resource.d/pacemaker/controld -%endif %{_libexecdir}/ocf/resource.d/pacemaker/o2cb %{_libexecdir}/ocf/resource.d/pacemaker/remote %{_libexecdir}/ocf/resource.d/.isolation +%if "%{?cs_version}" != "UNKNOWN" +%if 0%{?cs_version} < 2 +%{_libexecdir}/lcrso/pacemaker.lcrso +%endif +%endif + %files cli %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker