From 3b63fd228aa73745f1907a7412ec90504c4ce0f315ec8e3661428da687d2b7fc Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Tue, 4 Apr 2017 09:36:48 +0000 Subject: [PATCH] Accepting request 485071 from home:KGronlund:branches:network:ha-clustering:Factory - Disable quorum in default configuration (bsc#1032142) - Add 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch OBS-URL: https://build.opensuse.org/request/show/485071 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=35 --- ...in-default-configuration-bsc-1032142.patch | 26 +++++++++++++++++++ drbd-utils.changes | 6 +++++ drbd-utils.spec | 5 +++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch diff --git a/0001-Disable-quorum-in-default-configuration-bsc-1032142.patch b/0001-Disable-quorum-in-default-configuration-bsc-1032142.patch new file mode 100644 index 0000000..e4eb3da --- /dev/null +++ b/0001-Disable-quorum-in-default-configuration-bsc-1032142.patch @@ -0,0 +1,26 @@ +From f4a2325172bb011db033ee1d8d1fc747c22f254f Mon Sep 17 00:00:00 2001 +From: Kristoffer Gronlund +Date: Tue, 4 Apr 2017 11:22:23 +0200 +Subject: [PATCH] Disable quorum in default configuration (bsc#1032142) + +--- + scripts/global_common.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/scripts/global_common.conf b/scripts/global_common.conf +index dd36e92..545b600 100644 +--- a/scripts/global_common.conf ++++ b/scripts/global_common.conf +@@ -32,7 +32,8 @@ common { + + options { + # cpu-mask on-no-data-accessible +- quorum majority; ++ # quorum majority; ++ quorum off; + } + + disk { +-- +2.12.0 + diff --git a/drbd-utils.changes b/drbd-utils.changes index ceb8904..4faf320 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 4 09:25:09 UTC 2017 - kgronlund@suse.com + +- Disable quorum in default configuration (bsc#1032142) +- Add 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch + ------------------------------------------------------------------- Fri Mar 24 07:06:02 UTC 2017 - nwang@suse.com diff --git a/drbd-utils.spec b/drbd-utils.spec index 8445902..de8dee9 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -1,7 +1,7 @@ # # spec file for package drbd-utils # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Patch1: init-script-fixes.diff Patch2: fix-libdir-in-Makefile.patch Patch3: fence-after-pacemaker-down.patch Patch4: fix-segfault-up-stacked-resource.patch +# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142) +Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -73,6 +75,7 @@ raid 1. It is a building block for setting up clusters. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build ./autogen.sh