From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/busy_wai ...
Date: 10 Jun 2008 14:48:39 -0000 [thread overview]
Message-ID: <20080610144839.22060.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2008-06-10 14:48:33
Modified files:
. : conga.spec.in.in
luci/cluster : busy_wait-macro index_html
luci/plone-custom: conga.js
luci/site/luci/Extensions: FenceHandler.py HelperFunctions.py
LuciClusterInfo.py
luci/site/luci/Extensions/ClusterModel: TagObject.py
ricci/modules/rpm: PackageHandler.cpp
ricci/modules/service: ServiceManager.cpp
Log message:
Bump support for ssh fence agents out to clusters running RHEL 4.8 or later (since the agents are not going to be in 4.7 now).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.30&r2=1.67.2.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/busy_wait-macro.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3.2.1&r2=1.3.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.30.2.4&r2=1.30.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.2&r2=1.4.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.17.2.9&r2=1.17.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/HelperFunctions.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.6.2.2&r2=1.6.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10.2.5&r2=1.10.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/TagObject.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.2&r2=1.2.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11.2.5&r2=1.11.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.5&r2=1.7.2.6
--- conga/conga.spec.in.in 2008/05/16 17:10:08 1.67.2.30
+++ conga/conga.spec.in.in 2008/06/10 14:48:26 1.67.2.31
@@ -301,6 +301,9 @@
%changelog
+* Tue Jun 10 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-6
+- Fix bz442729 (Add UI support for ssh for fence agents that now support it)
+
* Mon May 12 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-5
- Fix bz446082 (Adding multiple fence devices at the same time causes duplicate entries)
--- conga/luci/cluster/busy_wait-macro 2008/03/25 01:27:10 1.3.2.1
+++ conga/luci/cluster/busy_wait-macro 2008/06/10 14:48:29 1.3.2.2
@@ -3,7 +3,7 @@
<p><img src="100wait.gif" /></p>
- <span tal:define="global nodereports isBusy/nodereports" />
+ <span tal:define="global nodereports isBusy/nodereports | nothing" />
<div tal:repeat="nodereport nodereports">
<tal:block
--- conga/luci/cluster/index_html 2008/03/25 01:27:10 1.30.2.4
+++ conga/luci/cluster/index_html 2008/06/10 14:48:29 1.30.2.5
@@ -27,20 +27,26 @@
<tal:block tal:define="
global sinfo nothing;
global hascluster request/clustername | nothing;
- global isBusy python: False;
+ global isBusy python:False;
+ global isVirtualized python:False;
global firsttime nothing;
global ri_agent nothing;
+ global os_version nothing;
global busywaiting python:None" />
<tal:block tal:condition="hascluster">
<tal:block tal:define="
global ri_agent python:here.getRicciAgentForCluster(request);
- resmap python:here.getClusterOS(ri_agent);
- global isVirtualized resmap/isVirtualized | nothing;
- global os_version resmap/os | nothing;
- global isBusy python:here.isClusterBusy(request);
global firsttime request/busyfirst | nothing" />
+ <tal:block tal:condition="ri_agent"
+ tal:define="resmap python:here.getClusterOS(ri_agent)">
+ <tal:block tal:define="
+ global isVirtualized resmap/isVirtualized | nothing;
+ global os_version resmap/os | nothing;
+ global isBusy python:here.isClusterBusy(request)" />
+ </tal:block>
+
<tal:block tal:condition="firsttime">
<tal:block tal:define="global busywaiting python:True" />
<meta http-equiv="refresh"
--- conga/luci/plone-custom/conga.js 2008/03/25 01:27:11 1.4.2.2
+++ conga/luci/plone-custom/conga.js 2008/06/10 14:48:30 1.4.2.3
@@ -45,7 +45,7 @@
}
function display_msgs(id, msg_list) {
- if (!msg_list || msg_list.length < 1) {
+ if (id === null || !msg_list || msg_list.length < 1) {
return (-1);
}
--- conga/luci/site/luci/Extensions/FenceHandler.py 2008/04/21 18:15:18 1.17.2.9
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2008/06/10 14:48:30 1.17.2.10
@@ -657,8 +657,10 @@
use_ssh = form.has_key('secure') and (form['secure'] == '1' or form['secure'].lower() == 'true')
if use_ssh:
fencedev.addAttribute('secure', '1')
+ fencedev.addAttribute('agent', 'fence_drac5')
else:
fencedev.removeAttribute('secure')
+ fencedev.addAttribute('agent', 'fence_drac')
return errors
@@ -833,6 +835,7 @@
'fence_ilo': val_ilo_fd,
'fence_ipmilan': val_ipmilan_fd,
'fence_drac': val_drac_fd,
+ 'fence_drac5': val_drac_fd,
'fence_rsa': val_rsa_fd,
'fence_rsb': val_rsa_fd, # same params as rsa
'fence_rps10': val_rps10_fd,
@@ -1112,6 +1115,7 @@
'fence_ilo': val_noop_fi,
'fence_ipmilan': val_noop_fi,
'fence_drac': val_noop_fi,
+ 'fence_drac5': val_noop_fi,
'fence_rsa': val_noop_fi,
'fence_rsb': val_noop_fi,
'fence_rps10': val_noop_fi
--- conga/luci/site/luci/Extensions/HelperFunctions.py 2008/03/25 01:27:12 1.6.2.2
+++ conga/luci/site/luci/Extensions/HelperFunctions.py 2008/06/10 14:48:31 1.6.2.3
@@ -9,7 +9,7 @@
import threading
def resolveOSType(os_str):
- if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('FC6') != (-1) or os_str.find('Zod') != (-1) or os_str.find('Moonshine') != (-1) or os_str.find('Werewolf') != (-1):
+ if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('Zod') != (-1) or os_str.find('Moonshine') != (-1) or os_str.find('Werewolf') != (-1) or os.str_find('Sulphur') != (-1):
return 'rhel5'
else:
return 'rhel4'
--- conga/luci/site/luci/Extensions/LuciClusterInfo.py 2008/04/21 18:15:18 1.10.2.5
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py 2008/06/10 14:48:31 1.10.2.6
@@ -588,7 +588,7 @@
clumap['os_major'] = 4
os_minor = int(cluster_os[cluster_os.find('Update ') + 7])
clumap['os_minor'] = os_minor
- if os_minor > 6:
+ if os_minor > 7:
clumap['has_fence_ssh'] = True
except Exception, e:
if LUCI_DEBUG_MODE is True:
--- conga/luci/site/luci/Extensions/ClusterModel/TagObject.py 2008/03/25 01:27:13 1.2.2.2
+++ conga/luci/site/luci/Extensions/ClusterModel/TagObject.py 2008/06/10 14:48:32 1.2.2.3
@@ -53,10 +53,7 @@
return self.attr_hash
def getAttribute(self, kee):
- try:
- return self.attr_hash[kee]
- except KeyError, e:
- return None
+ return self.attr_hash.get(kee)
def getChildren(self):
return self.children
--- conga/ricci/modules/rpm/PackageHandler.cpp 2008/04/14 15:55:08 1.11.2.5
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/06/10 14:48:32 1.11.2.6
@@ -684,6 +684,8 @@
FC6 = true;
else if (release.find("Werewolf") != release.npos)
FC6 = true;
+ else if (release.find("Sulphur") != release.npos)
+ FC6 = true;
else if (release.find("Tikanga") != release.npos)
RHEL5 = true;
else
--- conga/ricci/modules/service/ServiceManager.cpp 2008/04/14 15:55:08 1.7.2.5
+++ conga/ricci/modules/service/ServiceManager.cpp 2008/06/10 14:48:33 1.7.2.6
@@ -835,6 +835,8 @@
FC6 = true;
else if (release.find("Werewolf") != release.npos)
FC6 = true;
+ else if (release.find("Sulphur") != release.npos)
+ FC6 = true;
else if (release.find("Tikanga") != release.npos)
RHEL5 = true;
else {
next reply other threads:[~2008-06-10 14:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 14:48 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-06-13 18:38 [Cluster-devel] conga ./conga.spec.in.in luci/cluster/busy_wai rmccabe
2008-01-25 17:19 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080610144839.22060.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.