[luci: 1/2] deploy-devel.sh now also starts saslauthd service.
by Jan Pokorný
commit 53f191e136a0a040828d240dca9f62037ad8ed9a
Author: Jan Pokorny <jpokorny(a)redhat.com>
Date: Fri Jul 30 16:44:30 2010 +0200
deploy-devel.sh now also starts saslauthd service.
deploy-devel.sh | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/deploy-devel.sh b/deploy-devel.sh
index f245ddd..b85a7e9 100755
--- a/deploy-devel.sh
+++ b/deploy-devel.sh
@@ -8,6 +8,10 @@
# tg2env environment (activated with 'source bin/activate' command
# from within tg2env directory).
+# does not hurt if you have this service already running,
+# helps otherwise
+service saslauthd start
+
python setup.py install
paster setup-app development.ini
paster serve --reload development.ini
13 years, 9 months
[luci] Bump version in setup.py to match the version in the spec file
by Ryan McCabe
commit d91707f5d87f7903dabfc7bd1abb6182c57a4e82
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Fri Jul 30 10:19:18 2010 -0400
Bump version in setup.py to match the version in the spec file
setup.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/setup.py b/setup.py
index 85ecee2..8bbc933 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ except ImportError:
setup(
name='luci',
- version='0.22.2',
+ version='0.22.3',
license='GPLv2',
description='Web-based cluster administration application',
author='',
13 years, 9 months
[luci] Update spec file
by Ryan McCabe
commit b58c200615fdd6bfee9d83fdc082e14bd835f31f
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Fri Jul 30 01:00:42 2010 -0400
Update spec file
luci.spec | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 110 insertions(+), 12 deletions(-)
---
diff --git a/luci.spec b/luci.spec
index 6d38ede..4d92ac3 100644
--- a/luci.spec
+++ b/luci.spec
@@ -3,24 +3,24 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: luci
-Version: 0.22.2
+Version: 0.22.3
Release: 1%{?dist}
-Summary: Web-based cluster administration application
+Summary: Web-based high availability administration application
Group: Applications/System
License: GPLv2
URL: http://sources.redhat.com/cluster/conga
-Source0: http://people.redhat.com/rmccabe/luci/luci-0.22.2.tar.bz2
+Source0: http://people.redhat.com/rmccabe/luci/luci-0.22.3.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel python-setuptools python-paste python-paste-script cyrus-sasl-devel
Requires: TurboGears2 openssl python-repoze-who-friendlyform python-tw-forms
-Requires: python-paste >= 1.7.2-5.el6
+Requires: python-paste >= 1.7.2-5
Requires(post): chkconfig initscripts
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
ExclusiveArch: i686 x86_64
%description
-Luci is a web-based cluster administration application built on the
+Luci is a web-based high availability administration application built on the
TurboGears 2 framework.
%prep
@@ -58,8 +58,9 @@ rm -rf %{buildroot}
%attr(750, luci, luci) %dir /var/log/luci
%pre
-getent group luci >/dev/null || groupadd -r luci
-getent passwd luci >/dev/null || useradd -r -g luci -d /var/lib/luci -s /sbin/nologin -c "luci user" luci
+/usr/sbin/groupadd -g 141 luci 2> /dev/null
+/usr/sbin/useradd -u 141 -g 141 -d /var/lib/luci -s /sbin/nologin -r \
+ -c "luci user" luci 2> /dev/null
exit 0
%post
@@ -80,13 +81,110 @@ fi
exit 0
%changelog
-* Fri May 28 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-1
-- Fix for various cluster service creation and editing bugs.
+* Fri Jul 30 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.3-1
+- Version 0.22.3
+
+* Thu Jul 29 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-11
+- Fix bz614433 (cannot configure ipport for fence agents)
+- Fix bz617575 (Unclear options when configuring a cluster)
+- Fix bz617591 (Some fields when adding an IP address are unclear)
+- Fix bz617602 (Fields in "Fence Daemon Properties" have no units)
+- Fix bz618577 (wrong message displayed when adding ip resource)
+- Fix bz619220 (Luci does extra queries which slows down page load)
+
+* Tue Jul 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-10
+- Additional fixes for bz600027 (Fix cluster service creation/configuration UX issues)
+- Additional fixes for bz600055 ("cluster busy" dialog does not work)
+- Fix bz618424 (Can't remove nodes in node add dialog or create cluster dialog)
+- Fix bz616382 (luci db error removing a node from a cluster)
+- Fix bz613871 (luci should not give ungraceful error messages when encountering fence devices that it does not recognize/support)
+
+* Mon Jul 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-9
+- Fix bz600027 (Fix cluster service creation/configuration UX issues)
+- Fix bz600040 (Add nodes to existing cluster does not work)
+- Fix bz600045 (Removing nodes from existing clusters fails)
+- Fix bz600055 ("cluster busy" dialog does not work)
+- Fix bz613868 (Remove fence_virsh from luci UI since this fence is not supported with RHEL HA/Cluster)
+- Fix bz614434 (adding an IP resource ends with an error 500)
+- Fix bz614439 (adding GFS2 resource type in RHEL6 cluster is "interesting")
+- Fix bz615096 (Traceback when unchecking "Prioritized" in Failover Domains)
+- Fix bz615468 (When creating a new failover domain, adding nodes has no effect)
+- Fix bz615872 (unicode error deleting a cluster)
+- Fix bz615889 (luci cannot start an imported cluster)
+- Fix bz615911 (luci shows many unsupported fence devices when adding a new fence device)
+- Fix bz615917 (adding per node fence instance results in error 500 if no fence devices are configured)
+- Fix bz615929 (luci generated cluster.conf with fence_scsi fails to validate)
+- Fix bz616094 (Deleting a fence device which is in use, causes a traceback on Nodes page)
+- Fix bz616228 (Clicking on cluster from manage clusters page results in traceback (500 error))
+- Fix bz616230 (Clicking on the join button doesn't work on nodes page)
+- Fix bz616244 (Clicking on the leave button doesn't work on nodes page.)
+
+* Wed Jul 14 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-8
+- Fix bz600021 (Fix node fence configuration UX issues)
+
+* Tue Jul 13 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-7
+- Build fix for bz600056
+
+* Tue Jul 13 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-6
+- Build fix for bz600056
+
+* Tue Jul 13 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-5
+- Fix bz604740 (Support nfsserver resource agent which is for NFSv4 and NFSv3)
+- Fix bz600056 (Replace logo image)
+
+* Fri Jul 09 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-4
+- Fix bz600059 (Hide optional fields for fence_scsi)
+- Fix bz600077 (cman "two_node" attribute should not be set when using qdisk)
+- Fix bz600083 (Add text to broadcast mode to note that it is for demos only - no production support)
+- Fix bz605780 (Qdisk shouldn't be part of the main page, it should be in the configuration tab)
+
+* Fri Jun 18 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-3
+- Fix bz598859 (Adding fence_xvm fence device through luci interface throws TypeError Traceback)
+- Fix bz599074 ("Use same password for all nodes" doesn't work.)
+- Fix bz599080 (Conga ignores "reboot nodes" check box)
+- Fix bz600047 (luci allows deletion of global resources that are used by services)
+- Fix bz600050 (luci requires wrongly requires users to fill interval / tko / minimum score / votes fields for qdisk configuration)
+- Fix bz600052 (luci allows deletion of the last qdisk heuristics row)
+- Fix bz600058 (ssh_identity field values are dropped)
+- Fix bz600060 (Formatting error on fence devices overview page)
+- Fix bz600061 (Default values not populated in advanced network configuration)
+- Fix bz600066 (Update resource agent labels)
+- Fix bz600069 (Configuration page always returns to General Properties Page)
+- Fix bz600071 (If luci cannot communicate with the nodes they don't appear in the list of nodes)
+- Fix bz600073 (Update resource agent list)
+- Fix bz600074 (Fix display error on the resource list page)
+- Fix bz600075 (update fence_virt / fence_xvm configuration)
+- Fix bz600076 (When creating a cluster no default radio button is selected for Download Packages/Use locally installed packages)
+- Fix bz600079 (Unable to edit existing resources)
+- Fix bz600080 (Homebase page only shows a '-' for Nodes Joined)
+- Fix bz602482 (Multicast settings are not relayed to cluster.conf and no default)
+- Fix bz603833 ("Nodes Joined" in main page is inaccurate when no nodes have joined)
+
+* Tue Jun 01 2010 Chris Feist <cfeist(a)redhat.com> - 0.22.2-2
+- Fix missing requires which will cause some installations to fail
+- Resolves: rhbz#598725
+
+* Fri May 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.2-1
+- Fix for bugs related to cluster service creation and editing (bz593836).
+
+* Wed May 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.1-3
+- Fix remaining unresolved issues for 593836
+ - Make sure the cluster version is updated when creating services
+ - Fix a bug that caused IP resources to fail in services
+
+* Wed May 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.1-2
+- Rebuild to fix a bug introduced during last build.
* Wed May 26 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.1-1
-- Fix edit and display of cluster services.
-- Fix submission of qdisk heuristics.
-- Do not set the "alias" attribute for RHEL6 clusters.
+- Fix service creation, display, and edit.
+- Fix qdisk heuristic submission.
+
+* Wed May 19 2010 Ryan McCabe <rmccabe(a)redhat.com> - 0.22.0-16
+- Rebase to upstream
+
+* Mon May 17 2010 Chris Feist <cfeist(a)redhat.com> - 0.22.0-13
+- Added static UID/GID for luci user
+- Resolves: rhbz#585988
* Wed May 12 2010 Chris Feist <cfeist(a)redhat.com> - 0.22.0-11
- Add support for PAM authentication
13 years, 9 months
[luci] Fix database transaction error that occurred when removing multiple nodes at a t ime
by Ryan McCabe
commit 932a96da156b11a8cf1015ff6822e462d77fe701
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Fri Jul 30 00:19:04 2010 -0400
Fix database transaction error that occurred when removing multiple nodes at a t ime
luci/lib/db_helpers.py | 17 +++++++++++------
luci/lib/ricci_helpers.py | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/luci/lib/db_helpers.py b/luci/lib/db_helpers.py
index 28ce05d..6cc8bc2 100644
--- a/luci/lib/db_helpers.py
+++ b/luci/lib/db_helpers.py
@@ -212,15 +212,20 @@ def db_remove_cluster(cluster_name):
return False
return True
-def db_remove_cluster_node(cluster_obj, node_name):
+def db_remove_cluster_node(cluster_name, node_name):
+ node_to_remove = None
try:
+ cluster_obj = get_cluster_db_obj(cluster_name)
for i in cluster_obj.nodes:
if i.node_name == node_name or i.hostname == node_name:
- cluster_obj.nodes.remove(i)
- DBSession.delete(i)
- DBSession.flush()
- transaction.commit()
- return True
+ node_to_remove = i
+ break
+
+ if node_to_remove is not None:
+ DBSession.delete(node_to_remove)
+ DBSession.flush()
+ transaction.commit()
+ return True
except:
log.exception('Error removing node "%s" from the database' % node_name)
return False
diff --git a/luci/lib/ricci_helpers.py b/luci/lib/ricci_helpers.py
index a6b76c0..db897cc 100644
--- a/luci/lib/ricci_helpers.py
+++ b/luci/lib/ricci_helpers.py
@@ -494,7 +494,7 @@ def cluster_node_delete(cluster_name, cluster_model, node_list):
for node in node_list:
try:
cluster_model.deleteNodeByName(node)
- db_remove_cluster_node(cluster_obj, node)
+ db_remove_cluster_node(cluster_name, node)
except Exception, e:
log.exception('Unable to delete node "%s" from the cluster configuration' % node)
update_cluster_conf(cluster_model)
13 years, 9 months
[luci] Fix the log and status messages when adding an IP resource
by Ryan McCabe
commit ad558a8444b8e5e8e056de0c5e424f6582cb37f1
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Thu Jul 29 22:17:29 2010 -0400
Fix the log and status messages when adding an IP resource
Resolves: rhbz#618577
luci/controllers/cluster.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/luci/controllers/cluster.py b/luci/controllers/cluster.py
index 09f0c3c..5380502 100644
--- a/luci/controllers/cluster.py
+++ b/luci/controllers/cluster.py
@@ -365,13 +365,16 @@ class IndividualClusterController(BaseController):
# For IP resources there is no name, just an IP Address
# and to make IP addresses work you need to add a .html
if res_name == None and kw.get('address'):
- res_name = kw.get('address') + ".html"
+ res_name = kw.get('address')
+ redir_fmt = '%s/%s.html'
+ else:
+ redir_fmt = '%s/%s'
log.info('User "%s" %s global resource "%s" in cluster "%s"'
% (self.username, cur_action, res_name, self.name))
flash(_('%s global resource "%s"') % (cur_action, res_name))
self.model.setModified(True)
rh.update_cluster_conf(self.model)
- redirect('%s/%s' % (tmpl_context.cluster_url, res_name))
+ redirect(redir_fmt % (tmpl_context.cluster_url, res_name))
else:
msgs = vret[1].get('errors')
if msgs and len(msgs) > 0:
13 years, 9 months
[luci] Specify the unit of time for post join and post fail delay fields
by Ryan McCabe
commit 65d4560609234b2c56152232301a1f6938e52aa5
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Thu Jul 29 21:54:39 2010 -0400
Specify the unit of time for post join and post fail delay fields
Resolves: rhbz#617602
luci/templates/configure.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/luci/templates/configure.html b/luci/templates/configure.html
index 1a14a5e..98bedf6 100644
--- a/luci/templates/configure.html
+++ b/luci/templates/configure.html
@@ -73,10 +73,10 @@
<form action="${tg.url(configure_cmd)}" method="post">
<input type="hidden" name="page" value="Fence"/>
<h2>Fence Daemon Properties</h2>
- <div class="row"><label>Post Fail Delay</label>
+ <div class="row"><label>Post Fail Delay (seconds)</label>
<input type="text" class="text" name="post_fail_delay" value="${cluster_data and cluster_data.getFenceDaemonPtr().getAttribute('post_fail_delay')}"/>
</div>
- <div class="row"><label>Post Join Delay</label>
+ <div class="row"><label>Post Join Delay (seconds)</label>
<input type="text" class="text" name="post_join_delay" value="${cluster_data and cluster_data.getFenceDaemonPtr().getAttribute('post_join_delay')}"/>
</div>
<div class="row" py:if="tmpl_context.cluster.get_version() == 2">
13 years, 9 months
[luci] Explicitly state the unit of time used for the sleeptime attribute of IP resources.
by Ryan McCabe
commit 20827d629daa49baa8688bb87c49f1a642a63818
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Thu Jul 29 21:51:33 2010 -0400
Explicitly state the unit of time used for the sleeptime attribute of IP resources.
Autofill the field with the default (10s)
Resolves: rhbz#617591
luci/templates/resource_list.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/luci/templates/resource_list.html b/luci/templates/resource_list.html
index bfed5f4..75da32c 100644
--- a/luci/templates/resource_list.html
+++ b/luci/templates/resource_list.html
@@ -28,9 +28,10 @@
</td>
</tr>
<tr>
- <td>Amount of time to sleep after removing an IP address</td>
+ <td>Number of seconds to sleep after removing an IP address</td>
<td>
<input name="sleeptime" type="text" class="text"
+ value="10"
py:attrs="res and {'value': res.getAttribute('sleeptime'), 'disabled':global_resource and 'disabled' or None} or {}" />
</td>
</tr>
13 years, 9 months
[luci] Improve labels for password and port fields in
by Ryan McCabe
commit 672db8e766e930dc86c7646829869b3df5ec0cb7
Author: Ryan McCabe <rmccabe(a)redhat.com>
Date: Thu Jul 29 21:47:28 2010 -0400
Improve labels for password and port fields in
create cluster/add node/add existing dialogs
Resolves: rhbz#617575
luci/templates/add_existing.html | 22 +++++++++++-----------
luci/templates/add_node.html | 4 ++--
luci/templates/create_cluster.html | 24 ++++++++++++------------
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/luci/templates/add_existing.html b/luci/templates/add_existing.html
index 9f95ff7..ce1ff09 100644
--- a/luci/templates/add_existing.html
+++ b/luci/templates/add_existing.html
@@ -4,13 +4,13 @@
<form name="add_existing_dialog" action="/add_existing_cmd">
<div class="row">
<p>Enter credentials for a node in the cluster you would like to add.</p>
- </div>
+ </div>
<div class="row">
<table id="addclusternode">
<tr>
<td>Node Hostname</td>
- <td>Password</td>
- <td>Node Port</td>
+ <td>Root Password</td>
+ <td>Ricci Port</td>
</tr>
<tr>
<td><input type="text" class="text" name="hostname" id="node0host" value="" /></td>
@@ -18,10 +18,10 @@
<td><input type="text" class="text" name="port" maxlength="5" size="5" value="11111" /></td>
</tr>
</table>
- </div>
- <input type="button" class="button formsubmit blue" value="Connect" onClick="add_existing_async(this.form)" />
+ </div>
+ <input type="button" class="button formsubmit blue" value="Connect" onClick="add_existing_async(this.form)" />
<input type="button" class="button formsubmit silver" value="Cancel"
- onclick="$('#add_existing_dialog').dialog('close')" />
+ onclick="$('#add_existing_dialog').dialog('close')" />
</form>
</div>
</div>
@@ -30,7 +30,7 @@
<div class="row">
<p>Cluster Name: <strong><span id="cluster_name_span" /></strong>
<input type="hidden" id="clustername" name="clustername" value="" />
- <input type="hidden" id="num_nodes" name="num_nodes" value="" />
+ <input type="hidden" id="num_nodes" name="num_nodes" value="" />
</p>
</div>
<div class="row">
@@ -42,16 +42,16 @@
<table class="clusternodes">
<tr>
<td>Node Hostname</td>
- <td>Password</td>
- <td>Node Port</td>
+ <td>Root Password</td>
+ <td>Ricci Port</td>
</tr>
<tbody id="sys_tbody"></tbody>
</table>
</div>
- <div class="row">
+ <div class="row">
<input type="submit" class="button formsubmit blue" value="Add Cluster" />
<input type="button" class="button formsubmit silver" value="Cancel"
- onclick="$('#add_existing_dialog').dialog('close')" />
+ onclick="$('#add_existing_dialog').dialog('close')" />
</div>
</form>
</div>
diff --git a/luci/templates/add_node.html b/luci/templates/add_node.html
index 42b0794..c1a7efe 100644
--- a/luci/templates/add_node.html
+++ b/luci/templates/add_node.html
@@ -12,8 +12,8 @@
<tbody>
<tr>
<td>Node Hostname</td>
- <td>Password</td>
- <td>Node Port</td>
+ <td>Root Password</td>
+ <td>Ricci Port</td>
<td></td>
</tr>
<tr id="add_node_system_row_elem0" class="systemtriple">
diff --git a/luci/templates/create_cluster.html b/luci/templates/create_cluster.html
index 0ed4bbb..acf0d10 100644
--- a/luci/templates/create_cluster.html
+++ b/luci/templates/create_cluster.html
@@ -5,17 +5,17 @@
<input type="hidden" name="num_nodes" value="1" />
</div>
<div class="row">
- <input type="checkbox" class="checkbox"
+ <input type="checkbox" class="checkbox"
name="allSameCheckBox" onclick="allPasswdsSame(this.form)" />
<label class="choice">Use same password for all nodes</label>
</div>
- <div class="row">
+ <div class="row">
<table class="clusternodes">
<tbody>
<tr>
<td>Node Hostname</td>
- <td>Password</td>
- <td>Node Port</td>
+ <td>Root Password</td>
+ <td>Ricci Port</td>
<td></td>
</tr>
<tr id="create_cluster_system_row_elem0" class="systemtriple">
@@ -26,30 +26,30 @@
</tr>
<tr class="add_node_button_row">
<td><input type="button" class="button small silver" value="Add Another Node" onclick="add_system_row(this.form)" /></td>
- </tr>
+ </tr>
</tbody>
</table>
</div>
<div class="row">
<input type="radio" class="radio" name="download_pkgs" value="download" />
<label class="choice">Download Packages</label>
- <br />
+ <br />
<input type="radio" class="radio" name="download_pkgs" value="local" checked="yes"/>
<label class="choice">Use locally installed packages</label>
</div>
- <div class="row">
+ <div class="row">
<input type="checkbox" class="checkbox" name="reboot_nodes" />
<label class="choice">Reboot nodes before joining cluster</label>
- </div>
- <div class="row">
+ </div>
+ <div class="row">
<input type="checkbox" class="checkbox" name="shared_storage" />
<label class="choice">Enable shared storage support</label>
- </div>
+ </div>
<div class="row">
<input type="submit" class="button formsubmit blue" value="Create Cluster" />
<input type="button" class="button formsubmit silver" value="Cancel"
- onclick="$('#create_cluster_dialog').dialog('close')" />
- </div>
+ onclick="$('#create_cluster_dialog').dialog('close')" />
+ </div>
</form>
<div class="hidden">
<table>
13 years, 9 months
