* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2007-02-22 20:52 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-02-22 20:52 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-02-22 20:52:07
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: cluster_adapters.py ricci_bridge.py
Log message:
- Remove the check for the rgmanager-app-agents package for the application resources
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.3&r2=1.31.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.227.2.10&r2=1.227.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.56.2.1&r2=1.56.2.2
--- conga/luci/cluster/resource-form-macros 2007/02/20 23:09:37 1.31.2.3
+++ conga/luci/cluster/resource-form-macros 2007/02/22 20:52:06 1.31.2.4
@@ -119,17 +119,12 @@
<option name="SCR" value="SCR">Script</option>
<option name="SMB" value="SMB">Samba</option>
- <tal:block
- tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
- <option name="APACHE" value="APACHE">Apache</option>
- <option name="LVM" value="LVM">LVM</option>
- <option name="MYSQL" value="MYSQL">MySQL</option>
- <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
- <option name="POSTGRES-8" value="POSTGRES-8">
- PostgreSQL 8
- </option>
- <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
- </tal:block>
+ <option name="APACHE" value="APACHE">Apache</option>
+ <option name="LVM" value="LVM">LVM</option>
+ <option name="MYSQL" value="MYSQL">MySQL</option>
+ <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+ <option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+ <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
</select>
</form>
</p>
@@ -169,17 +164,12 @@
<option name="SCR" value="SCR">Script</option>
<option name="SMB" value="SMB">Samba</option>
- <tal:block
- tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
- <option name="APACHE" value="APACHE">Apache</option>
- <option name="LVM" value="LVM">LVM</option>
- <option name="MYSQL" value="MYSQL">MySQL</option>
- <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
- <option name="POSTGRES-8" value="POSTGRES-8">
- PostgreSQL 8
- </option>
- <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
- </tal:block>
+ <option name="APACHE" value="APACHE">Apache</option>
+ <option name="LVM" value="LVM">LVM</option>
+ <option name="MYSQL" value="MYSQL">MySQL</option>
+ <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+ <option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+ <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
</select>
</form>
</p>
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/20 23:09:37 1.227.2.10
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/22 20:52:07 1.227.2.11
@@ -3895,18 +3895,7 @@
luci_log.debug_verbose('GCI0: unable to determine cluster name')
return {}
- has_app_agents = False
- try:
- ricci = req.SESSION.get('ricci')
- if not ricci:
- raise Exception, 'blank'
- has_app_agents = has_rgmanager_app_agents(ricci)
- except Exception, e:
- luci_log.debug_verbose('GCI0a: %s' % str(e))
- has_app_agents = False
-
clumap = {}
- clumap['has_rgmanager_app_agents'] = has_app_agents
if model is None:
try:
model = getModelForCluster(self, cluname)
--- conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/20 23:09:37 1.56.2.1
+++ conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/22 20:52:07 1.56.2.2
@@ -486,43 +486,6 @@
ricci_xml = rc.batch_run(batch_str)
return batchAttemptResult(ricci_xml)
-def has_rgmanager_app_agents(rc):
- batch_str = '<module name="rpm"><request API_version="1.0"><function_call name="query"><var mutable="false" name="search" type="list_xml"><rpm name="rgmanager-app-agents"/></var></function_call></request></module>'
-
- ricci_xml = rc.batch_run(batch_str, async=False)
- if not ricci_xml or not ricci_xml.firstChild:
- luci_log.debug_verbose('HRAA0: None returned')
- return None
-
- rpm_tags = ricci_xml.getElementsByTagName('rpm')
- if not rpm_tags or len(rpm_tags) < 1:
- luci_log.debug_verbose('HRAA: unexpected response %s' \
- % ricci_xml.toxml())
- return None
-
- has_agents = False
- for i in rpm_tags:
- try:
- name = i.getAttribute('name')
- if not name:
- raise Exception, 'blank'
- except Exception, e:
- luci_log.debug_verbose('HRAA2: %s' % str(e))
- continue
-
- if name.strip().lower() != 'rgmanager-app-agents':
- continue
-
- try:
- version = i.getAttribute('version').strip()
- if version:
- has_agents = True
- except Exception, e:
- luci_log.debug_verbose('HRAA3: %s' % str(e))
- break
-
- return has_agents
-
def nodeIsVirtual(rc):
batch_str = '<module name="cluster"><request API_version="1.0"><function_call name="virt_guest"/></request></module>'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2007-02-22 20:52 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-02-22 20:52 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-02-22 20:52:51
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: cluster_adapters.py ricci_bridge.py
Log message:
- Remove the check for the rgmanager-app-agents package for the application resources
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.242&r2=1.243
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.57&r2=1.58
--- conga/luci/cluster/resource-form-macros 2007/02/20 23:06:59 1.34
+++ conga/luci/cluster/resource-form-macros 2007/02/22 20:52:50 1.35
@@ -119,17 +119,12 @@
<option name="SCR" value="SCR">Script</option>
<option name="SMB" value="SMB">Samba</option>
- <tal:block
- tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
- <option name="APACHE" value="APACHE">Apache</option>
- <option name="LVM" value="LVM">LVM</option>
- <option name="MYSQL" value="MYSQL">MySQL</option>
- <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
- <option name="POSTGRES-8" value="POSTGRES-8">
- PostgreSQL 8
- </option>
- <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
- </tal:block>
+ <option name="APACHE" value="APACHE">Apache</option>
+ <option name="LVM" value="LVM">LVM</option>
+ <option name="MYSQL" value="MYSQL">MySQL</option>
+ <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+ <option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+ <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
</select>
</form>
</p>
@@ -169,17 +164,12 @@
<option name="SCR" value="SCR">Script</option>
<option name="SMB" value="SMB">Samba</option>
- <tal:block
- tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
- <option name="APACHE" value="APACHE">Apache</option>
- <option name="LVM" value="LVM">LVM</option>
- <option name="MYSQL" value="MYSQL">MySQL</option>
- <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
- <option name="POSTGRES-8" value="POSTGRES-8">
- PostgreSQL 8
- </option>
- <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
- </tal:block>
+ <option name="APACHE" value="APACHE">Apache</option>
+ <option name="LVM" value="LVM">LVM</option>
+ <option name="MYSQL" value="MYSQL">MySQL</option>
+ <option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+ <option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+ <option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
</select>
</form>
</p>
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/20 23:07:00 1.242
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/22 20:52:51 1.243
@@ -3895,18 +3895,7 @@
luci_log.debug_verbose('GCI0: unable to determine cluster name')
return {}
- has_app_agents = False
- try:
- ricci = req.SESSION.get('ricci')
- if not ricci:
- raise Exception, 'blank'
- has_app_agents = has_rgmanager_app_agents(ricci)
- except Exception, e:
- luci_log.debug_verbose('GCI0a: %s' % str(e))
- has_app_agents = False
-
clumap = {}
- clumap['has_rgmanager_app_agents'] = has_app_agents
if model is None:
try:
model = getModelForCluster(self, cluname)
--- conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/20 23:07:00 1.57
+++ conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/22 20:52:51 1.58
@@ -486,43 +486,6 @@
ricci_xml = rc.batch_run(batch_str)
return batchAttemptResult(ricci_xml)
-def has_rgmanager_app_agents(rc):
- batch_str = '<module name="rpm"><request API_version="1.0"><function_call name="query"><var mutable="false" name="search" type="list_xml"><rpm name="rgmanager-app-agents"/></var></function_call></request></module>'
-
- ricci_xml = rc.batch_run(batch_str, async=False)
- if not ricci_xml or not ricci_xml.firstChild:
- luci_log.debug_verbose('HRAA0: None returned')
- return None
-
- rpm_tags = ricci_xml.getElementsByTagName('rpm')
- if not rpm_tags or len(rpm_tags) < 1:
- luci_log.debug_verbose('HRAA: unexpected response %s' \
- % ricci_xml.toxml())
- return None
-
- has_agents = False
- for i in rpm_tags:
- try:
- name = i.getAttribute('name')
- if not name:
- raise Exception, 'blank'
- except Exception, e:
- luci_log.debug_verbose('HRAA2: %s' % str(e))
- continue
-
- if name.strip().lower() != 'rgmanager-app-agents':
- continue
-
- try:
- version = i.getAttribute('version').strip()
- if version:
- has_agents = True
- except Exception, e:
- luci_log.debug_verbose('HRAA3: %s' % str(e))
- break
-
- return has_agents
-
def nodeIsVirtual(rc):
batch_str = '<module name="cluster"><request API_version="1.0"><function_call name="virt_guest"/></request></module>'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2007-05-30 22:39 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2007-05-30 22:39 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: EXPERIMENTAL
Changes by: rmccabe at sourceware.org 2007-05-30 22:39:37
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/var: Data.fs
Log message:
Bring the database into sync with the rest of the codebase
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.37.2.1&r2=1.37.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.25.2.1&r2=1.25.2.2
--- conga/luci/cluster/resource-form-macros 2007/05/30 05:54:01 1.37.2.1
+++ conga/luci/cluster/resource-form-macros 2007/05/30 22:39:28 1.37.2.2
@@ -92,7 +92,7 @@
<h2>Resources Remove Form</h2>
<tal:block tal:define="
- msg python: here.deleteResource(here.getRicciAgentForCluster(request), request)">
+ msg python: here.resourceDelete(here.getRicciAgentForCluster(request), request)">
<span class="error" tal:condition="msg" tal:content="msg" />
</tal:block>
</div>
@@ -271,7 +271,7 @@
<h2>Resource <span tal:replace="python: ('edit' in request and request['edit']) and 'Edited' or 'Added'" /></h2>
<div tal:content="
- python: here.addResource(here.getRicciAgentForCluster(request), request)" />
+ python: here.resourceAdd(here.getRicciAgentForCluster(request), request)" />
</div>
<div metal:define-macro="resourceconfig-form">
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2007/05/18 03:30:44 1.25.2.1 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2007/05/30 22:39:28 1.25.2.2 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2008-05-12 18:03 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-05-12 18:03 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2008-05-12 18:03:39
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: LuciValidation.py ResourceHandler.py
Log message:
backported fixes from RHEL5
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.51&r2=1.52
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- conga/luci/cluster/resource-form-macros 2008/04/28 03:56:50 1.51
+++ conga/luci/cluster/resource-form-macros 2008/05/12 18:03:39 1.52
@@ -631,6 +631,19 @@
</tr>
<tr class="systemsTable">
+ <td class="systemsTable">Filesystem type</td>
+ <td class="systemsTable"
+ tal:define="cur_fstype res/attrs/fstype | string:gfs">
+
+ <input type="radio" name="fstype" value="gfs"
+ tal:attributes="checked python:cur_fstype.lower() == 'gfs' and 'checked' or ''" />GFS
+ <br/>
+ <input type="radio" name="fstype" value="gfs2"
+ tal:attributes="checked python:cur_fstype.lower() == 'gfs2' and 'checked' or ''" />GFS2
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
<input type="text" size="20" name="options"
--- conga/luci/site/luci/Extensions/LuciValidation.py 2008/03/05 23:08:58 1.9
+++ conga/luci/site/luci/Extensions/LuciValidation.py 2008/05/12 18:03:39 1.10
@@ -87,7 +87,7 @@
fence_method.addAttribute('name', str(method_id))
levels[min(1, fence_level - 1)] = fence_method
except Exception, e:
- method_id = fence_level
+ method_id = str(fence_level)
fence_method = Method()
fence_method.addAttribute('name', str(method_id))
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2008/05/12 15:16:04 1.10
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2008/05/12 18:03:39 1.11
@@ -191,6 +191,19 @@
luci_log.debug_verbose('addGfs6: %s' % err)
try:
+ fstype = form['fstype'].lower().strip()
+ if not fstype:
+ raise KeyError, 'No filesystem type was given'
+ if fstype != 'gfs' and fstype != 'gfs2':
+ raise KeyError, 'An invalid file system type of "%s" was given' % fstype
+ res.addAttribute('fstype', fstype)
+ except Exception, e:
+ err = str(e)
+ errors.append(err)
+ if LUCI_DEBUG_MODE is True:
+ luci_log.debug_verbose('addGfs7a: %s' % err)
+
+ try:
options = form['options'].strip()
if not options:
raise KeyError, 'no options'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2008-05-12 18:04 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-05-12 18:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2008-05-12 18:04:12
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: ResourceHandler.py
Log message:
Allow users to choose GFS or GFS2 fstype for clusterfs resources
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.11&r2=1.31.2.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.5&r2=1.2.2.6
--- conga/luci/cluster/resource-form-macros 2008/04/28 03:57:41 1.31.2.11
+++ conga/luci/cluster/resource-form-macros 2008/05/12 18:04:12 1.31.2.12
@@ -631,6 +631,19 @@
</tr>
<tr class="systemsTable">
+ <td class="systemsTable">Filesystem type</td>
+ <td class="systemsTable"
+ tal:define="cur_fstype res/attrs/fstype | string:gfs">
+
+ <input type="radio" name="fstype" value="gfs"
+ tal:attributes="checked python:cur_fstype.lower() == 'gfs' and 'checked' or ''" />GFS
+ <br/>
+ <input type="radio" name="fstype" value="gfs2"
+ tal:attributes="checked python:cur_fstype.lower() == 'gfs2' and 'checked' or ''" />GFS2
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
<input type="text" size="20" name="options"
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2008/04/29 16:09:26 1.2.2.5
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2008/05/12 18:04:12 1.2.2.6
@@ -191,6 +191,19 @@
luci_log.debug_verbose('addGfs6: %s' % err)
try:
+ fstype = form['fstype'].lower().strip()
+ if not fstype:
+ raise KeyError, 'No filesystem type was given'
+ if fstype != 'gfs' and fstype != 'gfs2':
+ raise KeyError, 'An invalid file system type of "%s" was given' % fstype
+ res.addAttribute('fstype', fstype)
+ except Exception, e:
+ err = str(e)
+ errors.append(err)
+ if LUCI_DEBUG_MODE is True:
+ luci_log.debug_verbose('addGfs7a: %s' % err)
+
+ try:
options = form['options'].strip()
if not options:
raise KeyError, 'no options'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2010-08-07 3:16 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2010-08-07 3:16 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2010-08-07 03:16:02
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: ResourceHandler.py
Log message:
Fix rhbz#587399 - Clarification on "type" when configuring oracledb resources
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.16&r2=1.21.2.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.9&r2=1.1.4.10
--- conga/luci/cluster/resource-form-macros 2009/05/21 13:32:04 1.21.2.16
+++ conga/luci/cluster/resource-form-macros 2010/08/07 03:16:01 1.21.2.17
@@ -1495,6 +1495,27 @@
value res/attrs/home | nothing" />
</td>
</tr>
+ <tr>
+ <td>Oracle installation type</td>
+ <td>
+ <select name="oracletype"
+ tal:attributes="disabled python: editDisabled"
+ tal:define="odbtype res/attrs/type | string:default">
+ <option name="default" value="default"
+ tal:content="string:Default"
+ tal:attributes="selected python:odbtype == 'default' and 'selected'"/>
+ <option value="base"
+ tal:content="string:Database Instance and Listener only"
+ tal:attributes="selected python:odbtype == 'base' and 'selected'"/>
+ <option value="base-em"
+ tal:content="string:Database, Listener, Enterprise Manager, and iSQL*Plus"
+ tal:attributes="selected python:odbtype in ('10g', 'base-em') and 'selected'"/>
+ <option value="ias"
+ tal:content="string:Internet Application Server (Infrastructure)"
+ tal:attributes="selected python:odbtype in ('ias', '10g-ias') and 'selected'"/>
+ </select>
+ </td>
+ </tr>
<tr class="systemsTable">
<td class="systemsTable">Virtual hostname (optional)</td>
<td class="systemsTable">
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2010/01/07 18:08:35 1.1.4.9
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2010/08/07 03:16:02 1.1.4.10
@@ -804,13 +804,17 @@
params = (
('user', 'Oracle User Name', True, None),
('home', 'Oracle Home Directory', True, None),
- #('type', 'Oracle Installation Type', True, None),
+ ('oracletype', 'Oracle Installation Type', False, None),
('vhost', 'Virtual Hostname', False, None)
)
errors = config_resource(params, res, rname, form)
- dbtype = res.getAttribute('type')
- if not dbtype:
- res.addAttribute('type', '10g')
+ dbtype = res.getAttribute('oracletype')
+ res.removeAttribute('type')
+ if dbtype:
+ res.removeAttribute('oracletype')
+ dbtype = dbtype.lower()
+ if dbtype in ('base', 'base-em', '10g', 'ias', '10g-ias'):
+ res.addAttribute('type', dbtype)
return errors
resource_table = {
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
@ 2011-03-25 20:01 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2011-03-25 20:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2011-03-25 20:01:44
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: ResourceHandler.py
Log message:
Fix bz679866 - Add the ability to configure the "self_fence" attribute for the LVM resource
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.19&r2=1.21.2.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.11&r2=1.1.4.12
--- conga/luci/cluster/resource-form-macros 2011/02/25 15:54:33 1.21.2.19
+++ conga/luci/cluster/resource-form-macros 2011/03/25 20:01:43 1.21.2.20
@@ -1298,6 +1298,15 @@
value res/attrs/lv_name | nothing" />
</td>
</tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Fence the node if it is unable to clean up LVM tags</td>
+ <td class="systemsTable">
+ <input type="checkbox" name="self_fence"
+ tal:attributes="
+ disabled python: editDisabled;
+ checked res/attrs/self_fence | nothing" />
+ </td>
+ </tr>
</table>
<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2011/02/25 15:54:33 1.1.4.11
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2011/03/25 20:01:43 1.1.4.12
@@ -692,6 +692,10 @@
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('addLVM6: no vg_name or lv_name for "%s"' % rname)
+ if form.has_key('self_fence'):
+ res.addAttribute('self_fence', '1')
+ else:
+ res.removeAttribute('self_fence')
return errors
def addSAPDatabase(res, rname, form, model):
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-25 20:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-25 20:01 [Cluster-devel] conga/luci cluster/resource-form-macros site/l rmccabe
-- strict thread matches above, loose matches on Subject: below --
2010-08-07 3:16 rmccabe
2008-05-12 18:04 rmccabe
2008-05-12 18:03 rmccabe
2007-05-30 22:39 rmccabe
2007-02-22 20:52 rmccabe
2007-02-22 20:52 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).