summaryrefslogtreecommitdiffstats
path: root/filters/cluster/rm/__init__.py
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2016-01-29 21:47:15 +0100
committerJan Pokorný <jpokorny@redhat.com>2016-02-01 23:54:35 +0100
commit2f8648ca47ca52dc06262128b7154892b53618bd (patch)
tree516c99bc91bdbaba309e3ad608417d3678c6a1a4 /filters/cluster/rm/__init__.py
parentdd2df50d68a55fa9df703e466bb8197548305136 (diff)
downloadclufter-2f8648ca47ca52dc06262128b7154892b53618bd.tar.gz
clufter-2f8648ca47ca52dc06262128b7154892b53618bd.tar.xz
clufter-2f8648ca47ca52dc06262128b7154892b53618bd.zip
Haziness: 'monitor' and 'status' are synonymous
Former is preferred, per: <http://www.linux-ha.org/doc/dev-guides/_actions.html> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'filters/cluster/rm/__init__.py')
-rw-r--r--filters/cluster/rm/__init__.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py
index e573c9f..ee5a5ad 100644
--- a/filters/cluster/rm/__init__.py
+++ b/filters/cluster/rm/__init__.py
@@ -207,16 +207,28 @@ ccsflat2cibprelude = ('''\
</xsl:if>
<xsl:variable name="IntervalFound"
select="action[
- @name = 'monitor'
+ (
+ @name = 'monitor'
+ or
+ @name = 'status'
+ )
and
not(preceding-sibling::action[
- @name = 'monitor'
+ (
+ @name = 'monitor'
+ or
+ @name = 'status'
+ )
and
@depth &lt; current()/@depth
])
and
not(following-sibling::action[
- @name = 'monitor'
+ (
+ @name = 'monitor'
+ or
+ @name = 'status'
+ )
and
@depth &lt; current()/@depth
])