From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 13 Jun 2008 18:38:44 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/busy_wai ... Message-ID: <20080613183844.27930.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 Branch: RHEL5 Changes by: rmccabe at sourceware.org 2008-06-13 18:38:40 Modified files: . : conga.spec.in.in luci/cluster : busy_wait-macro form-macros index_html validate_create_gulm.js luci/plone-custom: conga.js update_hostinfo.js luci/site/luci/Extensions: FenceHandler.py HelperFunctions.py LuciClusterInfo.py luci/site/luci/Extensions/ClusterModel: TagObject.py luci/site/luci/var: Data.fs ricci/modules/rpm: PackageHandler.cpp ricci/modules/service: ServiceManager.cpp Log message: Fix 450854 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.88&r2=1.45.2.89 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/busy_wait-macro.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.2&r2=1.2.2.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.35&r2=1.90.2.36 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.15&r2=1.20.2.16 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_create_gulm.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.3&r2=1.1.4.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.5&r2=1.3.2.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/update_hostinfo.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.13&r2=1.4.2.14 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/HelperFunctions.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.6&r2=1.4.2.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.10&r2=1.1.4.11 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/TagObject.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.2&r2=1.1.4.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.33&r2=1.15.2.34 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.9&r2=1.9.2.10 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.7&r2=1.5.2.8 --- conga/conga.spec.in.in 2008/05/16 17:08:28 1.45.2.88 +++ conga/conga.spec.in.in 2008/06/13 18:37:46 1.45.2.89 @@ -76,7 +76,7 @@ Group: System Environment/Base Summary: Remote Management System - Management Station -Requires: chkconfig initscripts +Requires: chkconfig initscripts bc Requires: python >= 2.4.1 %if "%{include_zope_and_plone}" == "yes" Provides: config(luci) = %{version}-%{release} @@ -297,6 +297,7 @@ - Fix bz444210 (Adding multiple fence devices at the same time causes duplicate entries) - Fix bz444381 (conga writes 'exportpath' instead of 'export' attribute for netfs) - Fix bz446907 (rpm -V luci fails) +- Fix bz450854 (luci doesn't start because of a missing dep /usr/bin/dc) * Fri Apr 18 2008 Ryan McCabe 0.12.0-8 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used) --- conga/luci/cluster/busy_wait-macro 2008/01/25 17:18:37 1.2.2.2 +++ conga/luci/cluster/busy_wait-macro 2008/06/13 18:37:46 1.2.2.3 @@ -3,7 +3,7 @@

- +
+
+ Lock Manager +
    +
  • + DLM (preferred) +
    • +
  • + GULM +
    • +
    +
    + GULM lock server properties +

    You must enter exactly 1, 3, or 5 GULM lock servers.

    + + + + + + + + + + + + + + + + + + + + + +
    Lock Server 1 + +
    Lock Server 2 + +
    Lock Server 3 + +
    Lock Server 4 + +
    Lock Server 5 + +
    +
    +
    +
+
+

Cluster Form

@@ -171,10 +245,17 @@ tal:define=" global add_cluster request/SESSION/create_cluster | nothing"> + + - @@ -241,91 +322,11 @@ - - + @@ -471,6 +472,8 @@
+ @@ -1094,7 +1097,7 @@ -
- Lock Manager -
    -
  • - DLM (preferred) -
    • -
  • - GULM -
    • -
    -
    - GULM lock server properties -

    You must enter exactly 1, 3, or 5 GULM lock servers.

    - - - - - - - - - - - - - - - - - - - - - - -
    Lock Server 1 - -
    Lock Server 2 - -
    Lock Server 3 - -
    Lock Server 4 - -
    Lock Server 5 - -
    -
    -
    -
      +
+ + +
--- conga/luci/cluster/index_html 2008/02/08 21:56:33 1.20.2.15 +++ conga/luci/cluster/index_html 2008/06/13 18:37:46 1.20.2.16 @@ -27,20 +27,26 @@ + + + + 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/01/23 04:44:34 1.1.4.2 +++ conga/luci/site/luci/Extensions/ClusterModel/TagObject.py 2008/06/13 18:37:47 1.1.4.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 Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2008/04/23 17:27:10 1.15.2.33 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2008/06/13 18:37:47 1.15.2.34 differ rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed --- conga/ricci/modules/rpm/PackageHandler.cpp 2008/04/14 15:58:35 1.9.2.9 +++ conga/ricci/modules/rpm/PackageHandler.cpp 2008/06/13 18:38:40 1.9.2.10 @@ -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:58:35 1.5.2.7 +++ conga/ricci/modules/service/ServiceManager.cpp 2008/06/13 18:38:40 1.5.2.8 @@ -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 {