[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga luci/cluster/fence-macros luci/cluster/v ...



CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe sourceware org	2010-08-05 17:33:06

Modified files:
	luci/cluster   : fence-macros validate_fence.js 
	luci/init.d    : luci 
	luci/plone-custom: conga.js 
	luci/site/luci/Extensions: FenceHandler.py 
	luci/site/luci/Extensions/ClusterModel: FenceDeviceAttr.py 
	make           : version.in 

Log message:
	luci: Add missing commits

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.13&r2=1.2.2.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.12&r2=1.1.2.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11.2.6&r2=1.11.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.8&r2=1.3.2.9
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.18&r2=1.4.2.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.3&r2=1.5.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.52&r2=1.21.2.53

--- conga/luci/cluster/fence-macros	2010/01/07 18:08:34	1.2.2.13
+++ conga/luci/cluster/fence-macros	2010/08/05 17:33:04	1.2.2.14
@@ -190,10 +190,6 @@
 		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-drac" />
 	</tal:block>
 
-	<tal:block tal:condition="python: cur_fence_type == 'fence_idrac'">
-		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-idrac" />
-	</tal:block>
-
 	<tal:block tal:condition="python: cur_fence_type == 'fence_rsa'">
 		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsa" />
 	</tal:block>
@@ -358,7 +354,6 @@
 	<option name="fence_bullpap" value="fence_bullpap">Bull PAP</option>
 	<option name="fence_rps10" value="fence_rps10">RPS10 Serial Switch</option>
 	<option name="fence_drac" value="fence_drac">Dell DRAC</option>
-	<option name="fence_idrac" value="fence_idrac">Dell iDRAC</option>
 	<option name="fence_ipmilan" value="fence_ipmilan">IPMI Lan</option>
 	<option name="fence_xvm" value="fence_xvm">Virtual Machine Fencing</option>
 	<option name="fence_scsi" value="fence_scsi">SCSI Fencing</option>
@@ -730,79 +725,6 @@
 	</div>
 </div>
 
-<div metal:define-macro="fence-form-idrac"
-	tal:attributes="id cur_fencedev/name | nothing">
-
-	<div id="fence_idrac" class="fencedev">
-		<table>
-			<tr>
-				<td><strong class="cluster">Fence Type</strong></td>
-				<td>Dell iDrac</td>
-			</tr>
-			<tr>
-				<td>Name</td>
-				<td>
-					<input name="name" type="text"
-						tal:attributes="value cur_fencedev/name | nothing" />
-				</td>
-			</tr>
-			<tr>
-				<td>IP Address</td>
-				<td>
-					<input name="ipaddr" type="text"
-						tal:attributes="value cur_fencedev/ipaddr | nothing" />
-				</td>
-			</tr>
-			<tr>
-				<td>Login</td>
-				<td>
-					<input name="login" type="text"
-						tal:attributes="value cur_fencedev/login | nothing" />
-				</td>
-			</tr>
-			<tr>
-				<td>Password</td>
-				<td>
-					<input name="passwd" type="password" autocomplete="off"
-						tal:attributes="value cur_fencedev/passwd | nothing" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<span title="Full path to a script to generate fence password">Password Script (optional)</span>
-				</td>
-				<td>
-					<input type="text" name="passwd_script"
-						tal:attributes="
-							disabled cur_fencedev/isShared | nothing;
-							value cur_fencedev/passwd_script | nothing" />
-				</td>
-			</tr>
-			<tr tal:condition="exists:clusterinfo/has_fence_ssh">
-				<td>
-					<span title="Enable SSH operation">Use SSH</span>
-				</td>
-				<td>
-					<input tal:condition="exists:cur_fencedev"
-						type="checkbox" name="secure"
-						tal:attributes="
-							checked python:(cur_fencedev and cur_fencedev.has_key('secure') and (cur_fencedev['secure'] == '1' or cur_fencedev['secure'].lower() == 'true')) and 'checked' or ''" />
-					<input tal:condition="not:exists:cur_fencedev"
-						type="checkbox" name="secure" />
-				</td>
-			</tr>
-		</table>
-
-		<tal:block tal:condition="exists: cur_fencedev">
-			<input type="hidden" name="existing_device" value="1" />
-			<input type="hidden" name="orig_name"
-				tal:attributes="value cur_fencedev/name | nothing" />
-		</tal:block>
-
-		<input type="hidden" name="fence_type" value="fence_idrac" />
-	</div>
-</div>
-
 <div metal:define-macro="fence-form-rsa"
 	tal:attributes="id cur_fencedev/name | nothing">
 
@@ -1724,7 +1646,6 @@
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-wti" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ilo" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-drac" />
-	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-idrac" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsa" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-rsb" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-brocade" />
--- conga/luci/cluster/validate_fence.js	2010/01/07 18:08:34	1.1.2.12
+++ conga/luci/cluster/validate_fence.js	2010/08/05 17:33:05	1.1.2.13
@@ -29,7 +29,6 @@
 fence_validator['brocade'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['bullpap'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['drac'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'secure' ];
-fence_validator['idrac'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'secure' ];
 fence_validator['egenera'] = [ 'cserver' ];
 fence_validator['gnbd'] = [ 'servers' ];
 fence_validator['ilo'] = [ 'hostname', 'login', 'passwd', 'passwd_script', 'secure' ];
--- conga/luci/init.d/luci	2010/02/04 23:36:34	1.11.2.6
+++ conga/luci/init.d/luci	2010/08/05 17:33:05	1.11.2.7
@@ -30,6 +30,8 @@
 
 LUCI_USER='luci'
 LUCI_GROUP='luci'
+LUCI_ZOPE_TIMEOUT=30
+LUCI_STUNNEL_TIMEOUT=10
 
 LUCI_URL="https://`/bin/hostname`:$LUCI_HTTPS_PORT";
 
@@ -121,7 +123,7 @@
 stop()
 {
 	stop_stunnel
-	max_wait=5
+	max_wait=$LUCI_STUNNEL_TIMEOUT
 	cur_wait=0
 	while [ $cur_wait -lt $max_wait ]; do
 		sleep 1
@@ -133,12 +135,16 @@
 	done
 
 	if [ $? -ne 0 ]; then
-		errmsg='Failed to stop stunnel'
+		if [ $cur_wait -eq $max_wait ]; then
+			errmsg="stunnel did not stop after $max_wait seconds."
+		else
+			errmsg='Failed to stop stunnel'
+		fi
 		return 1
 	fi
 
 	stop_luci
-	max_wait=25
+	max_wait=$LUCI_ZOPE_TIMEOUT
 	cur_wait=0
 	while [ $cur_wait -lt $max_wait ]; do
 		sleep 1
@@ -174,7 +180,7 @@
 	sh $LUCID >&/dev/null &
 
 	cur_wait=0
-	max_wait=25
+	max_wait=$LUCI_ZOPE_TIMEOUT
 	luci_running
 	ret=$?
 	while [ $ret -ne 1 ] && [ $cur_wait -lt $max_wait ]; do
@@ -201,7 +207,7 @@
 		return 1
 	fi
 
-	max_wait=5
+	max_wait=$LUCI_STUNNEL_TIMEOUT
 	cur_wait=0
 	stunnel_running
 	ret=$?
@@ -213,7 +219,11 @@
 	done
 
 	if [ $ret -ne 2 ]; then
-		errmsg='An error occurred while starting stunnel'
+		if [ $cur_wait -eq $max_wait ]; then
+			errmsg="stunnel did not start after $max_wait seconds."
+		else
+			errmsg='An error occurred while starting stunnel'
+		fi
 		stop_luci >& /dev/null
 		stop_stunnel >& /dev/null 
 		return 1
@@ -331,7 +341,7 @@
 			exit 0
 		else
 			echo_failure
-			/usr/bin/logger -t "$ID" -- "Luci startup failed $errmsg"
+			/usr/bin/logger -t "$ID" -- "Luci startup failed: $errmsg"
 			echo
 			exit 1
 		fi
@@ -378,7 +388,7 @@
 				/usr/bin/logger -t "$ID" -- "Luci shutdown succeeded"
 				rtrn=0
 			else
-				/usr/bin/logger -t "$ID" -- "Luci shutdown failed"
+				/usr/bin/logger -t "$ID" -- "Luci shutdown failed: $errmsg"
 				rtrn=1
 			fi
 		elif [ $rtrn -eq 0 ]; then
--- conga/luci/plone-custom/conga.js	2010/01/07 18:08:35	1.3.2.8
+++ conga/luci/plone-custom/conga.js	2010/08/05 17:33:05	1.3.2.9
@@ -211,7 +211,7 @@
 		var o3 = parseInt(i[2], 10);
 		var o4 = parseInt(i[3], 10);
 
-		if (isNaN(o1) || isNaN(o2) || isNaN(o3) ||
+		if (isNaN(o1) || isNaN(o2) || isNaN(o3) || isNaN(o4) ||
 			((o1 & 0xff) !== o1) ||
 			((o2 & 0xff) !== o2) ||
 			((o3 & 0xff) !== o3) ||
@@ -231,10 +231,6 @@
 		return ('You must enter an IP address in quad-dot notation.');
 	}
 
-	if (!str.match(/^[0-9A-Za-z][0-9A-Za-z.\-]*$/)) {
-		return ('Hostnames can contain only alphanumeric characters and hyphens.');
-	}
-
 	return (null);
 }
 
--- conga/luci/site/luci/Extensions/FenceHandler.py	2010/01/07 18:08:35	1.4.2.18
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2010/08/05 17:33:05	1.4.2.19
@@ -821,68 +821,6 @@
 
 	return errors
 
-def val_idrac_fd(form, fencedev):
-	errors = list()
-
-	try:
-		ip = form['ipaddr'].strip()
-		if not ip:
-			raise Exception, 'blank'
-		fencedev.addAttribute('ipaddr', ip)
-	except Exception, e:
-		errors.append(FD_PROVIDE_IP)
-
-	try:
-		log = form['login'].strip()
-		if not log:
-			raise Exception, 'blank'
-		fencedev.addAttribute('login', log)
-	except Exception, e:
-		errors.append(FD_PROVIDE_LOGIN)
-
-	has_passwd = False
-	try:
-		pwd = form['passwd'].strip()
-		if not pwd:
-			# Allow passwords that consist of only spaces.
-			if not form.has_key('passwd') or form['passwd'] == '':
-				raise Exception, 'blank'
-			else:
-				pwd = form['passwd']
-		fencedev.addAttribute('passwd', pwd)
-		has_passwd = True
-	except Exception, e:
-		try:
-			fencedev.removeAttribute('passwd')
-		except:
-			pass
-
-	try:
-		pwd_script = form['passwd_script'].strip()
-		if not pwd_script:
-			raise Exception, 'blank'
-		fencedev.addAttribute('passwd_script', pwd_script)
-		has_passwd = True
-	except Exception, e:
-		try:
-			fencedev.removeAttribute('passwd_script')
-		except:
-			pass
-
-	if not has_passwd:
-		errors.append(FD_PROVIDE_PASSWD)
-
-	use_ssh = form.has_key('secure') and (form['secure'] == '1' or form['secure'].lower() == 'true')
-	if use_ssh:
-		fencedev.addAttribute('secure', '1')
-	else:
-		try:
-			fencedev.removeAttribute('secure')
-		except:
-			pass
-
-	return errors
-
 def val_rps10_fd(form, fencedev):
 	errors = list()
 
@@ -1051,7 +989,6 @@
 	'fence_ipmilan':		val_ipmilan_fd,
 	'fence_drac':			val_drac_fd,
 	'fence_drac5':			val_drac_fd,
-	'fence_idrac':			val_idrac_fd,
 	'fence_rsa':			val_rsa_fd,
 	'fence_rsb':			val_rsa_fd, # same params as rsa
 	'fence_rps10':			val_rps10_fd,
@@ -1376,7 +1313,6 @@
 	'fence_ipmilan':		val_noop_fi,
 	'fence_drac':			val_noop_fi,
 	'fence_drac5':			val_noop_fi,
-	'fence_idrac':			val_noop_fi,
 	'fence_rsa':			val_noop_fi,
 	'fence_rsb':			val_noop_fi,
 	'fence_rps10':			val_noop_fi
--- conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2010/01/07 18:08:35	1.5.2.3
+++ conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2010/08/05 17:33:05	1.5.2.4
@@ -27,7 +27,6 @@
 	'fence_ilo':			'HP iLO Device',
 	'fence_ipmilan':		'IPMI Lan',
 	'fence_drac':			'Dell DRAC',
-	'fence_idrac':			'Dell iDRAC',
 	'fence_rsa':			'IBM RSA II Device',
 	'fence_rps10':			'RPS10 Serial Switch',
 	'fence_lpar':			'LPAR Fencing',
@@ -53,7 +52,6 @@
 	'fence_ilo':			False,
 	'fence_ipmilan':		False,
 	'fence_drac':			False,
-	'fence_idrac':			False,
 	'fence_rsa':			False,
 	'fence_rps10':			False,
 	'fence_manual':			False
@@ -97,7 +95,6 @@
 	'fence_ilo':			( ),
 	'fence_ipmilan':		( ),
 	'fence_drac':			( ),
-	'fence_idrac':			( ),
 	'fence_rsa':			( ),
 	'fence_rps10':			( ),
 	'fence_manual':			( )
@@ -138,8 +135,6 @@
 		( 'name', 'ipaddr', 'login', 'passwd', 'lanplus', 'auth' ),
 	'fence_drac':
 		( 'name', 'ipaddr', 'login', 'passwd' ),
-	'fence_idrac':
-		( 'name', 'ipaddr', 'login', 'passwd' ),
 	'fence_rsa':
 		( 'name', 'hostname', 'login', 'passwd' ),
 	'fence_rps10':
--- conga/make/version.in	2009/05/14 21:05:58	1.21.2.52
+++ conga/make/version.in	2010/08/05 17:33:05	1.21.2.53
@@ -1,2 +1,2 @@
 VERSION=0.12.2
-RELEASE=6
+RELEASE=13test


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]