summaryrefslogtreecommitdiffstats
path: root/filters/cluster
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-05-29 19:38:24 +0200
committerJan Pokorný <jpokorny@redhat.com>2015-05-29 20:01:49 +0200
commitf853e14f6ae5cb7d7cc2f75686009b37e4edbb0f (patch)
tree4f9624450c12325bc824168e3ef6ea85b9bf6f33 /filters/cluster
parent16ab15f4be6d493b936ca04f8dcd9f4bf14b5799 (diff)
downloadclufter-f853e14f6ae5cb7d7cc2f75686009b37e4edbb0f.tar.gz
clufter-f853e14f6ae5cb7d7cc2f75686009b37e4edbb0f.tar.xz
clufter-f853e14f6ae5cb7d7cc2f75686009b37e4edbb0f.zip
filters/ccs_revitalize[cluster]: simplify using xslt_is_member
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'filters/cluster')
-rw-r--r--filters/cluster/__init__.py19
1 files changed, 14 insertions, 5 deletions
diff --git a/filters/cluster/__init__.py b/filters/cluster/__init__.py
index 79cc592..3d7d410 100644
--- a/filters/cluster/__init__.py
+++ b/filters/cluster/__init__.py
@@ -472,6 +472,16 @@ ccsflat2cibprelude = ('''\
###
+# following 2nd chance import is to allow direct usage context (testing, etc.)
+try:
+ from ....utils_xslt import xslt_is_member
+except ValueError: # Value?
+ from ...utils_xslt import xslt_is_member
+
+ccs_revitalize_fa_domain = tuple(
+ 'fence_' + agent for agent in ('virt', 'xvm')
+)
+
ccs_revitalize = '''\
<clufter:descent-mix preserve-rest="true"/>
@@ -492,11 +502,10 @@ ccs_revitalize = '''\
/cluster/fencedevices/fencedevice[
@name = $FenceInst/@name
and
- (
- @agent = 'fence_virt'
- or
- @agent = 'fence_xvm'
- )
+''' + (
+ xslt_is_member('@agent',
+ ccs_revitalize_fa_domain)
+) + '''
]">
<xsl:attribute name='port'>
<xsl:value-of select="."/>