[conga-luci-1stgen] RHEL5-active: luci: Don't chkconfig system services on when starting cluster nodes (38fec59)

[Ryan McCabe]

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git

On branch  : RHEL5-active

> ---------------------------------------------------------------
commit 38fec59c2e055ff104687ef6f0d62e14705423f4
Author: Ryan McCabe <rmccabe(a)redhat.com&gt;
Date:   Tue May 28 14:55:10 2013 -0400

    luci: Don't chkconfig system services on when starting cluster nodes
    
    Luci previously enabled cluster services on boot, even if they had been
    disabled explicitly. This patch causes luci to leave chkconfig settings
    as they are when a user starts a cluster node from luci.
    
    Resolves: rhbz#887170
    
    Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com&gt;


> ---------------------------------------------------------------
 luci/site/luci/Extensions/LuciClusterActions.py |    6 +++---
 luci/site/luci/Extensions/RicciQueries.py       |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/luci/site/luci/Extensions/LuciClusterActions.py
b/luci/site/luci/Extensions/LuciClusterActions.py
index 87b7dcf..6acc148 100644
--- a/luci/site/luci/Extensions/LuciClusterActions.py
+++ b/luci/site/luci/Extensions/LuciClusterActions.py
@@ -202,9 +202,9 @@ def NodeJoinCluster(self,
 					rc,
 					clustername,
 					nodename_resolved,
-					enable_services=True):
+					enable_services=False):
 
-	batch_number, result = rq.nodeJoinCluster(rc, enable_services=enable_services)
+	batch_number, result = rq.nodeJoinCluster(rc, enable_services)
 	if batch_number is None or result is None:
 		if LUCI_DEBUG_MODE is True:
 			luci_log.debug_verbose('NJ0: batch_number and/or result is None')
@@ -458,7 +458,7 @@ def ClusterStart(self, model):
 			errors += 1
 			continue
 
-		if NodeJoinCluster(self, rc, clustername, nodename_resolved, enable_services=True) is
None:
+		if NodeJoinCluster(self, rc, clustername, nodename_resolved) is None:
 			if LUCI_DEBUG_MODE is True:
 				luci_log.debug_verbose('CStart1: nodeJoin %s' \
 					% nodename_resolved)
diff --git a/luci/site/luci/Extensions/RicciQueries.py
b/luci/site/luci/Extensions/RicciQueries.py
index 1d9bd94..58333fc 100644
--- a/luci/site/luci/Extensions/RicciQueries.py
+++ b/luci/site/luci/Extensions/RicciQueries.py
@@ -457,13 +457,14 @@ def nodeFence(rc, nodename):
 	ricci_xml = rc.batch_run(batch_str)
 	return batchAttemptResult(ricci_xml)
 
-def nodeJoinCluster(rc, cluster_startup=False, enable_services=True):
+def nodeJoinCluster(rc, cluster_startup=False, enable_services=False):
 	cstartup = 'false'
 	if cluster_startup is True:
 		cstartup = 'true'
 
-	enable_services = 'true'
-	if enable_services is False:
+	if enable_services:
+		enable_services = 'true'
+	else:
 		enable_services = 'false'
 
 	batch_str = '<module name="cluster"><request
API_version="1.0"><function_call name="start_node"><var
mutable="false" name="cluster_startup" type="boolean"
value="%s"/><var mutable="false"
name="enable_services" type="boolean"
value="%s"/></function_call></request></module>' %
(cstartup, enable_services)