CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe@sourceware.org 2010-08-05 18:16:12

Modified files:
luci/site/luci/Extensions: LuciClusterActions.py

Log message:
Make sure cluster services are enabled when adding new nodes and disabled when deleting nodes

Resolves: rhbz#590143

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterActions.py.diff?cvsroot=cluster&only_wi th_tag=RHEL5&r1=1.1.4.7&r2=1.1.4.8

--- conga/luci/site/luci/Extensions/LuciClusterActions.py 2008/03/12 15:13:12 1.1.4.7
+++ conga/luci/site/luci/Extensions/LuciClusterActions.py 2010/08/05 18:16:12 1.1.4.8
@@ -226,7 +226,7 @@
clustername,
nodename_resolved,
stop_cluster=False,
- disable_services=True):
+ disable_services=False):
reported_cluname = None
try:
cluster_info = rc.cluster_info()
@@ -458,7 +458,7 @@
errors += 1
continue

- if NodeJoinCluster(self, rc, clustername, nodename_resolved, enable_services=False) is None:
+ if NodeJoinCluster(self, rc, clustername, nodename_resolved, enable_services=True) is None:
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('CStart1: nodeJoin %s'
% nodename_resolved)
@@ -499,7 +499,8 @@
errors += 1
else:
ret = NodeLeaveCluster(self, rc, clustername,
- nodename_resolved, stop_cluster=True,
+ nodename_resolved,
+ stop_cluster=True,
disable_services=False)
if ret is None:
if LUCI_DEBUG_MODE is True: