[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
kupcevic at sourceware.org
kupcevic at sourceware.org
Thu Oct 12 21:00:50 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-12 21:00:49
Modified files:
luci/site/luci/Extensions: cluster_adapters.py ricci_bridge.py
Log message:
luci: install_rpms - omissions
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.106&r2=1.107
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.23&r2=1.24
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/12 20:54:39 1.106
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/12 21:00:49 1.107
@@ -183,7 +183,8 @@
True,
True,
enable_storage,
- False)
+ False,
+ rhn_dl)
if not batchNode:
nodeUnauth(nodeList)
cluster_properties['isComplete'] = False
@@ -314,7 +315,8 @@
True,
True,
enable_storage,
- False)
+ False,
+ rhn_dl)
if not batchNode:
raise
del nodeList[i]
--- conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/10 21:33:29 1.23
+++ conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/12 21:00:49 1.24
@@ -639,7 +639,8 @@
install_base,
install_services,
install_shared_storage,
- install_LVS):
+ install_LVS,
+ upgrade_rpms):
batch = '<?xml version="1.0" ?>'
batch += '<batch>'
@@ -647,8 +648,14 @@
batch += '<module name="rpm">'
batch += '<request API_version="1.0">'
batch += '<function_call name="install">'
+ batch += '<var name="upgrade" type="boolean" value="'
+ if upgrade_rpms:
+ batch += 'true'
+ else:
+ batch += 'false'
+ batch += '"/>'
batch += '<var name="sets" type="list_xml">'
- if install_base:
+ if install_base or install_services or install_shared_storage:
batch += '<set name="Cluster Base"/>'
if install_services:
batch += '<set name="Cluster Service Manager"/>'
@@ -714,7 +721,8 @@
install_base,
install_services,
install_shared_storage,
- install_LVS):
+ install_LVS,
+ upgrade_rpms):
batch = '<?xml version="1.0" ?>'
batch += '<batch>'
@@ -722,8 +730,14 @@
batch += '<module name="rpm">'
batch += '<request API_version="1.0">'
batch += '<function_call name="install">'
+ batch += '<var name="upgrade" type="boolean" value="'
+ if upgrade_rpms:
+ batch += 'true'
+ else:
+ batch += 'false'
+ batch += '"/>'
batch += '<var name="sets" type="list_xml">'
- if install_base:
+ if install_base or install_services or install_shared_storage:
batch += '<set name="Cluster Base"/>'
if install_services:
batch += '<set name="Cluster Service Manager"/>'
More information about the Cluster-devel
mailing list