CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2008-06-06 16:41:54
Modified files:
. : .cvsignore clustermon.spec.in.in
ricci.spec.in.in
luci/site/luci/Extensions: FenceHandler.py HelperFunctions.py
luci/site/luci/Extensions/ClusterModel: TagObject.py
ricci/modules/rpm: PackageHandler.cpp
ricci/modules/service: ServiceManager.cpp
Log message:
- No longer need -lgroup with the new cman packages.
- Recognize F9 by name (Sulphur).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/.cvsignore.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.31&r2=1.32
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/HelperFunctions.py.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/TagObject.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.19&r2=1.20
--- conga/.cvsignore 2007/02/07 22:06:40 1.5
+++ conga/.cvsignore 2008/06/06 16:41:51 1.6
@@ -4,6 +4,7 @@
conga.spec
clustermon.spec.in
clustermon.spec
+ricci.spec
clustermon-*.rpm
clustermon-*.tar.gz
conga-*.rpm
--- conga/clustermon.spec.in.in 2008/06/02 15:14:03 1.44
+++ conga/clustermon.spec.in.in 2008/06/06 16:41:52 1.45
@@ -182,5 +182,8 @@
%changelog
+* Fri Jun 06 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-4
+ - Recognize F9 by name (Sulphur).
+
* Tue May 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-3
- Initial build.
--- conga/ricci.spec.in.in 2008/06/02 15:14:03 1.10
+++ conga/ricci.spec.in.in 2008/06/06 16:41:52 1.11
@@ -128,6 +128,7 @@
%changelog
* Mon Jun 02 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-4
- No longer need -lgroup with the new cman packages.
+ - Recognize F9 by name (Sulphur).
* Wed May 20 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.13.0-3
- Initial build
--- conga/luci/site/luci/Extensions/FenceHandler.py 2008/04/23 17:33:37
1.31
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2008/06/06 16:41:52
1.32
@@ -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/01/22 15:05:17
1.14
+++ conga/luci/site/luci/Extensions/HelperFunctions.py 2008/06/06 16:41:52
1.15
@@ -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/ClusterModel/TagObject.py 2008/01/02
20:56:08 1.3
+++ conga/luci/site/luci/Extensions/ClusterModel/TagObject.py 2008/06/06
16:41:52 1.4
@@ -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/05/12 15:16:04 1.23
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/06/06 16:41:53 1.24
@@ -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/05/12 15:16:05
1.19
+++ conga/ricci/modules/service/ServiceManager.cpp 2008/06/06 16:41:54
1.20
@@ -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 {
