From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 27 Apr 2009 21:03:33 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ ... Message-ID: <20090427210333.22393.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 2009-04-27 21:03:32 Modified files: . : conga.spec.in.in luci/cluster : cluster_svc-macros resource_form_handlers.js luci/site/luci/Extensions: LuciClusterInfo.py LuciValidation.py make : version.in Log message: - Fix bz491903 ([RFE] add option 'nfslock' to conga) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.113&r2=1.45.2.114 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.9&r2=1.3.2.10 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.16&r2=1.20.2.17 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.17&r2=1.1.4.18 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.10&r2=1.6.2.11 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.50&r2=1.21.2.51 --- conga/conga.spec.in.in 2009/03/24 20:06:39 1.45.2.113 +++ conga/conga.spec.in.in 2009/04/27 21:03:31 1.45.2.114 @@ -323,6 +323,10 @@ ### changelog ### %changelog +* Thu Apr 23 2009 Ryan McCabe 0.12.2-5 +- Fix bz492392 (Conga Interface for Fence Agents Requires Password even when Password Script is Specified) +- Fix bz491903 ([RFE] add option 'nfslock' to conga) + * Tue Mar 24 2009 Ryan McCabe 0.12.2-4 - Rework fix for bz483775 (Failover Domains can't be set for VMs as services of cluster suite using Conga) --- conga/luci/cluster/cluster_svc-macros 2009/03/24 20:06:41 1.3.2.9 +++ conga/luci/cluster/cluster_svc-macros 2009/04/27 21:03:32 1.3.2.10 @@ -383,6 +383,7 @@ + @@ -531,6 +532,14 @@ + Enable NFS lock workarounds + + + + + + Run exclusive + --- conga/luci/cluster/resource_form_handlers.js 2008/08/07 18:07:37 1.20.2.16 +++ conga/luci/cluster/resource_form_handlers.js 2009/04/27 21:03:32 1.20.2.17 @@ -477,6 +477,7 @@ var svc_name = null; var autostart = 1; var domain = null; + var nfslock = 0; var exclusive = 0; var recovery = null; var max_restarts = null; @@ -505,6 +506,11 @@ else exclusive = 1; + if (!form[i].nfslock.checked) + nfslock = 0; + else + nfslock = 1; + if (form[i].recovery) { recovery = form[i].recovery.options[form[i].recovery.options.selectedIndex].value; if (str_is_blank(recovery)) @@ -600,6 +606,7 @@ if (restart_expire_time) master_form.restart_expire_time.value = restart_expire_time; master_form.autostart.value = autostart; + master_form.nfslock.value = nfslock; master_form.exclusive.value = exclusive; var confirm_msg = null; --- conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/03/24 20:06:41 1.1.4.17 +++ conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/04/27 21:03:32 1.1.4.18 @@ -360,6 +360,14 @@ except: hmap['exclusive'] = 'false' + try: + if int(svc.getAttribute('nfslock')): + hmap['nfslock'] = 'true' + else: + hmap['nfslock'] = 'false' + except: + hmap['nfslock'] = 'false' + def getServiceInfo(self, status, model, req): root_uuid = 'toplevel' --- conga/luci/site/luci/Extensions/LuciValidation.py 2009/02/16 17:23:28 1.6.2.10 +++ conga/luci/site/luci/Extensions/LuciValidation.py 2009/04/27 21:03:32 1.6.2.11 @@ -398,6 +398,18 @@ luci_log.debug_verbose('vSA5: no service name') errors.append('No service name was given') + nfslock = '0' + try: + if not request.form.has_key('nfslock') or request.form['nfslock'] != '1': + nfslock = None + else: + nfslock = '1' + except Exception, e: + nfslock = None + if LUCI_DEBUG_MODE is True: + luci_log.debug_verbose('vSA5a: error getting nfslock: %r %s' \ + % (e, str(e))) + autostart = '1' try: if not request.form.has_key('autostart') or request.form['autostart'] == '0': @@ -468,6 +480,8 @@ new_service.addAttribute('restart_expire_time', str(restart_expire_time)) new_service.addAttribute('exclusive', str(exclusive)) + if nfslock is not None: + new_service.addAttribute('nfslock', '1') if autostart is not None: new_service.attr_hash['autostart'] = autostart @@ -1114,6 +1128,12 @@ else: autostart = 0 + nfslock = None + if request.form.has_key('nfslock'): + nfslock = 1 + else: + nfslock = None + exclusive = 0 if request.form.has_key('exclusive'): exclusive = 1 @@ -1186,6 +1206,14 @@ xvm.addAttribute('name', vm_name) xvm.addAttribute('path', vm_path) + if nfslock is not None: + xvm.addAttribute('nfslock', '1') + else: + try: + xvm.removeAttribute('nfslock') + except: + pass + xvm.addAttribute('autostart', str(autostart)) xvm.addAttribute('exclusive', str(exclusive)) if migration_type: --- conga/make/version.in 2009/03/24 20:06:41 1.21.2.50 +++ conga/make/version.in 2009/04/27 21:03:32 1.21.2.51 @@ -1,2 +1,2 @@ VERSION=0.12.2 -RELEASE=4 +RELEASE=5