Attachment 882468 Details for Bug 1065263 – Proposed fix

[patch] Proposed fix

bz1035023.patch (text/plain), 2.20 KB, created by Jan Pokorný [poki] on 2014-04-03 21:49:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Pokorný [poki]

Created: 2014-04-03 21:49:22 UTC

Size: 2.20 KB

patch

obsolete

>--- luci/site/luci/Extensions/LuciClusterInfo.py.orig	2014-04-03 23:25:05.223530929 +0200
>+++ luci/site/luci/Extensions/LuciClusterInfo.py	2014-04-03 23:30:07.690638750 +0200
>@@ -618,24 +618,27 @@
> 	clumap['has_qemu'] = False
> 	clumap['has_sybase_agent'] = False
> 	clumap['has_split_oracle_agents'] = False
>+	clumap['has_postgres_startup_wait'] = False
> 	try:
> 		cluster_os = model.getClusterOS()
> 		if cluster_os.find('Tikanga') != -1:
> 			clumap['os_major'] = os_major = 5
> 			clumap['os_minor'] = os_minor = _get_minor_for_major(cluster_os, os_major)
>-			if os_minor > 0:
>+			if os_minor >= 1:
> 				clumap['has_sybase_agent'] = True
>-			if os_minor > 1:
>+			if os_minor >= 2:
> 				clumap['vm_migration_choice'] = True
>-			if os_minor > 2:
>+			if os_minor >= 3:
> 				clumap['has_fence_ssh'] = True
> 				#clumap['has_ignore_undef_fence'] = True
>-			if os_minor > 3:
>+			if os_minor >= 4:
> 				clumap['sap_agent_v19'] = True
> 				clumap['has_qemu'] = True
>-			if os_minor > 5:
>+			if os_minor >= 6:
> 				clumap['has_split_oracle_agents'] = True
> 				clumap['has_restart_disable'] = True
>+			if os_minor >= 11:
>+				clumap['has_postgres_startup_wait'] = False
> 		elif cluster_os.find('Nahant') != -1:
> 			clumap['os_major'] = 4
> 			os_minor = int(cluster_os[cluster_os.find('Update ') + 7])
>--- luci/cluster/resource-form-macros.orig	2014-04-03 23:33:03.173282062 +0200
>+++ luci/cluster/resource-form-macros	2014-04-03 23:42:35.351376609 +0200
>@@ -1,5 +1,5 @@
> <tal:comment tal:replace="nothing">
>-** Copyright (C) 2006-2008 Red Hat, Inc.
>+** Copyright 2014 Red Hat, Inc.
> **
> ** This program is free software; you can redistribute
> ** it and/or modify it under the terms of version 2 of the
>@@ -1057,6 +1057,17 @@
> 			</td>
> 		</tr>
> 
>+		<tr tal:condition="python:clusterinfo and clusterinfo.get('has_postgres_startup_wait') == True"
>+		    class="systemsTable" >
>+			<td class="systemsTable">Startup Wait (seconds)</td>
>+			<td class="systemsTable">
>+				<input type="text" size="40" name="startup_wait"
>+					tal:attributes="
>+						disabled python: editDisabled;
>+						value res/attrs/startup_wait | string:10" />
>+			</td>
>+		</tr>
>+
> 		<tr class="systemsTable">
> 			<td class="systemsTable">Shutdown Wait (seconds)</td>
> 			<td class="systemsTable">

Actions: View | Diff

Attachments on bug 1065263: 882468