diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2016-01-29 21:47:15 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2016-02-01 23:54:35 +0100 |
| commit | 2f8648ca47ca52dc06262128b7154892b53618bd (patch) | |
| tree | 516c99bc91bdbaba309e3ad608417d3678c6a1a4 | |
| parent | dd2df50d68a55fa9df703e466bb8197548305136 (diff) | |
| download | clufter-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>
| -rw-r--r-- | __root__/doc/rgmanager-pacemaker.03.groups.txt | 2 | ||||
| -rw-r--r-- | filters/cluster/rm/__init__.py | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/__root__/doc/rgmanager-pacemaker.03.groups.txt b/__root__/doc/rgmanager-pacemaker.03.groups.txt index 7750bd6..d6e95be 100644 --- a/__root__/doc/rgmanager-pacemaker.03.groups.txt +++ b/__root__/doc/rgmanager-pacemaker.03.groups.txt @@ -126,7 +126,7 @@ FAILURE-ISOLATION(GROUP, RESOURCE, STOP) [3. disable unconditionally] R: specifying `@__independent_subtree` as `2` or `non-critical` -P: default `on-fail` values modulo `ignore` for `status` +P: default `on-fail` values modulo `ignore` for `monitor` (or `status`) operation and `stop` for `stop`) for RESOURCE ??? 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 < current()/@depth ]) and not(following-sibling::action[ - @name = 'monitor' + ( + @name = 'monitor' + or + @name = 'status' + ) and @depth < current()/@depth ]) |