From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 5 Feb 2007 19:52:46 -0000
Subject: [Cluster-devel] conga luci/cluster/form-macros luci/site/luci/ ...
Message-ID: <20070205195246.20129.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-02-05 19:52:44

Modified files:
	luci/cluster   : form-macros 
	luci/site/luci/Extensions: ModelBuilder.py cluster_adapters.py 
	ricci/docs     : service_api.html 
	ricci/modules/cluster: ClusterStatus.cpp 
	ricci/modules/rpm: PackageHandler.cpp 
	ricci/modules/service: ServiceManager.cpp 

Log message:
	Don't install, use, or allow fenced to be configured for GULM clusters.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.176&r2=1.177
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ModelBuilder.py.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.227&r2=1.228
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/docs/service_api.html.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/luci/cluster/form-macros	2007/02/02 04:34:35	1.176
+++ conga/luci/cluster/form-macros	2007/02/05 19:52:44	1.177
@@ -549,7 +549,8 @@
 				class python: 'configTab' + (configTabNum == 1 and ' configTabActive' or '');
 			">General</a>
 		</li>
-		<li class="configTab">
+		<li class="configTab"
+			tal:condition="not:clusterinfo/gulm">
 			<a tal:attributes="
 				href clusterinfo/fencedaemon_url | nothing;
 				class python: 'configTab' + (configTabNum == 2 and ' configTabActive' or '');
--- conga/luci/site/luci/Extensions/ModelBuilder.py	2007/02/01 20:49:08	1.19
+++ conga/luci/site/luci/Extensions/ModelBuilder.py	2007/02/05 19:52:44	1.20
@@ -277,15 +277,13 @@
 
     obj_tree.addAttribute("name","alpha_cluster")
     obj_tree.addAttribute("config_version","1")
-    fdp = FenceDaemon()
-    obj_tree.addChild(fdp)
-    self.fence_daemon_ptr = fdp
     cns = ClusterNodes()
     obj_tree.addChild(cns)
     self.clusternodes_ptr = cns
 
     gulm = Gulm()
     self.GULM_ptr = gulm
+    self.fence_daemon_ptr = None
     obj_tree.addChild(gulm)
 
     fds = FenceDevices()
@@ -701,7 +699,7 @@
       self.resourcemanager_ptr.addChild(rcs)
       self.resources_ptr = rcs
         
-    if self.fence_daemon_ptr == None:
+    if self.GULM_ptr is None and self.fence_daemon_ptr is None:
       fdp = FenceDaemon()
       self.cluster_ptr.addChild(fdp)
       self.fence_daemon_ptr = fdp
@@ -932,7 +930,7 @@
     
 
   def check_fence_daemon(self):
-    if self.fence_daemon_ptr == None:
+    if self.GULM_ptr is None and self.fence_daemon_ptr is None:
       self.fence_daemon_ptr = FenceDaemon()
       self.cluster_ptr.addChild(self.fence_daemon_ptr)
 
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/02 04:34:35	1.227
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/05 19:52:44	1.228
@@ -1151,6 +1151,9 @@
 def validateFenceConfig(model, form):
 	errors = list()
 
+	if model.getGULMPtr() is not None:
+		return (False, {'errors': [ 'GULM clusters do not support fenced.' ]})
+
 	try:
 		post_fail_delay = int(form['post_fail_delay'])
 		if post_fail_delay < 0:
@@ -4293,9 +4296,9 @@
       dlist.append("ccsd")
       if model.getGULMPtr() is None:
         dlist.append("cman")
+        dlist.append("fenced")
       else:
         dlist.append("lock_gulmd")
-      dlist.append("fenced")
       dlist.append("rgmanager")
       states = getDaemonStates(rc, dlist)
       infohash['d_states'] = states
--- conga/ricci/docs/service_api.html	2006/04/12 15:47:09	1.1
+++ conga/ricci/docs/service_api.html	2007/02/05 19:52:44	1.2
@@ -33,7 +33,7 @@
 Base??? - base infrastructure of Redhat Cluster Suite (currently
 ccsd, cman, fenced) <BR>- ???Cluster Base - Gulm??? - base
 infrastructure of Redhat Cluster Suite using Gulm lock manager
-(currently ccsd, lock_gulmd, fenced) <BR>- ???Cluster Service
+(currently ccsd, lock_gulmd) <BR>- ???Cluster Service
 Manager??? - (currently rgmanager) <BR>- ???Clustered Storage??? -
 shared storage (currently clvmd, gfs)<BR>- ???Linux Virtual Server???
 - (currently pulse, piranha-gui)</P>
@@ -135,4 +135,4 @@
 <P ALIGN=LEFT><BR><BR>
 </P>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
--- conga/ricci/modules/cluster/ClusterStatus.cpp	2006/10/24 14:56:56	1.16
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2007/02/05 19:52:44	1.17
@@ -157,10 +157,11 @@
 {
   XMLObject cluster_conf(ClusterConf::get()); // bailout if cluster.conf not present
   XMLObject stat = status();
+  bool cman_cluster = ClusterConf::is_cman(cluster_conf)
   
   if (stat.get_attr("cluster_version") == "4") {
     run_initd("ccsd", true, false);
-    if (ClusterConf::is_cman(cluster_conf))
+    if (cman_cluster)
       try {
 	run_initd("cman", true, true);
       } catch ( ... ) {
@@ -197,7 +198,8 @@
     
     if (use_qdisk)
       run_initd("qdiskd", true, false);
-    run_initd("fenced", true, false);
+    if (cman_cluster)
+      run_initd("fenced", true, false);
     run_initd("clvmd", true, false);
     run_initd("gfs", true, false);
     run_initd("rgmanager", true, true);
@@ -205,18 +207,19 @@
     // enable them on boot
     
     run_chkconfig("ccsd", true);
-    if (ClusterConf::is_cman(cluster_conf)) {
+    if (cman_cluster) {
       run_chkconfig("cman", true);
       run_chkconfig("lock_gulmd", false);
+      run_chkconfig("fenced", true);
     } else {
       run_chkconfig("cman", false);
+      run_chkconfig("fenced", false);
       run_chkconfig("lock_gulmd", true);
     }
     if (use_qdisk)
       run_chkconfig("qdiskd", true);
     else
       run_chkconfig("qdiskd", false);
-    run_chkconfig("fenced", true);
     run_chkconfig("clvmd", true);
     run_chkconfig("gfs", true);
     run_chkconfig("rgmanager", true);
--- conga/ricci/modules/rpm/PackageHandler.cpp	2006/12/13 19:33:14	1.11
+++ conga/ricci/modules/rpm/PackageHandler.cpp	2007/02/05 19:52:44	1.12
@@ -442,7 +442,6 @@
   if (RHEL4 || FC5) {
     set.packages.push_back("ccs");
     set.packages.push_back("gulm");
-    set.packages.push_back("fence");
   } else
     throw String("GULM not available in CS5");
   
--- conga/ricci/modules/service/ServiceManager.cpp	2006/10/25 18:47:16	1.7
+++ conga/ricci/modules/service/ServiceManager.cpp	2007/02/05 19:52:44	1.8
@@ -444,7 +444,6 @@
     s = ServiceSet(name, descr);
     servs.push_back("ccsd");
     servs.push_back("lock_gulmd");
-    servs.push_back("fenced");
     if (populate_set(s, servs))
       sets[name] = s;
   }