summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-12-09 22:39:14 +0100
committerJan Pokorný <jpokorny@redhat.com>2015-12-17 23:37:56 +0100
commitad7ee16a0e53a1b6a8ada52a9e48c43b0c7de6ab (patch)
treeaf2ab87084efcd1b007df9b43a33cfe2d34b6848 /commands
parent54bc4a293d3eadee670b0431d5a67b666ed767b5 (diff)
downloadclufter-ad7ee16a0e53a1b6a8ada52a9e48c43b0c7de6ab.tar.gz
clufter-ad7ee16a0e53a1b6a8ada52a9e48c43b0c7de6ab.tar.xz
clufter-ad7ee16a0e53a1b6a8ada52a9e48c43b0c7de6ab.zip
commands/pcs2pcscmd: apply cib-meld-templates filter
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
-rw-r--r--commands/pcs2pcscmd.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/commands/pcs2pcscmd.py b/commands/pcs2pcscmd.py
index 8742016..1b7e8cc 100644
--- a/commands/pcs2pcscmd.py
+++ b/commands/pcs2pcscmd.py
@@ -15,9 +15,10 @@ from ..utils_corosync import PATH_COROCONF
@Command.deco(('ccspcmk2pcscmd',
- ('stringiter-combine2')),
- ('cib2pcscmd',
- ('stringiter-combine2')))
+ ('stringiter-combine2')),
+ ('cib-meld-templates',
+ ('cib2pcscmd',
+ ('stringiter-combine2'))))
def pcs2pcscmd_flatiron(cmd_ctxt,
ccs=PATH_CLUSTERCONF,
cib=PATH_CIB,
@@ -63,11 +64,13 @@ def pcs2pcscmd_flatiron(cmd_ctxt,
(
file_proto(ccs),
(
- file_proto(output),
+ file_proto(output),
),
file_proto(cib),
#(
- # file_proto(output), # already tracked
+ # (
+ # file_proto(output), # already tracked
+ # ),
#),
),
)
@@ -77,8 +80,9 @@ def pcs2pcscmd_flatiron(cmd_ctxt,
('simpleconfig2needlexml',
('needlexml2pcscmd',
('stringiter-combine2')))),
- ('cib2pcscmd',
- ('stringiter-combine2')))
+ ('cib-meld-templates',
+ ('cib2pcscmd',
+ ('stringiter-combine2'))))
def pcs2pcscmd_needle(cmd_ctxt,
coro=PATH_COROCONF,
cib=PATH_CIB,
@@ -132,7 +136,9 @@ def pcs2pcscmd_needle(cmd_ctxt,
),
file_proto(cib),
#(
+ # (
# file_proto(output), # already tracked
+ # ),
#),
),
)