From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 5 Feb 2007 19:56:19 -0000 Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ... Message-ID: <20070205195619.20948.qmail@sourceware.org> List-Id: 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:56:18 Modified files: luci/site/luci/Extensions: cluster_adapters.py Log message: Get rid of fenced property info in one more place for GULM clusters. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.228&r2=1.229 --- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/05 19:52:44 1.228 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/05 19:56:18 1.229 @@ -3512,23 +3512,24 @@ #------------- #new cluster params - if rhel5 #------------- - #Fence Daemon Props - fencedaemon_url = prop_baseurl + PROPERTIES_TAB + "=" + PROP_FENCE_TAB - clumap['fencedaemon_url'] = fencedaemon_url - fdp = model.getFenceDaemonPtr() - pjd = fdp.getAttribute('post_join_delay') - if pjd is None: - pjd = "6" - pfd = fdp.getAttribute('post_fail_delay') - if pfd is None: - pfd = "0" - #post join delay - clumap['pjd'] = pjd - #post fail delay - clumap['pfd'] = pfd gulm_ptr = model.getGULMPtr() if not gulm_ptr: + #Fence Daemon Props + fencedaemon_url = prop_baseurl + PROPERTIES_TAB + "=" + PROP_FENCE_TAB + clumap['fencedaemon_url'] = fencedaemon_url + fdp = model.getFenceDaemonPtr() + pjd = fdp.getAttribute('post_join_delay') + if pjd is None: + pjd = "6" + pfd = fdp.getAttribute('post_fail_delay') + if pfd is None: + pfd = "0" + #post join delay + clumap['pjd'] = pjd + #post fail delay + clumap['pfd'] = pfd + #------------- #if multicast multicast_url = prop_baseurl + PROPERTIES_TAB + "=" + PROP_MCAST_TAB