From 6f2583e888a729070a77b36ebb7516c65fed5836 Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Date: Mon, 26 Aug 2013 19:46:55 +0000
Subject: [PATCH] Accepting request 196481 from
 home:goldwynr:branches:network:ha-clustering:Factory

cluster_stack setup in o2cb

OBS-URL: https://build.opensuse.org/request/show/196481
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=65
---
 o2cb.ocf            | 14 ++++++++++++++
 ocfs2-tools.changes |  4 ++--
 ocfs2-tools.spec    |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/o2cb.ocf b/o2cb.ocf
index 06e0f7b..33cf172 100644
--- a/o2cb.ocf
+++ b/o2cb.ocf
@@ -35,6 +35,11 @@
 : ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
 
 o2cb_start() {
+	/sbin/modprobe ocfs2_stackglue
+	/sbin/modprobe ocfs2_stack_user
+	/sbin/modprobe ocfs2
+	echo "pcmk" > /sys/fs/ocfs2/cluster_stack
+
     ocf_log info "o2cb is now obsolete. Please remove the o2cb resource agent in your next maintenance window!"
     return $OCF_SUCCESS
 }
@@ -49,6 +54,10 @@ o2cb_usage() {
     return $OCF_SUCCESS
 }
 
+o2cb_monitor() {
+	return $OCF_SUCCESS
+}
+
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
@@ -62,6 +71,9 @@ This is a o2cb Resource Agent. This is now obsolete!
   <parameters>
   </parameters>
   <actions>
+    <action name="start"         timeout="90" />
+    <action name="stop"          timeout="100" />
+    <action name="monitor"       timeout="20" depth="0"/>
   </actions>
 </resource-agent>
 END
@@ -75,6 +87,8 @@ start)		o2cb_start
 		;;
 stop)		o2cb_stop
 		;;
+monitor)        o2cb_monitor
+                ;;
 usage|help)	o2cb_usage
 		exit $OCF_SUCCESS
 		;;
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 17f0cbc..92f60e0 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
 Fri Aug 23 12:44:09 CDT 2013 - rgoldwyn@suse.com
 
-- Make mount.ocfs2 load modules and write cluster_stack:
-  + 0007-mount.ocfs2-performs-module-loading-cluster_stack-se.patch
+- FIXME: Added temporary hack in o2cb until we find a solution to
+  remove o2cb activities of setting cluster stack.
 
 -------------------------------------------------------------------
 Thu Aug 22 13:18:01 CDT 2013 - rgoldwyn@suse.com
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 6ba7df2..ae5c803 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -166,7 +166,7 @@ managing the file system.
 %patch225 -p1
 %patch226 -p1
 %patch227 -p1
-%patch228 -p1
+#%patch228 -p1
 
 %build
 export PROJECT="ocfs2-tools"