From 1e5709750c72641e82ec1a59465da070ea75f25eb55505cef0953ae8c9cf953c Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 23 Feb 2018 05:13:07 +0000 Subject: [PATCH] Accepting request 579246 from home:yan_gao:branches:network:ha-clustering:Factory:Test - Build: Ship cibsecret by pacemaker instead of cluster-glue (bsc#1082456) * Drop obsolete pacemaker-cibsecret-tool-temp-disabled.patch - Update to version 1.1.18+20180216.ae50b7f5d: - various: improve string allocation - XML: upgrade-2.10.xsl: re(drop) rsc_colocation/@score-attribute{,-mangle} - XML: upgrade-*.xsl: bump the validate-with field from within stylesheet - XML: upgrade-*.xsl: omit XML declaration - upgrade-*.xsl: don't be picky about comments, PIs, etc. - Update to version 1.1.18+20180213.965befd59: - libcrmcommon: use /tmp when creating temporary XML file - tools: crm_master should always work on node attribute - tools: crm_resource --cleanup couldn't match clone instances - tools: crm_resource --refresh should ignore --operation and --interval - crmd: quorum gain should always cause new transition - rhbz#1527072 - Correctly observe colocation constraints with bundles in the Master role - Bug rhbz#1519812 - Prevent notify actions from causing --wait to hang - libpe_status: recover after failed demote when appropriate - lrmd: always use most recent remote proxy - libpe_status: limit resource type check to primitives - PE: correct mispelled constant - PE: Ensure stop operations occur after stopped remote connections have been brought up - PE: Remote connection resources are safe to to require only quorum - PE: Only allowed nodes need to be considered when ordering resource startup after _all_ recovery - PE: Ordering bundle child stops/demotes after container fencing causes graph loops - PE: Passing boolean instead of a pointer OBS-URL: https://build.opensuse.org/request/show/579246 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=299 --- _servicedata | 2 +- pacemaker-1.1.18+20180209.7acb22379.tar.xz | 3 -- pacemaker-1.1.18+20180216.ae50b7f5d.tar.xz | 3 ++ pacemaker-cibsecret-tool-temp-disabled.patch | 13 ------- pacemaker.changes | 37 ++++++++++++++++++++ pacemaker.spec | 27 ++++++++------ 6 files changed, 57 insertions(+), 28 deletions(-) delete mode 100644 pacemaker-1.1.18+20180209.7acb22379.tar.xz create mode 100644 pacemaker-1.1.18+20180216.ae50b7f5d.tar.xz delete mode 100644 pacemaker-cibsecret-tool-temp-disabled.patch diff --git a/_servicedata b/_servicedata index acb3fb3..b468a3a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/ClusterLabs/pacemaker.git - 7c466c913e7a386dd1c0ba563967ee58056b5817 + ae50b7f5dc35c19f7cbddd165291b3aaac30da8c \ No newline at end of file diff --git a/pacemaker-1.1.18+20180209.7acb22379.tar.xz b/pacemaker-1.1.18+20180209.7acb22379.tar.xz deleted file mode 100644 index e01f977..0000000 --- a/pacemaker-1.1.18+20180209.7acb22379.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f8a0d701992a590245ecc734f1f5417c274fddaaeb989401ee040c07a4b683b -size 3215796 diff --git a/pacemaker-1.1.18+20180216.ae50b7f5d.tar.xz b/pacemaker-1.1.18+20180216.ae50b7f5d.tar.xz new file mode 100644 index 0000000..981fcac --- /dev/null +++ b/pacemaker-1.1.18+20180216.ae50b7f5d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aa12e462b2406cb1e8124ea613c4815e8cde306585649b168d97064e7ebbe27 +size 3234552 diff --git a/pacemaker-cibsecret-tool-temp-disabled.patch b/pacemaker-cibsecret-tool-temp-disabled.patch deleted file mode 100644 index 04d34c5..0000000 --- a/pacemaker-cibsecret-tool-temp-disabled.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/Makefile.am b/tools/Makefile.am -index e8d0587..89b0b07 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -33,7 +33,7 @@ pcmk_DATA = report.common report.collector - - sbin_SCRIPTS = crm_report crm_standby crm_master crm_failcount - if BUILD_CIBSECRETS --sbin_SCRIPTS += cibsecret -+#sbin_SCRIPTS += cibsecret - endif - EXTRA_DIST = $(sbin_SCRIPTS) - diff --git a/pacemaker.changes b/pacemaker.changes index 188c406..b2583a1 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Fri Feb 23 04:28:37 UTC 2018 - ygao@suse.com + +- Build: Ship cibsecret by pacemaker instead of cluster-glue (bsc#1082456) + * Drop obsolete pacemaker-cibsecret-tool-temp-disabled.patch + +------------------------------------------------------------------- +Tue Feb 20 00:09:50 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180216.ae50b7f5d: +- various: improve string allocation +- XML: upgrade-2.10.xsl: re(drop) rsc_colocation/@score-attribute{,-mangle} +- XML: upgrade-*.xsl: bump the validate-with field from within stylesheet +- XML: upgrade-*.xsl: omit XML declaration +- upgrade-*.xsl: don't be picky about comments, PIs, etc. + +------------------------------------------------------------------- +Wed Feb 14 04:30:48 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180213.965befd59: +- libcrmcommon: use /tmp when creating temporary XML file +- tools: crm_master should always work on node attribute +- tools: crm_resource --cleanup couldn't match clone instances +- tools: crm_resource --refresh should ignore --operation and --interval +- crmd: quorum gain should always cause new transition +- rhbz#1527072 - Correctly observe colocation constraints with bundles in the Master role +- Bug rhbz#1519812 - Prevent notify actions from causing --wait to hang +- libpe_status: recover after failed demote when appropriate +- lrmd: always use most recent remote proxy +- libpe_status: limit resource type check to primitives +- PE: correct mispelled constant +- PE: Ensure stop operations occur after stopped remote connections have been brought up +- PE: Remote connection resources are safe to to require only quorum +- PE: Only allowed nodes need to be considered when ordering resource startup after _all_ recovery +- PE: Ordering bundle child stops/demotes after container fencing causes graph loops +- PE: Passing boolean instead of a pointer + ------------------------------------------------------------------- Sat Feb 10 06:43:16 UTC 2018 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 919cf2f..7e851d6 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -71,7 +71,7 @@ %endif Name: pacemaker -Version: 1.1.18+20180209.7acb22379 +Version: 1.1.18+20180216.ae50b7f5d Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -85,15 +85,14 @@ Source1: crm_report.in Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch Patch2: bug-728579_pacemaker-stonith-dev-id.patch -Patch3: pacemaker-cibsecret-tool-temp-disabled.patch -Patch4: pacemaker-nagios-plugin-dir.patch -Patch5: bug-812269_pacemaker-fencing-device-register-messages.patch -Patch6: pacemaker-Wno-format-signedness.patch -Patch7: bug-943295_pacemaker-lrmd-log-notice.patch -Patch8: bug-977201_pacemaker-controld-self-fencing.patch -Patch9: bug-995365_pacemaker-cts-restart-systemd-journald.patch -Patch10: fate-323526_pacemaker-tests-shebang-python3.patch -Patch11: pacemaker-cts-StartCmd.patch +Patch3: pacemaker-nagios-plugin-dir.patch +Patch4: bug-812269_pacemaker-fencing-device-register-messages.patch +Patch5: pacemaker-Wno-format-signedness.patch +Patch6: bug-943295_pacemaker-lrmd-log-notice.patch +Patch7: bug-977201_pacemaker-controld-self-fencing.patch +Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch +Patch9: fate-323526_pacemaker-tests-shebang-python3.patch +Patch10: pacemaker-cts-StartCmd.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -111,6 +110,10 @@ BuildRequires: pkgconfig # Required for agent_config.h which specifies the correct scratch directory BuildRequires: resource-agents BuildRequires: sed +%if %{with_cibsecrets} +BuildRequires: openssh +BuildRequires: procps +%endif BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(corosync) BuildRequires: pkgconfig(dbus-1) @@ -302,7 +305,6 @@ manager. %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 %build @@ -480,6 +482,7 @@ fi %dir %{_libexecdir}/pacemaker %{_libexecdir}/pacemaker/* +%{_sbindir}/cibsecret %{_sbindir}/crm_node %{_sbindir}/fence_legacy %{_sbindir}/stonith_admin @@ -490,6 +493,7 @@ fi %{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man} +%{_mandir}/man8/cibsecret.8%{ext_man} %{_mandir}/man8/crm_node.8%{ext_man} %{_mandir}/man8/fence_legacy.8%{ext_man} %{_mandir}/man8/pacemakerd.8%{ext_man} @@ -559,6 +563,7 @@ fi %exclude %{_mandir}/man7/ocf_pacemaker_o2cb.* %exclude %{_mandir}/man7/ocf_pacemaker_remote.* %{_mandir}/man8/* +%exclude %{_mandir}/man8/cibsecret.* %exclude %{_mandir}/man8/crm_node.* %exclude %{_mandir}/man8/fence_legacy.* %exclude %{_mandir}/man8/pacemakerd.*